From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7350590995099025408 X-Received: by 2002:a05:6214:2a81:b0:696:a03c:6a82 with SMTP id jr1-20020a0562142a8100b00696a03c6a82mr639120qvb.61.1711442832698; Tue, 26 Mar 2024 01:47:12 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ad4:5ceb:0:b0:690:c950:c414 with SMTP id iv11-20020ad45ceb000000b00690c950c414ls7720839qvb.2.-pod-prod-09-us; Tue, 26 Mar 2024 01:47:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEXWq2GKDlz91m7RyTOzOeDFNLYrxzvrYD/eW9rWFvTB+XOsJiKgG6NAyRWbiaa0rTy0NBl X-Received: by 2002:a05:6122:1b0a:b0:4d4:3ec6:421e with SMTP id er10-20020a0561221b0a00b004d43ec6421emr7008996vkb.4.1711442831600; Tue, 26 Mar 2024 01:47:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711442831; cv=none; d=google.com; s=arc-20160816; b=Kgz5yNamOQxqoKOOw3eFWJnoCssXzBq29iKZQU2Dd3FUobh7k6n7ssiKIoSxTqReHN aBoK1qYMrqH6Oj1T3In+JSBjkLLtZQ/OIZEWzTz7mMrET1znB1m0fAf+qbhuLqhv1N9L a1swKHyuE11XhnXwWUeqQsaXuMPeVXD2+0zBYbpp5KHRDBcA/I3LhxkMBsuwSOv2lY3w PEW1TgktfKpzBhMnB7lYCvG3Yh6gXAVgpFbEubGbtugq5KYnNn4ugVgv/Uw1pVXjDfL3 yuK1KgHbdIeTlCrRmeh7XJ0hn6KIbYklJv1HCnzJmUHygYS+ZyEoDr9iVAQpcLitGsPD 06WQ== 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=F2rCkc+fRApAfivIV0EwIMSKqn4FhzFixcDFfH6BfSg=; fh=wTfLAPiT8iy63hccwzcZuLf6IB/ehBDfYt5BOmR3yPE=; b=RbipM7bcdx6TDcg/13HXvb5KAIWSNidz6BHYhpppf6XnzigrjGF3y/YhikVt/Bpx2M dyPFF0iMOB/59JSQ41DPG9T4/te8mRdEvBdJLmnVp4mFYtnmuP+oR7Q1bptl/mrF3bUA EDCj7FkFliit4PSwJUCzxDPxtcVtg2lNLy3oKG9IyaKNxTG/EcjfvmSS2qyb8tZkftKa +BDasISG+3B3WgYsEVsiVOm15SSqMQlteyTmyPniBpVK7WKYKiVDXL8RoICJPjOFNup9 nhFbdfBRDMnxyDcePEm64yREaIORpIq1HY7/tnxVinP/HZ9rsj5CDmBZELqPDJ7v5EFe LwWw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=JRUWWrO0; spf=pass (google.com: domain of fm-526363-2024032608470995f0e8287d9c5dc38b-9_potj@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-526363-2024032608470995f0e8287d9c5dc38b-9_POtJ@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id m15-20020a1fee0f000000b004d41fe2c37csi991212vkh.5.2024.03.26.01.47.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2024 01:47:11 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-526363-2024032608470995f0e8287d9c5dc38b-9_potj@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=JRUWWrO0; spf=pass (google.com: domain of fm-526363-2024032608470995f0e8287d9c5dc38b-9_potj@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-526363-2024032608470995f0e8287d9c5dc38b-9_POtJ@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 2024032608470995f0e8287d9c5dc38b for ; Tue, 26 Mar 2024 09:47:10 +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=F2rCkc+fRApAfivIV0EwIMSKqn4FhzFixcDFfH6BfSg=; b=JRUWWrO0aEfX3+luoeslKWipxJ1M72+GT7H4EpPmYwcteM21jc6gGhcR1SnJ3x7N9DCC9k wV/Z6QKgwR9vvi1dhS+226AHyVqJtk/O+AaV5Oh72ufy+Zz6fQIzfGK/oigMOnQN6irnjFD0 6IXXFNavWNF2j0NKZvghaKS19QYgk=; From: Adriaan Schmidt To: isar-users@googlegroups.com Cc: Adriaan Schmidt Subject: [PATCH 1/1] fix: trixie package exceptions Date: Tue, 26 Mar 2024 09:47:02 +0100 Message-Id: <20240326084702.1796722-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: F03hLrWdGSmR We have some cases of changing package names (originally between bullseye and bookworm), which were solved by adding explicit exceptions for bookworm. This adds the same exceptions for trixie. Signed-off-by: Adriaan Schmidt --- meta/conf/distro/debian-common.conf | 1 + meta/recipes-kernel/kselftest/kselftest.inc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/conf/distro/debian-common.conf b/meta/conf/distro/debian-common.conf index 1e1dfc83..c6b5d2cd 100644 --- a/meta/conf/distro/debian-common.conf +++ b/meta/conf/distro/debian-common.conf @@ -35,6 +35,7 @@ SYSLINUX_BOOTLOADER_INSTALL = "syslinux syslinux-common" SYSTEMD_BOOTLOADER_INSTALL = "systemd:${DISTRO_ARCH}" SYSTEMD_BOOTLOADER_INSTALL:bookworm = "systemd-boot-efi:${DISTRO_ARCH}" +SYSTEMD_BOOTLOADER_INSTALL:trixie = "systemd-boot-efi:${DISTRO_ARCH}" SYSTEMD_BOOTLOADER_INSTALL:sid = "systemd-boot-efi:${DISTRO_ARCH}" COMPAT_DISTRO_ARCH:amd64 = "i386" diff --git a/meta/recipes-kernel/kselftest/kselftest.inc b/meta/recipes-kernel/kselftest/kselftest.inc index 6196f825..ffd44e67 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'}, \ + ${@ 'fuse3' if d.getVar('BASE_DISTRO_CODENAME') in ['bookworm', 'trixie'] else 'fuse'}, \ libelf-dev:native, \ libcap-ng-dev:native, \ libpopt-dev:native, \ -- 2.30.2