From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7330297939706773504 X-Received: by 2002:a05:6512:96d:b0:518:c3b7:bc0 with SMTP id v13-20020a056512096d00b00518c3b70bc0mr6061747lft.10.1713344425968; Wed, 17 Apr 2024 02:00:25 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3d0b:b0:513:c2e6:28da with SMTP id d11-20020a0565123d0b00b00513c2e628dals1766539lfv.0.-pod-prod-06-eu; Wed, 17 Apr 2024 02:00:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEFdVSlokZlWDQCtnYVvPCC1dqfjHnZUJc+RKcBUTgMKmnNimX3GQXFUx0sSPKnHAwZ1laR X-Received: by 2002:ac2:548a:0:b0:518:9258:527e with SMTP id t10-20020ac2548a000000b005189258527emr9309243lfk.62.1713344423921; Wed, 17 Apr 2024 02:00:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713344423; cv=none; d=google.com; s=arc-20160816; b=yK4NlkgNbLB0cdivLGnIEDDDxQjkh3gsFoYprkxxLUaqmnfEuihkls9gZZdFCsd5rT uqVTp9XJSEMvtAIU1k/IUNEHsMVhlCuehWVR0ueFEAwGvuIKdQrN7ZQIWv2SSzJhzuIA 5Jlk+5cU+/RWifsQHaUnQv0wEcxseb3oblHVTLBd9J59xHVfcjudtqCJIA+Wx4MG+4dy VwAKJgUumwcjoAP4rL9K/l8N7rBL8y20BDpyxMxL5BYKmVIlzWIH0ruIRwl9FhMqKiGO Ov7JNcUURwtv6lk7YUaiANl4U47vDpwT4taM1pkJpnRKy8MRb8X0JhiKEMCJw6rH81uu TEiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:mime-version:content-transfer-encoding:autocrypt :references:in-reply-to:date:cc:to:from:subject:message-id :dkim-signature; bh=266IQhC1Y4a7jXagFS9XZI645lEixS5uVnOXQqK+AcU=; fh=9MJ9P9fLw2MKBJ6RIr+EnhS80gHns+GjdcUt6r92WDI=; b=hO3AJ//zEe4ZtB8o2YknfNdtK334DkQajRw9abArGd9ODfn8AuRROXjTrU9wh9UDsl nrIt9mO2irz2CgTutd4kcUc91L6Z/s3jhpfXIfp8uW5IxBkxyLUhYa8HxLVC4FHGh2KP r6ZGGGIbfv2KRJc8K/xYHOHkZq3uZjm4/81R4KO16GJSfZE/vK1GwxtEPyg+7K0hpQap 9SBE1nE7+1m9c3J8J2QQGuSzwLWZASf/cZArGNm0+CKtzmTfrTGP0vRIXGrajibeQJSG OYthJ9XRqw32z/Gw7xK9VSyv9r3VZKxpEsUtC6aJtgDea+WeyW/Z2chG4UP1wmdK3xUH g9Ow==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Gq79NfDa; spf=pass (google.com: domain of fm-68982-20240417090022bde696e9c597c6409e-uxfutv@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-68982-20240417090022bde696e9c597c6409e-uxfUTv@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id be11-20020a056512250b00b00519591c3fd9si2848lfb.3.2024.04.17.02.00.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Apr 2024 02:00:23 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-68982-20240417090022bde696e9c597c6409e-uxfutv@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Gq79NfDa; spf=pass (google.com: domain of fm-68982-20240417090022bde696e9c597c6409e-uxfutv@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-68982-20240417090022bde696e9c597c6409e-uxfUTv@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 20240417090022bde696e9c597c6409e for ; Wed, 17 Apr 2024 11:00:22 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=florian.bezdeka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=266IQhC1Y4a7jXagFS9XZI645lEixS5uVnOXQqK+AcU=; b=Gq79NfDaW2XuZMR7SRO7c90Ll+XDxwkQ0JsIS3hECS9P5TrwDxSkgS2x1osBsY8z895xb0 EVc5NLaa6Mki7hn5eRsdZXm9YIxf+FOseNsWPV20qR0J04qYOx+U2IIqF9yELzyF8FG6j6kd BHZ5dxD4NpRMYn5CdPgL/JnYMEuko=; Message-ID: <053e96878295ab02691b1a2a06f760aebb8186d7.camel@siemens.com> Subject: Re: [PATCH v2] debianize: use debhelper-compat to generate compat file From: Florian Bezdeka To: Quirin Gylstorff , felix.moessbauer@siemens.com, Uladzimir Bely Cc: isar-users@googlegroups.com, Clara Kowalsky Date: Wed, 17 Apr 2024 11:00:20 +0200 In-Reply-To: <20240201101236.3555681-1-Quirin.Gylstorff@siemens.com> References: <20240201101236.3555681-1-Quirin.Gylstorff@siemens.com> Autocrypt: =?US-ASCII?Q?addr=3Dflorian.bezdeka@siemen?= =?US-ASCII?Q?s.com;_prefer-encrypt=3Dmutual?= =?US-ASCII?Q?;_keydata=3DmQENBFwsf8QBCAC2f4AQWu92LZC4bKyUYRxWIpWqGz790s?= =?US-ASCII?Q?pcYkXO7M8kfea4iC8qMxv2hT4HT0LTncRP6WiovVN2PeoOBfN5BSa5z?= =?US-ASCII?Q?LIrZGVXh7KmbdKhwhVU+ynoTq9G5uaO2Kos7Vv7nNCuatIq8tSNILuoB?= =?US-ASCII?Q?DFTAZnJW3y1V7YOwhDCPl5gbLSYqUY3OE0yksbtCcVI5istT4ED6mjQ?= =?US-ASCII?Q?9W+3uH1LrgFeEF0oxTjrEPxO5ZYATz0f/TYC8WiM0sMrV+n0eMDntlzA?= =?US-ASCII?Q?63D6lcRi5mNp2jPsJkq3tbWqyCrAe1sKPVJB44ekFwCk0kDIuhR13Q3R?= =?US-ASCII?Q?HE4Or/9sznhMUQjYueWXvTZfzH/VsQJHABEBAAG0LUZsb3JpYW4gQmV6?= =?US-ASCII?Q?ZGVrYSA8Zmxvcmlhbi5iZXpkZWthQHNpZW1lbnMuY29tPokBVAQTAQg?= =?US-ASCII?Q?APhYhBAzL4P3jiTHdthsq4cj0O1fnOEBVBQJcLH/FAhsDBQkB4TOABQs?= =?US-ASCII?Q?JCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEMj0O1fnOEBVc6YIAJ8oO4x?= =?US-ASCII?Q?TjOCpjxaS8XQE6VW50HE9I6ShbQVWUEGhF4qzJaACTQDjdg/aio7qNRa?= =?US-ASCII?Q?mnAy83Hy9sAxKVhXs+1R1fstN+JO8zgD3tJspucUkCiXlYu+Qcv2d6C?= =?US-ASCII?Q?ostv+h4nv8fkSoeLfsQu3GJt6W0RN7t+8H/9fUMXyuB8GWo4bhaZcti6?= =?US-ASCII?Q?78CotGLs6UGZpYEGiAMto8+9zVO/tdY1BkREM6bCVeQ9FnnpTRQy/tU5?= =?US-ASCII?Q?xemMWJI64UUP92TUIbQ3TZKAz4iG/Mle+YjiHBGrJM7TxjE3sDg5J2Fa?= =?US-ASCII?Q?HX4wmZPKGdB6wANKupf6HMMt2y7gduVmMKzgb8PDMLPZwWBSvjELQqz?= =?US-ASCII?Q?hiZAQ0EYLSqZwEIAIR4HMTQC4F4YxatIl6MIDY03zD4M3ZQpgyQ6QFL9?= =?US-ASCII?Q?Dq0I+PGc7A6z5rsGl76+D8pDFSN2BBJiLLlQadxKc3ZyTTlRp4bc=09bf?= =?US-ASCII?Q?FZRmsAXwVfLtBauXxGo9pkyhk8Vcjb2EJm6XR8PH99buGOXlFfTLsmeA?= =?US-ASCII?Q?ji/F4jU3qlUnwZMBvHZwRSFqOGdwKPMvW3FppfmREQ0o4xJ4b/bxGXx?= =?US-ASCII?Q?ko21uyR/S5rEJx6X8Ukw95h3JinXHx/g2cjbKHrWBDKoqtX9IZCamDny?= =?US-ASCII?Q?R+sfLWQbOKOrLNYLwLAQwOTVlZWTgue10G1q6Zi0r8RQ2T1Uy+ZLYagv?= =?US-ASCII?Q?Cbzp/lT7p3mv3ba68llX896c0AEQEAAbQ/QmV6ZGVrYSwgRmxvcmlhbj?= =?US-ASCII?Q?sgQmV6ZGVrYSBGbG9yaWFuIDxmbG9yaWFuLmJlemRla2FAc2llbWVuc?= =?US-ASCII?Q?y5jb20+iQEcBBABCAAGBQJgtKpnAAoJEEoHyE9rG1dPpJYH+gPnqpu7h?= =?US-ASCII?Q?4fsWOxco38e74MsazoUdfndTYP5tgaYTVE51ZhOZBl+4jYaywsmmFm9g?= =?US-ASCII?Q?6N4Tw3GiMEDB4YU1X7gQZ60fDKpYL5SnCu5qZirJ4RCV4LDA0789ir+6?= =?US-ASCII?Q?8/zfwXBTV5QoMH0+MkXB4BL+Km3f7X/GdN5oRoItAyKDBcEfGJo6afT?= =?US-ASCII?Q?PtcUdI9n7ExCSfJwb0SBvvkvUsdNppFDGOOHSioINbEHBs2VUvE43toM?= =?US-ASCII?Q?4mPLfhFIAtDcn5Byt80/kotU8v3Iyf86NYCa+0h77xTsKHcCUqe8Rvow?= =?US-ASCII?Q?bCIbig9GGbbd54TasfqQQOiAkn/WeGl33+UIVX1Q8zo7eyMJHzLJQ3I=3D?= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-68982:519-21489:flowmailer X-TUID: VmvIsp1rO2Qu Hi all, [CC: Clara] On Thu, 2024-02-01 at 11:12 +0100, 'Quirin Gylstorff' via isar-users wrote: > From: Quirin Gylstorff >=20 > debhelper supports the versions debhelper-compat (=3D 9) till > debhelper-compat (=3D 13). >=20 > This patch also adds the variable `DEBIAN_COMPAT` to set the compat > to the desired version. This introduces a regression. We are no longer able to build the rpi- firmware with that patch applied. Seems there are more side effects switching from debhelper to debhelper-compat. In our case something with the dh_dwz step goes wrong. TheELF file generated during build is no longer "recognized", or as a file with wrong input format. Clara can provide more information / logs if necessary. I have no solution/fix right now. As this is clearly a regression we should consider reverting. Best regards, Florian >=20 > Signed-off-by: Quirin Gylstorff > --- > meta-isar/conf/distro/raspios-bullseye.conf | 2 ++ > meta-isar/conf/distro/ubuntu-focal.conf | 2 ++ > meta-isar/conf/distro/ubuntu-jammy.conf | 2 ++ > meta/classes/debianize.bbclass | 13 ++----------- > meta/conf/distro/debian-bookworm.conf | 2 ++ > meta/conf/distro/debian-bullseye.conf | 2 ++ > meta/conf/distro/debian-buster.conf | 2 ++ > meta/conf/distro/debian-sid-ports.conf | 2 ++ > meta/conf/distro/debian-sid.conf | 2 ++ > 9 files changed, 18 insertions(+), 11 deletions(-) >=20 > diff --git a/meta-isar/conf/distro/raspios-bullseye.conf b/meta-isar/conf= /distro/raspios-bullseye.conf > index cc64a015..2515f0fd 100644 > --- a/meta-isar/conf/distro/raspios-bullseye.conf > +++ b/meta-isar/conf/distro/raspios-bullseye.conf > @@ -25,3 +25,5 @@ THIRD_PARTY_APT_KEYS +=3D "http://archive.raspberrypi.o= rg/debian/raspberrypi.gpg.k > COMPAT_DISTRO_ARCH:arm64 =3D "armhf" > =20 > DISTRO_GCC =3D "10" > + > +DEBIAN_COMPAT =3D "13" > diff --git a/meta-isar/conf/distro/ubuntu-focal.conf b/meta-isar/conf/dis= tro/ubuntu-focal.conf > index 7b400bc7..81728dec 100644 > --- a/meta-isar/conf/distro/ubuntu-focal.conf > +++ b/meta-isar/conf/distro/ubuntu-focal.conf > @@ -8,3 +8,5 @@ require conf/distro/ubuntu-common.inc > BASE_DISTRO_CODENAME =3D "focal" > =20 > DISTRO_GCC =3D "9" > + > +DEBIAN_COMPAT =3D "12" > diff --git a/meta-isar/conf/distro/ubuntu-jammy.conf b/meta-isar/conf/dis= tro/ubuntu-jammy.conf > index ce6ae511..afc4a731 100644 > --- a/meta-isar/conf/distro/ubuntu-jammy.conf > +++ b/meta-isar/conf/distro/ubuntu-jammy.conf > @@ -8,3 +8,5 @@ require conf/distro/ubuntu-common.inc > BASE_DISTRO_CODENAME =3D "jammy" > =20 > DISTRO_GCC =3D "11" > + > +DEBIAN_COMPAT =3D "13" > diff --git a/meta/classes/debianize.bbclass b/meta/classes/debianize.bbcl= ass > index 16f3638d..7de98673 100644 > --- a/meta/classes/debianize.bbclass > +++ b/meta/classes/debianize.bbclass > @@ -10,6 +10,7 @@ DEBIAN_BUILD_DEPENDS ??=3D "" > DEBIAN_DEPENDS ??=3D "" > DEBIAN_CONFLICTS ??=3D "" > DEBIAN_MULTI_ARCH ??=3D "no" > +DEBIAN_COMPAT ??=3D "10" > DESCRIPTION ??=3D "must not be empty" > MAINTAINER ??=3D "Unknown maintainer " > =20 > @@ -60,19 +61,15 @@ EOF > fi > } > =20 > -deb_create_compat() { > - echo 10 > ${S}/debian/compat > -} > =20 > deb_create_control() { > - compat=3D$( cat ${S}/debian/compat ) > cat << EOF > ${S}/debian/control > Source: ${BPN} > Section: misc > Priority: optional > Standards-Version: 3.9.6 > Maintainer: ${MAINTAINER} > -Build-Depends: debhelper (>=3D ${compat}), ${DEBIAN_BUILD_DEPENDS} > +Build-Depends: debhelper-compat (=3D ${DEBIAN_COMPAT}), ${DEBIAN_BUILD_D= EPENDS} > =20 > Package: ${BPN} > Architecture: ${DPKG_ARCH} > @@ -103,12 +100,6 @@ EOF > deb_debianize() { > install -m 755 -d ${S}/debian > =20 > - # create the compat-file if there is no file with that name in WORKDIR > - if [ -f ${WORKDIR}/compat ]; then > - install -v -m 644 ${WORKDIR}/compat ${S}/debian/compat > - else > - deb_create_compat > - fi > # create the control-file if there is no control-file in WORKDIR > if [ -f ${WORKDIR}/control ]; then > install -v -m 644 ${WORKDIR}/control ${S}/debian/control > diff --git a/meta/conf/distro/debian-bookworm.conf b/meta/conf/distro/deb= ian-bookworm.conf > index d0599dc6..ce7279e3 100644 > --- a/meta/conf/distro/debian-bookworm.conf > +++ b/meta/conf/distro/debian-bookworm.conf > @@ -15,3 +15,5 @@ DISTRO_KERNELS ?=3D "4kc-malta 5kc-malta 686-pae 686 al= pha-generic alpha-smp \ > s390x sh7751r sh7785lcr sparc64-smp sparc64" > =20 > DISTRO_GCC =3D "12" > + > +DEBIAN_COMPAT =3D "13" > diff --git a/meta/conf/distro/debian-bullseye.conf b/meta/conf/distro/deb= ian-bullseye.conf > index 9b76e68a..2cb9d20e 100644 > --- a/meta/conf/distro/debian-bullseye.conf > +++ b/meta/conf/distro/debian-bullseye.conf > @@ -12,3 +12,5 @@ DISTRO_KERNELS ?=3D "4kc-malta 5kc-malta 686 686-pae am= d64 arm64 armmp \ > rt-686-pae rt-amd64 rt-arm64 rt-armmp" > =20 > DISTRO_GCC =3D "10" > + > +DEBIAN_COMPAT =3D "13" > diff --git a/meta/conf/distro/debian-buster.conf b/meta/conf/distro/debia= n-buster.conf > index 025fc936..57cfac33 100644 > --- a/meta/conf/distro/debian-buster.conf > +++ b/meta/conf/distro/debian-buster.conf > @@ -12,3 +12,5 @@ DISTRO_KERNELS ?=3D "4kc-malta 5kc-malta 686 686-pae am= d64 arm64 armmp \ > rt-686-pae rt-amd64 rt-arm64 rt-armmp" > =20 > DISTRO_GCC =3D "8" > + > +DEBIAN_COMPAT =3D "12" > diff --git a/meta/conf/distro/debian-sid-ports.conf b/meta/conf/distro/de= bian-sid-ports.conf > index f045a3f2..64f3717e 100644 > --- a/meta/conf/distro/debian-sid-ports.conf > +++ b/meta/conf/distro/debian-sid-ports.conf > @@ -25,3 +25,5 @@ THIRD_PARTY_APT_KEYS +=3D "${DEBIAN_PORTS_KEYS}" > IMAGE_PREINSTALL +=3D "init" > =20 > IMAGER_INSTALL:wic +=3D "python3-distutils" > + > +DEBIAN_COMPAT =3D "13" > diff --git a/meta/conf/distro/debian-sid.conf b/meta/conf/distro/debian-s= id.conf > index 631f9b5a..fdf9775c 100644 > --- a/meta/conf/distro/debian-sid.conf > +++ b/meta/conf/distro/debian-sid.conf > @@ -19,3 +19,5 @@ DISTRO_KERNELS ?=3D "4kc-malta 5kc-malta 686-pae 686 al= pha-generic alpha-smp \ > s390x sh7751r sh7785lcr sparc64-smp sparc64" > =20 > DISTRO_GCC =3D "13" > + > +DEBIAN_COMPAT =3D "13" > --=20 > 2.43.0