From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7350604452427988992 X-Forwarded-Encrypted: i=2; AJvYcCXDNLBPh8b/fk1yB5zP+SwZUlKn3+Ru8YaIvmmZQegU3z940FLBMect8XgdYLXjF8i9AG1A+78OKvwMUfVfKOUzgUUZ1Se6n9qgLhQ= X-Received: by 2002:a05:651c:1051:b0:2d6:c0d5:b96e with SMTP id x17-20020a05651c105100b002d6c0d5b96emr655177ljm.24.1712308721733; Fri, 05 Apr 2024 02:18:41 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1c13:b0:415:6178:9590 with SMTP id j19-20020a05600c1c1300b0041561789590ls990458wms.2.-pod-prod-09-eu; Fri, 05 Apr 2024 02:18:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVBcNLBed2/JoO0NT8bMIViuJgD2keIfLLZtJWgsqz2dvutk3Q86o7SzcmuNzgb7xW/27wHQcLXvNK6AXyOLUZmNaZ1MIPMK3isWQU= X-Google-Smtp-Source: AGHT+IG5dGpStmVi+nUA9l8Mquf2op/Kt1JMYZEBX3ggxptfAenGFwoNojCqNa2HhUDfnLHmUOXZ X-Received: by 2002:a05:600c:3ba7:b0:415:611c:cb1a with SMTP id n39-20020a05600c3ba700b00415611ccb1amr696774wms.1.1712308719188; Fri, 05 Apr 2024 02:18:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712308719; cv=none; d=google.com; s=arc-20160816; b=R7DZNyyX8aG5sygS8KhAwD978SVRu2Vy088omzhDnK11o6IV71gO6lXJsr+/IAxJ2b V4Dbqs1HHTxL1rN0e5BOy9SJD4VQOtVlRk8PmTTK11V1aqDyNQZCyyP76ItcR0AWy+WW NefyT65EvlAQC7UHnotPhU8Jtm3eANSGbRmNy7ZNRu6LioO6ycaL4dC3awLuEJrRt+NV LkdRGAKEKW1aeM3hnMVuMziUiQSm5AiBcKIAMzTxr0Swj+EL/urS4J5IA+jO9u8E58qs MGujCeeHaLuV9SA24SdK9yx2Y7dVH9NdeRS8dnwXlpXMwRZRRH/E7Beg1gyxzcigi3T5 9HyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:content-transfer-encoding:autocrypt :references:in-reply-to:date:to:from:subject:message-id; bh=lVg9yMAJYPoWY4em757tpjjt1gqFBAkQSaHyp4EbcGs=; fh=dfO0NjVjyTQruOkT3Q6mAQ6TmztBymNk0anynDrrOuA=; b=bszmKZA93XbmPv0oX5y1iI/k1REUGFxgJfzaPAm44lWlhYIwrr1HEzy5U4p7U4HA1n PuSbRxUVDNjWH8dBU9R0Blc8nlqe+VzaEjkUsHyPT7ZWiQeKsj5Yshcfqvg7QUZsaduU j063A82I2XNS1Z49qoPaKzHHH7JXGyGbiD09gWDkKBW78Ex5q2c+Z3iKpQ+FL6dcFN/b ty0FZCIa4CKiCCoVL0uGvTkMEoTDclZCFGO9N7VWRF8vtLKosUphIYSxlQuH9mcQQYLU SqQC9HkYqVHV/LS6Hs7KQhuMX0IA/+phLeIUZn3XEvdpCIRIX2NrcllHz+JnTC2mFdEc cKxQ==; 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 Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id p9-20020a05600c1d8900b004163221b9d3si17833wms.0.2024.04.05.02.18.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Apr 2024 02:18:39 -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; 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 Received: from [IPv6:::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 4359Ia1p000864 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 5 Apr 2024 11:18:37 +0200 Message-ID: <8ac8d4fe0c871d61a1b542c3b726bdedfb148573.camel@ilbers.de> Subject: Re: [PATCH v2 1/1] fix: package exceptions for distro versions From: Uladzimir Bely To: Adriaan Schmidt , isar-users@googlegroups.com Date: Fri, 05 Apr 2024 12:18:36 +0300 In-Reply-To: <20240326093919.1847049-1-adriaan.schmidt@siemens.com> References: <20240326093919.1847049-1-adriaan.schmidt@siemens.com> Autocrypt: addr=ubely@ilbers.de; prefer-encrypt=mutual; keydata=mQENBGO2eUkBCACtT+T3OrPVSExBmqfgXT3lp9XcdxRzjYp26wezkgYjjBXaf36bxtaAf S471VoQtpar0RVeFfW7WDDdfX9ZclSj36zBQe+RVSJzoNoNQfjOXWuSHb5Z+cpAFtqBY4muxK4+ia IlLJd6CN3ejOsLHATtCeHHq8wi0z2T+KdLQO+wQRgo2hjj0Lp9pGTrKJry50HP/o7Vbdu14dOx2xq r8+wPc6SQbBIrcqaa4MqCQC00vQG7eXvo+k2MOw59FDdpMH0KR9mHgp3u/s4I+4YRBArukt9G9xz/ rsEFmxAIBC6N/a6Hzwg4puc91n7ABDsPg8Vp+X3MDraujN0dvR6OKVNtABEBAAG0IFVsYWR6aW1pc iBCZWx5IDx1YmVseUBpbGJlcnMuZGU+iQFOBBMBCAA4FiEEJqPNVhVGyk12Eh+PAUQYBM/2FkoFAm O2eUkCGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQAUQYBM/2FkprlAgAmuna8Hm9EyoEtTl DBGDg6Zm4ZLp5ffvZBE946h92jepDrteoxsJ7pSzJVC2HmDLa4iZUao7lLLbDsUj5x45/iLJcqBZK k3YnAxP2r6a+kI+1VVQY1pxdG1nlJAbdNzoojm/qmezNPSrqni61KVMQKsXBCWhIjSXDSM9CsBj21 a+9qaVqfxovJGTn9lgrZO+xzKQNMKZeOouJlscVuFj21P0ww3/YENiU/nMeTSuYypO76mDtAd08Jo nc3yuHa9MJGei5ixN3wT+IrGR2aL2hdw2M6NgH7sYbL2Zi4ugD6RXHJai1Bh2yvFSVqSQ+M6QOInT 4ud7wslm1XRB065dXtLkBDQRjtnlJAQgA0nDigNK6FToZn7ezdts22l//+cyPF9k1OQM+wNuhdEYG ZvieFPNnH4iPf2C6OVPxOsHxs66X3mpn728s5Mg+0V2pkDqX4E9IU1sdPAFGC9Zl5eDGmE0PxqaTr lLG2ZA2lxouoHUe/xwE3fKiHENxiY4RVC8vya8dnU/SMnTc39uHS1nlPk0oPiZd2odHO+YABGz2pM LMShCstX+8LDlV/XxXacBbXYDeR+Xk78mFsjKzavfXWhZ7UoA6vitR7XG5y1koZ9FbtU6kq7JPRDe eYbVf0mIufdGTUBedza12M1Lm4knvzZRX+get1lLFngPstU48t041YfQKZpNK0cePPwARAQABiQE2 BBgBCAAgFiEEJqPNVhVGyk12Eh+PAUQYBM/2FkoFAmO2eUkCGwwACgkQAUQYBM/2Fkq3aQf6AuKj6 5nqjLIOLIasYQ6D28Jhip65ZFhW6XISv5rcjHkvYfMp4J+LaNOZk2P+1b/QN/2wDVisNGYq6lhkkf pBN3vTQlvMY0ugKDug2YaRYeuoLSFBMFVONa9N6437KQg+vRNd46d5282q9BTXAlOLWR/ZuXg/IR5 ZIV3JTwLtqbPCUGof85hFxSPWEHMYeeE7180r66wUjA/Zf46Mar9t+olviBW1ss5XOx1JWt7FpQ5p eETwmkoYi4Kq16iyuRB94mQqyy1C4fiqTq8dKr4uUYg759NWwU6j21G0kf31bDd4QgTIHvhY/8Agl dyzoeJX5Bz67KzX3+/fAWvPEXAvvg== Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.52.0 (by Flathub.org) MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED 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-TUID: Ra+LSZAJrGFD On Tue, 2024-03-26 at 10:39 +0100, 'Adriaan Schmidt' via isar-users wrote: > We have some cases of changing package names (originally between > bullseye > and bookworm), which were solved by adding explicit exceptions for > bookworm. >=20 > This cleans that up: > - assume bookworm is the default > - define exceptions for bullseye and buster (making it easier to find > them > =C2=A0 once those versions are dropped) >=20 > Signed-off-by: Adriaan Schmidt > --- > =C2=A0meta/conf/distro/debian-common.conf=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 | 6 +++--- > =C2=A0meta/recipes-kernel/kselftest/kselftest.inc | 2 +- > =C2=A02 files changed, 4 insertions(+), 4 deletions(-) >=20 > diff --git a/meta/conf/distro/debian-common.conf > b/meta/conf/distro/debian-common.conf > index 1e1dfc83..5c7a98d9 100644 > --- a/meta/conf/distro/debian-common.conf > +++ b/meta/conf/distro/debian-common.conf > @@ -33,9 +33,9 @@ GRUB_DEBIAN_SB_MOK:amd64 =3D "shim-helpers-amd64- > signed" > =C2=A0 > =C2=A0SYSLINUX_BOOTLOADER_INSTALL =3D "syslinux syslinux-common" > =C2=A0 > -SYSTEMD_BOOTLOADER_INSTALL =3D "systemd:${DISTRO_ARCH}" > -SYSTEMD_BOOTLOADER_INSTALL:bookworm =3D "systemd-boot- > efi:${DISTRO_ARCH}" > -SYSTEMD_BOOTLOADER_INSTALL:sid =3D "systemd-boot-efi:${DISTRO_ARCH}" > +SYSTEMD_BOOTLOADER_INSTALL =3D "systemd-boot-efi:${DISTRO_ARCH}" > +SYSTEMD_BOOTLOADER_INSTALL:bullseye =3D "systemd:${DISTRO_ARCH}" > +SYSTEMD_BOOTLOADER_INSTALL:buster =3D "systemd:${DISTRO_ARCH}" > =C2=A0 The similar fallback is needed for ubuntu images (ubuntu-common.conf): SYSTEMD_BOOTLOADER_INSTALL:focal =3D "systemd:${DISTRO_ARCH}" SYSTEMD_BOOTLOADER_INSTALL:jammy =3D "systemd:${DISTRO_ARCH}" Distros newer than Jammy include systemd-boot-efi package, so when we add Ubuntu Nobble it won't require such kind of redefinition. Current patch doesn't break building 'isar-image-base" since we use Grub by default. But "isar-image-ci" build gets broken since we replace grub with systemd bootloader in the image recipe. I think to send the fix for isar-image-ci separately, together with some kas-related changes (with support this image and meta-test layer) I used to debug failing CI issue when PATCH v2 is applied. So, there is no need in PATCH v3 of the patch. > =C2=A0COMPAT_DISTRO_ARCH:amd64 =3D "i386" > =C2=A0COMPAT_DISTRO_ARCH:arm64 =3D "armhf" > diff --git a/meta/recipes-kernel/kselftest/kselftest.inc > b/meta/recipes-kernel/kselftest/kselftest.inc > index 6196f825..95dece10 100644 > --- a/meta/recipes-kernel/kselftest/kselftest.inc > +++ b/meta/recipes-kernel/kselftest/kselftest.inc > @@ -20,7 +20,7 @@ DEBIAN_BUILD_DEPENDS ?=3D " \ > =C2=A0=C2=A0=C2=A0=C2=A0 rsync, \ > =C2=A0=C2=A0=C2=A0=C2=A0 flex,=C2=A0 \ > =C2=A0=C2=A0=C2=A0=C2=A0 bison, \ > -=C2=A0=C2=A0=C2=A0 ${@ 'fuse3' if d.getVar('BASE_DISTRO_CODENAME') =3D= =3D 'bookworm' > else 'fuse'}, \ > +=C2=A0=C2=A0=C2=A0 ${@ 'fuse' if d.getVar('BASE_DISTRO_CODENAME') in ['b= ullseye', > 'buster'] else 'fuse3'}, \ > =C2=A0=C2=A0=C2=A0=C2=A0 libelf-dev:native, \ > =C2=A0=C2=A0=C2=A0=C2=A0 libcap-ng-dev:native, \ > =C2=A0=C2=A0=C2=A0=C2=A0 libpopt-dev:native, \ > --=20 > 2.30.2 >=20 --=20 Best regards, Uladzimir.