From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7350604452427988992 X-Forwarded-Encrypted: i=2; AJvYcCWLhR/ovLnoFBQ04v3/lpNV44XyNGipTNqVwJyB6CNQz1LOQbt6HAlrIa/QfbOBa6I8VngXWMe2UyacRyZhedB33rSFOiImySv5MFw= X-Received: by 2002:a50:a458:0:b0:56c:4f5:7227 with SMTP id v24-20020a50a458000000b0056c04f57227mr2354058edb.41.1712811135136; Wed, 10 Apr 2024 21:52:15 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:4018:b0:56f:d8e5:ed99 with SMTP id d24-20020a056402401800b0056fd8e5ed99ls663871eda.2.-pod-prod-09-eu; Wed, 10 Apr 2024 21:52:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUXikRqw6ZPAPpA9f6dyAl7R7qX0P9XKdfbqsMm45SiMdAXAS6eAKE9BiVUX0Q4S3U8XO83swyr/jV3xkgnOvsTV7u7w7sRJa3QheY= X-Google-Smtp-Source: AGHT+IGZiZCYynGW7FOCs9rpFyWrGlIQduweoRm48eA5kT4F6xLSBYBZwVUkqR+ItRGkWEJgK/kH X-Received: by 2002:a17:906:f1c6:b0:a4e:4771:6267 with SMTP id gx6-20020a170906f1c600b00a4e47716267mr2913428ejb.4.1712811132936; Wed, 10 Apr 2024 21:52:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712811132; cv=none; d=google.com; s=arc-20160816; b=hrplR0Xhfey8jWs8TFJrfShD+8UaDcZ084QpZmMGXK1JHiAKmEfPgz9a++frKdbAFC B0vohDDmACgCNLuH+Dwk7PzVbkEzH+mYvtTDXNU/+32b5BeN0AHEtCtOPYkJKldk8rCl QQ+6sOz85a5FHHCRh21uAFqQ47CFl6hMIOVvikgBky2oPfL2dl5WoMtSxDq0L+BLUSlW 4DBL20lcA426Zq9tKe08iMLvcgAVI4SNfCXTRWr1QlsWTvy4HlHeNngARhe8scOWgcnA CCc1dJc9AVGbGf2UrMmz+ADhWEjpCJiOKAe0RxkQde4/IVbwkh4MbVKK7ZFh0naz73Ji +vmQ== 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:references :in-reply-to:date:to:from:subject:message-id; bh=AuLbeY+GY8q1j8pDnTLouvvJKe3pSwYCF0McZ/YiUJA=; fh=dfO0NjVjyTQruOkT3Q6mAQ6TmztBymNk0anynDrrOuA=; b=usnyJArQB5e4pVJGyf7M8Bx1o2g7xBJSkpq+OMR5sB/BlLQG/703KadPk6DMsxVfzb YpJszFes2RPF/F+slJDKqLqUAPPMX5ohLkD8jQZNwv3zT7EFCLnfcmJu+ZBQFIOFiZco DMYT1X+6QqbZ6BhJAvzf674pG2K+gS8d/jFxR5inrluLzKHidBrOBjkaXFIVUSOjLxFz hx1b85puuS1+Fd8nwe5zochwxLtoo1m+zjpbrdGrb3VedyNvHqDsoor2o9uViNnLTtNm RsPRo0MaqPOQEn0bJiD8bzZt5qOfsStNSOJd9gZJthUWkoaqkuVB5kehWmiDJ5BJL7Ko 9b6w==; 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 hv17-20020a17090760d100b00a51ad0c647csi20644ejc.0.2024.04.10.21.52.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 Apr 2024 21:52: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; 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 [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 43B4qADt030756 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 Apr 2024 06:52:11 +0200 Message-ID: <37bc93f2e0e3319b5309d632a11d386f273671c9.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: Thu, 11 Apr 2024 07:52:10 +0300 In-Reply-To: <20240326093919.1847049-1-adriaan.schmidt@siemens.com> References: <20240326093919.1847049-1-adriaan.schmidt@siemens.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.50.4 (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: v4xWGKVZNGsZ 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 > =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 Applied to next, thanks.