From patchwork Tue Mar 26 09:39:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 3455 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 26 Mar 2024 10:39:32 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-pj1-f64.google.com (mail-pj1-f64.google.com [209.85.216.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 42Q9dUmi017152 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 26 Mar 2024 10:39:31 +0100 Received: by mail-pj1-f64.google.com with SMTP id 98e67ed59e1d1-29bf071cc04sf4827635a91.0 for ; Tue, 26 Mar 2024 02:39:31 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711445965; cv=pass; d=google.com; s=arc-20160816; b=RbxfIlUBQ4cy1SJvqbvxZ50EyIVuYtVUeC2VxX8bmCllilBLb0M9VLog3Tjp+Bxj1z YYL7cIaGAf03M5D4SScCBeAytJZtqd+1dw3lS/ZVtuUPIXBEdXktCFFzC4BbBKQSbT4y DpGtmogSwLKhJwxKOdCgacHMPg0X+3iTceyCp77/EK71yk6zfJqQZIQXIA/niOto6hLP h33qRGbMj+FmsMSEcHT1vz3N1h56Ft4zHjA0wmlOGfKnLIgjXrrGvozy0R7KFKrEGPtA 63Ah+JO60XChVFy4nOEfYD/6byx2RHatWTUZ2VLZTxRc0E2tbf+T5A0yVVJjOjk/d91I MWag== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=VnLUPi+25lU0kxVHeahjesCwzW/FYV7hsiA/uMoQ8GI=; fh=6855xJRGhJaqfBNiP8fJ7slmohrq9xCa9LHNZjyWDSE=; b=fjot7MZ/ugbprFMubHBKP6q0Qk/U8+hsz68E3/3nlF4ElnnvkBKYNDEa1WbQ1HEhLD Krr/AwLv9E+/6+BY9V9HpfIP8007u0ZYrsb62/SzEq7KW33ioXCIZ99XJJ1s1+LZWZDW N9uu4dJ+0t5CIdadUQzJ8ITNK4ubrIyvzMiNV8pFJcEbZubAlXGWSuaRnqmizcoyYdCE pZhwBXqN9liz1sjjG2ppmb8MEqjxHOv9e3LLBCsfEza18+pXFZ7uhkziLX84m55K7EzB vSkQgZZzhYnwm6QZkJtWwAbEZnC0Eq1Uvk9/BWlNYvouCx/e/1mzpyPP7447e1ICVHvy SRPQ==; darn=isar-build.org ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1711445965; x=1712050765; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=VnLUPi+25lU0kxVHeahjesCwzW/FYV7hsiA/uMoQ8GI=; b=CZkcXIfK5+pVVsDsEGdBm4tesKkKh92LKlKxV1aVWN1dSBmxz0IcB4UBu9/eHsUJdB O2rclbvEafU0q0xzok1jYcRXly7fAve5Rid4dXKEN14iH1+GlqdF+FsjEkGItjZ5v5m7 +GynzWNggEMhQWDXGby1S+jtCjM/u3B4tfYheOicZtVRf/xJ04n4SSUtrGTpNVRaQ6jM LrtrSqHdYhr3qw1QNwbrG+5OuE3o/xHVp396oU/j2hnJQzRnJvPQFl+27G4VnweKCcYX yHdrRS5m1IE9S1faL65FRyxGM11V/Czzkk+6X2SNHZpF8NYFyCnOU8Irl+D5BbVmgm7M GvRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711445965; x=1712050765; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:cc:to:from:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=VnLUPi+25lU0kxVHeahjesCwzW/FYV7hsiA/uMoQ8GI=; b=hSFsUcdTRXwHHXVZyHDfMFxRLzenR9zhYq4ZLLA++Xqz8FXLuD2fQ80ONw24Byz8pk f58SINU6q79J/xHZevilJKRdV+1M5yvFv/VJblK2/Nktk2Il05WklZkY3mEqzIqe4f6A uAcrXIANnzVsre16L0BfHqRVZ8xUn62rHQEw4tNlY1kznt5n7HrQWrzRGmv4H0AadF98 I0nolU5xJCE3ltjG497qeR/WE3PCwuivElXKbH5dy5oEq3nw6tTj0iyUTWWbcAFKCyVf Jx7YkaYltC2IluCa6TvGG5GKY/y6uRhXsfhfcQaeT6KUwB1PLzQ8QKrtCezygMxqb2h1 M1bw== X-Forwarded-Encrypted: i=2; AJvYcCUvzGumAiNRnezXMzXQL5ci7UILxRYD+CyBDI6xgbitddMWlbjY9CwTmyuG8g53oBm8CDE30UxjX2Sx3A/SBhCdrGc0DDc= X-Gm-Message-State: AOJu0Yyi25nB7L5gOmn8SI3SN12S2ZCAgvtwMsD8XjAZL/W4wdexSih4 6rbD6W8vP8sFqwc+9Q49l1Qb9ydFMUhFmNOx3eKGQ5KWoKWTjeF1 X-Google-Smtp-Source: AGHT+IFV2DiFpEZ+DCv77s1lLEZifrCWWxVO5sxYy6Y2HpOC3++DgYARauFRe8CgbYVQkze3WqkzCw== X-Received: by 2002:a17:90a:d911:b0:2a0:2a36:91a0 with SMTP id c17-20020a17090ad91100b002a02a3691a0mr601101pjv.18.1711445965025; 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-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 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; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20240326093921e4c44004f647399258 for ; Tue, 26 Mar 2024 10:39:21 +0100 X-Patchwork-Original-From: "'Adriaan Schmidt' via isar-users" From: "Schmidt, Adriaan" 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 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-526363:519-21489:flowmailer X-Original-Sender: adriaan.schmidt@siemens.com X-Original-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 X-Original-From: Adriaan Schmidt Reply-To: Adriaan Schmidt 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-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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, \