From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 27 Mar 2025 11:33:20 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-il1-f186.google.com (mail-il1-f186.google.com [209.85.166.186]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 52RAXJLV004670 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 27 Mar 2025 11:33:20 +0100 Received: by mail-il1-f186.google.com with SMTP id e9e14a558f8ab-3d5b3819ff9sf7452045ab.0 for ; Thu, 27 Mar 2025 03:33:19 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1743071593; cv=pass; d=google.com; s=arc-20240605; b=jkrwn3Iltp/Aey+0xtywQ+sH/7SC2JkjnddVdlhAtYnkk434eJ4rnm7KfK8B3vfTHA DJK+8Sl6dp3e8F1B17Bs+8ZDKQT0oxFN47ZQXLbYNcqbPgOQb1qUw3q/L8UanM4N6N4+ WNs/4OG9vEbpDvw4RdGaXiQdY+8kFW9NzLy3mzB3PEpSs9qxIC9tkfgPGzpvbKyQsjIa RbAXN6KDZegH3Qsdo3zVJAgvFPRj1CCHKOX7PzqXsaBBXnbhBv5yI3VQBvGAr8gZ6/U0 TwkkkbNG1gRnBg9HfQaFroNvHT+OVycXw6G523JUIfVX7RRJ/vbZj1T9Mplz9nS5LwJ1 SNtg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:user-agent :content-transfer-encoding:references:in-reply-to:date:to:from :subject:message-id:sender:dkim-signature; bh=wYrX0zIggU3AlZ4r5v8l4RJNFsyxvbAWDlNZijA3ORo=; fh=yTjQZaalLq/bSG4iWaAlgFsKN0xsNHSeCRgF74eTVaw=; b=VEmVxARvHMXzdN8BQIzZy0u/QkqFAGNHYgJctR+guKaMWMc0xG/90jJDV5sQCz6wHM riV9LV8aUnSpzdvT4ovWV8v6tih/L7DlLFrHoQuKe0aoIRNFbu/QJPAY3YEzeHU2/9aF ZHWp+i88bZPw6Zu7sDbK26sVC47HssvEtl7Dq/GiJqaoa8QziLUoHme2tI4Un33YFJfx Hy1GrYQBhDYz6KRyHMHj7hW5uD+paszU/afeP20fBgWPc1T5tX8wRX/7oGuSc9LMIOaA QHNiLfdsQ3Zf5Ast0Xc81maWJ65zKW0P0deOkn5rACc66slN2gvsciUciGXzJ1HSeUBH ehXQ==; darn=ilbers.de ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1743071593; x=1743676393; darn=ilbers.de; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:user-agent:content-transfer-encoding :references:in-reply-to:date:to:from:subject:message-id:sender:from :to:cc:subject:date:message-id:reply-to; bh=wYrX0zIggU3AlZ4r5v8l4RJNFsyxvbAWDlNZijA3ORo=; b=r+5SPTtSlU9+WnLsvMymKVIXvUF0wTOYZhOQamJdHUHUJjiW0oJHvIH8z9otbVCdFF kD95OxKNBKA8rJ+t5lqE6UC0WDFnp9WhZK5TGZeXoXzoRgjsuaf78ULpYQrJtv35f8BA 81hI7gbRTBemLHpNcox924GuqvyPyXLNFJIF6Ov7v7b33Cs0ghs5Om78aMhrd3udAes0 vk+X/NOwnXI6kQTYOyZBeQNnIhBv6riHTadHdNqzH9FEBZVqrB3IDFMqNgICUD9myI+L KwbElHD0TEryzGYBWSs3QLG2aLLYuIZ5GGVFHmSRE+1u4dfLV/qL5Wv/fVviTMm6npfc gYPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743071593; x=1743676393; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :user-agent:content-transfer-encoding:references:in-reply-to:date:to :from:subject:message-id:x-beenthere:x-gm-message-state:sender:from :to:cc:subject:date:message-id:reply-to; bh=wYrX0zIggU3AlZ4r5v8l4RJNFsyxvbAWDlNZijA3ORo=; b=o5WphBV98MRvf+gYjR5+Sqdr1Nu1WA62ZOjZGETxYKdMfZ5qLDWv/nE1rv1jZbQPV7 smjKrbZ0WerFogTOKbA4UtCrOjoNkweG3x+F2tK8D9ycSxkFIsq7CCzeEBYQeozCX5fl s5QVewDh2ICTRf2A7uFwAtn7VWvYEnV6UiSoUHl31D/xuEjN4h+lJ5hXF/FsLuMGjeNm lLlfDE4dHUA8tHfVZh+gPZW+xB8vT3L2hm24+V5iNIpPwovOCo+qs/4G+onITUzQmY40 iZdQEyTvSbC+6GeWI+Lmj/WIDBnm8765vdSpDDHJGGOz7oO3dWEQ2+kBaqNljutJi/w1 Likg== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCWNi5M7hV4l2DjoOLWoipBVD9xCt79/41tyPlKBlxIfGBw1n6biSSuxNHVq0Y9jLlamUbkO@ilbers.de X-Gm-Message-State: AOJu0Ywsit8K8BtUC59kW7Kp0wnnvP9DHRjjhDnwLYQ+WfPuRaHq2rWi feu3MAgMMRWRc9I5iePu7NMuHoQ45SG6n0UL6qE2gMvx0EEvAQ9E X-Google-Smtp-Source: AGHT+IHTrUYGlHX6B13vS3U/TfzflAXB6RpNikrUKRh8U3hna056BtGBp2qgZEvPWMzzl5PAiM44GQ== X-Received: by 2002:a05:6e02:1c0b:b0:3d5:890b:d9df with SMTP id e9e14a558f8ab-3d5cce0d37fmr38808145ab.15.1743071593367; Thu, 27 Mar 2025 03:33:13 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=ARLLPALyTbzmcYSuUpb4lstuO85GYWDo0EHTd8wzhzZ5QKc8lA== Received: by 2002:a05:6e02:1a8a:b0:3d2:af50:1124 with SMTP id e9e14a558f8ab-3d5ccc9d1b3ls3200185ab.2.-pod-prod-04-us; Thu, 27 Mar 2025 03:33:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWSAk3Lkibdt+iym5BtkaH7TCOkGpl8jUpQtM8iQzgZcKTWf9DR2siqIG0M3ibiW6VmWhI4U6WZgixR@googlegroups.com X-Received: by 2002:a05:6e02:1f86:b0:3d0:10ec:cc36 with SMTP id e9e14a558f8ab-3d5ccdd4421mr31314805ab.11.1743071592283; Thu, 27 Mar 2025 03:33:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743071592; cv=none; d=google.com; s=arc-20240605; b=hlQvD7p/mQ9/CGPgqb704NIG3ua8JWuyCnl5QSPJaIHJD30GWBfL+HvsTm3YCBRuwp jVD3zmTSIsHgsINMpMmcJmuzh65yqtIAyF9ssfABgZQObTRcIjp7BrWEJZLPSHcmoVFY kts7sGSaBSaj+f5swhYj7jTHFH/WqQA/rHI9vKvLjdFaSiUPXyggjCZp5VMuuNG8VNhY tdKJWPKd5JR3VLMqNgr/kLphxxCykXrjbxFCow8LAme0cKjedk7RM9OLeOZBjRY8ZeTr QxsxiZsHmusWL+Vd7BOTZm9Ou9hi9M/IqhSzQDIL9DjYQLZxzsMaQ7oXFkze/usQGp6f yDpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id; bh=u8CtrNIBM8Uxkc1BsAhB002twXImuAPEG7MUm0eT6Bc=; fh=JZvUnqoG0jWph92hWpw0EINycbLveqkIcdkusZDYok4=; b=SfFuohLLp0rgH00QEyrXRIxI3hgTsgikzpy4PUxmUZoa8DKyFo7LvHeGli8mlzDbJG V9DRcXWg6k6j7dHspqnqtwCOxjIE2edCu4IQVygMilh8qpUbbq71OHomCW9M1wCPSkVC tBYVvM6qH3Of9JsmZoy0LpREo/dCly46mtb8VtaeVO80ntEEOWJI1dmliSXrALssyxP6 GeJWsCqHSijHw3IOnc9SzViMKQCKAGydJvdbi0slhQD21rGhwwi8aMSIHO4q3De4FwAj aXqQPnN5yPhko1g3BQbuY9ETs2YD683KGjVf6TS3rBayD1IggGNWm9pwJranGdMU5mOd X2zg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id e9e14a558f8ab-3d5960d7e2csi7665155ab.4.2025.03.27.03.33.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Mar 2025 03:33:12 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from [127.0.0.1] (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 52RAX7Mu004660 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 27 Mar 2025 11:33:09 +0100 Message-ID: Subject: Re: [PATCH v3] debianize: Fix unexpected characters in package lists From: Uladzimir Bely To: Anton Mikanovich , isar-users@googlegroups.com Date: Thu, 27 Mar 2025 13:33:07 +0300 In-Reply-To: <20250320144512.342515-1-amikan@ilbers.de> References: <20250320144512.342515-1-amikan@ilbers.de> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.56.0 (by Flathub.org) MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: ubely@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-TUID: iZP7LL+ECdE1 On Thu, 2025-03-20 at 16:45 +0200, Anton Mikanovich wrote: > Newer dpkg-deb versions got more pedantic to the control file format. >=20 > Introduce debian package list format helper to cleanup empty items or > unexpected commas in dependency options passing to the default > control > file. >=20 > This prevents errors like: > > dpkg-deb: error: unexpected end of file in archive magic version > > number in *.deb > > Unexpected character ')' parsing formula 'Package (=3D ), > > Architecture (=3D ), $PackageType (=3D deb)'! > > There have been errors! > caused by empty DEBIAN_BUILD_DEPENDS value in the line: > > Build-Depends: debhelper-compat (=3D ${DEBIAN_COMPAT}), > > ${DEBIAN_BUILD_DEPENDS} > which results in: > > Build-Depends: debhelper-compat (=3D 13), >=20 > Signed-off-by: Anton Mikanovich > --- >=20 > Changes since v2: > - Fix missing vardeps. >=20 > Changes since v1: > - Update also file headers. >=20 > =C2=A0meta/classes/base.bbclass=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | 16 ++++++= ++++++++++ > =C2=A0meta/classes/debianize.bbclass | 21 +++++++++++++++------ > =C2=A02 files changed, 31 insertions(+), 6 deletions(-) >=20 > diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass > index 7d4ab49f..c730eec9 100644 > --- a/meta/classes/base.bbclass > +++ b/meta/classes/base.bbclass > @@ -1,4 +1,8 @@ > +# This software is a part of ISAR. > +# > =C2=A0# Copyright (C) 2003=C2=A0 Chris Larson > +# Copyright (C) 2015-2025 ilbers GmbH > +# Copyright (C) 2017-2025 Siemens AG > =C2=A0# > =C2=A0# Permission is hereby granted, free of charge, to any person > obtaining a > =C2=A0# copy of this software and associated documentation files (the > "Software"), > @@ -334,3 +338,15 @@ do_unpack[postfuncs] +=3D > "create_source_date_epoch_stamp" > =C2=A0 > =C2=A0def get_source_date_epoch_value(d): > =C2=A0=C2=A0=C2=A0=C2=A0 return oe.reproducible.epochfile_read(d.getVar('= SDE_FILE'), d) > + > +def deb_list_beautify(d, varname): > +=C2=A0=C2=A0=C2=A0 line =3D d.getVar(varname) > +=C2=A0=C2=A0=C2=A0 if not line: > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return '' > + > +=C2=A0=C2=A0=C2=A0 var_list =3D [] > +=C2=A0=C2=A0=C2=A0 for a in line.split(','): > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 stripped =3D a.strip() > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if stripped: > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 var_l= ist.append(stripped) > +=C2=A0=C2=A0=C2=A0 return ', '.join(var_list) > diff --git a/meta/classes/debianize.bbclass > b/meta/classes/debianize.bbclass > index 5e9d76f3..4989c601 100644 > --- a/meta/classes/debianize.bbclass > +++ b/meta/classes/debianize.bbclass > @@ -1,6 +1,7 @@ > =C2=A0# This software is a part of ISAR. > =C2=A0# Copyright (C) 2017-2019 Siemens AG > =C2=A0# Copyright (C) 2021 Siemens Mobility GmbH > +# Copyright (C) 2025 ilbers GmbH > =C2=A0# > =C2=A0# SPDX-License-Identifier: MIT > =C2=A0 > @@ -18,6 +19,8 @@ DEBIAN_CHANGELOG_TIMESTAMP ??=3D "3600" > =C2=A0DESCRIPTION ??=3D "must not be empty" > =C2=A0MAINTAINER ??=3D "Unknown maintainer " > =C2=A0 > +DEBIANIZE_BUILD_DEPENDS ?=3D "debhelper-compat (=3D ${DEBIAN_COMPAT}), > ${DEBIAN_BUILD_DEPENDS}" > + > =C2=A0deb_add_changelog() { > =C2=A0 changelog_v=3D"${CHANGELOG_V}" > =C2=A0 timestamp=3D"${DEBIAN_CHANGELOG_TIMESTAMP}" > @@ -66,6 +69,12 @@ EOF > =C2=A0} > =C2=A0 > =C2=A0 > +deb_create_control[vardeps] +=3D "DEBIANIZE_BUILD_DEPENDS \ > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 DEBIAN_DEPENDS \ > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 DEBIAN_PROVIDES \ > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 DEBIAN_REPLACES \ > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 DEBIAN_BREAKS \ > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 DEBIAN_CONFLICTS" > =C2=A0deb_create_control() { > =C2=A0 cat << EOF > ${S}/debian/control > =C2=A0Source: ${BPN} > @@ -73,15 +82,15 @@ Section: misc > =C2=A0Priority: optional > =C2=A0Standards-Version: 3.9.6 > =C2=A0Maintainer: ${MAINTAINER} > -Build-Depends: debhelper-compat (=3D ${DEBIAN_COMPAT}), > ${DEBIAN_BUILD_DEPENDS} > +Build-Depends: ${@ deb_list_beautify(d, 'DEBIANIZE_BUILD_DEPENDS')} > =C2=A0 > =C2=A0Package: ${BPN} > =C2=A0Architecture: ${DPKG_ARCH} > -Depends: ${DEBIAN_DEPENDS} > -Provides: ${DEBIAN_PROVIDES} > -Replaces: ${DEBIAN_REPLACES} > -Breaks: ${DEBIAN_BREAKS} > -Conflicts: ${DEBIAN_CONFLICTS} > +Depends: ${@ deb_list_beautify(d, 'DEBIAN_DEPENDS')} > +Provides: ${@ deb_list_beautify(d, 'DEBIAN_PROVIDES')} > +Replaces: ${@ deb_list_beautify(d, 'DEBIAN_REPLACES')} > +Breaks: ${@ deb_list_beautify(d, 'DEBIAN_BREAKS')} > +Conflicts: ${@ deb_list_beautify(d, 'DEBIAN_CONFLICTS')} > =C2=A0Multi-Arch: ${DEBIAN_MULTI_ARCH} > =C2=A0Description: ${DESCRIPTION} > =C2=A0EOF > --=20 > 2.34.1 Applied to next. --=20 Best regards, Uladzimir. --=20 You received this message because you are subscribed to the Google Groups "= isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an e= mail to isar-users+unsubscribe@googlegroups.com. To view this discussion visit https://groups.google.com/d/msgid/isar-users/= ab182292bad2f9f85deadde7a94d61e629b028e0.camel%40ilbers.de.