From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7350604452427988992 X-Received: by 2002:a17:90a:de94:b0:29d:f2f9:a153 with SMTP id n20-20020a17090ade9400b0029df2f9a153mr655089pjv.15.1711445965144; Tue, 26 Mar 2024 02:39:25 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90a:c28b:b0:2a0:5cea:3781 with SMTP id f11-20020a17090ac28b00b002a05cea3781ls1476973pjt.1.-pod-prod-03-us; Tue, 26 Mar 2024 02:39:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFNG0vtq1KSdP13FGoZt9aTcR/sKVW3iGUrzSusKpjjVFqlnBnKIqhvQzLIiTy5BxEWpZG2 X-Received: by 2002:a17:90a:1002:b0:29d:d93a:d6e5 with SMTP id b2-20020a17090a100200b0029dd93ad6e5mr600921pja.16.1711445963905; Tue, 26 Mar 2024 02:39:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711445963; cv=none; d=google.com; s=arc-20160816; b=AtrC2xmwRfjBujP0Sg3KXC0VwSNYdAiChFOvDo17JZDk6frE5eMXe8O76YTu5xbmEX uQ8GBBxVVaNEMDTptD3d5oImjqLThpPUKBXLFyjhtEiGuUYNqdnXmtSViP0438CDnbOo VbI+XabTx50mvQDJU3yLUgU8bRUenBL+Gw9X0oMq4EpH8mARL4S4zDjZpGJrHEm31ItJ hUMAxgBR32H8JzgNj/MyVW3Ci3Fby4lZ3PJTUJ8+z7GnLsrWlorBJnWqsXRPbrrNJYUs D6y+Y0L7ZwbdOahstkcLy2OheyM6Ktfivu77Q9kW1rcqfa4+RI772+PTalYQxDqcR/ec LCrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:message-id:date :subject:cc:to:from:dkim-signature; bh=t09V8m+SfmoAfcs4vlp1wBOz/7ICOjZqo5ylLEetd+4=; fh=wTfLAPiT8iy63hccwzcZuLf6IB/ehBDfYt5BOmR3yPE=; b=RA82gz1Ijg568TTS5+ub6d1xw6XuCgYRcl+s9h1DgF5oco7YWhENBL0PwY+XEJoTBK vCPMtOR/Ascg+sMotrfAFdRv1UmxPpRErkBOb9fpiyRtQAUwNajSAXln2tC2GNvTyOE2 RwVV0z85iCUPLp4pT/uIbhL7NTCnKN3uCWDnW9ySoeXwQNa44VESa6VZVDTmKCv/kcbL KAeLFaROfEx4Ao1KzpgtN9O2k2rVPcyLQznEqrGfYL8cukISqwis11Q50xt4uP/fGZiJ 1r+yL2wBRGfajIy9CHMI7FUBlkQZITQWSE3A3JROabYdfAfO1DCCA+K5PSkAHS43XJS1 uIQQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Ey1dqf7H; spf=pass (google.com: domain of fm-526363-20240326093921e4c44004f647399258-jqg6dj@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-526363-20240326093921e4c44004f647399258-jqG6Dj@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id i18-20020a17090ad35200b002a04a08d984si111974pjx.1.2024.03.26.02.39.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2024 02:39:23 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-526363-20240326093921e4c44004f647399258-jqg6dj@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Ey1dqf7H; spf=pass (google.com: domain of fm-526363-20240326093921e4c44004f647399258-jqg6dj@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-526363-20240326093921e4c44004f647399258-jqG6Dj@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20240326093921e4c44004f647399258 for ; Tue, 26 Mar 2024 10:39:21 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=adriaan.schmidt@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc; bh=t09V8m+SfmoAfcs4vlp1wBOz/7ICOjZqo5ylLEetd+4=; b=Ey1dqf7HkfmxTwzLyB7Y8pH2c35jzk/f90blg71DmSWNq1J3yooFMXRFZjFuNHBO9DRBN4 AzP2te62ZX7zOeheFicnnSHw+NLdFzpYjnmMgYi4k+RJKZA4p55dBwIGNFDOOpPoP4B2Sh7c 5SYCNRZXMMwDOY0iUVjbXo46AZw4A=; From: Adriaan Schmidt To: isar-users@googlegroups.com Cc: Adriaan Schmidt Subject: [PATCH v2 1/1] fix: package exceptions for distro versions Date: Tue, 26 Mar 2024 10:39:19 +0100 Message-Id: <20240326093919.1847049-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-526363:519-21489:flowmailer X-TUID: 82EV1LTONGZY We have some cases of changing package names (originally between bullseye and bookworm), which were solved by adding explicit exceptions for bookworm. This cleans that up: - assume bookworm is the default - define exceptions for bullseye and buster (making it easier to find them once those versions are dropped) Signed-off-by: Adriaan Schmidt --- meta/conf/distro/debian-common.conf | 6 +++--- meta/recipes-kernel/kselftest/kselftest.inc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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 = "shim-helpers-amd64-signed" SYSLINUX_BOOTLOADER_INSTALL = "syslinux syslinux-common" -SYSTEMD_BOOTLOADER_INSTALL = "systemd:${DISTRO_ARCH}" -SYSTEMD_BOOTLOADER_INSTALL:bookworm = "systemd-boot-efi:${DISTRO_ARCH}" -SYSTEMD_BOOTLOADER_INSTALL:sid = "systemd-boot-efi:${DISTRO_ARCH}" +SYSTEMD_BOOTLOADER_INSTALL = "systemd-boot-efi:${DISTRO_ARCH}" +SYSTEMD_BOOTLOADER_INSTALL:bullseye = "systemd:${DISTRO_ARCH}" +SYSTEMD_BOOTLOADER_INSTALL:buster = "systemd:${DISTRO_ARCH}" COMPAT_DISTRO_ARCH:amd64 = "i386" COMPAT_DISTRO_ARCH:arm64 = "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 ?= " \ rsync, \ flex, \ bison, \ - ${@ 'fuse3' if d.getVar('BASE_DISTRO_CODENAME') == 'bookworm' else 'fuse'}, \ + ${@ 'fuse' if d.getVar('BASE_DISTRO_CODENAME') in ['bullseye', 'buster'] else 'fuse3'}, \ libelf-dev:native, \ libcap-ng-dev:native, \ libpopt-dev:native, \ -- 2.30.2