From: Adriaan Schmidt <adriaan.schmidt@siemens.com>
To: isar-users@googlegroups.com
Cc: Adriaan Schmidt <adriaan.schmidt@siemens.com>
Subject: [PATCH 1/1] fix: trixie package exceptions
Date: Tue, 26 Mar 2024 09:47:02 +0100 [thread overview]
Message-ID: <20240326084702.1796722-1-adriaan.schmidt@siemens.com> (raw)
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 <adriaan.schmidt@siemens.com>
---
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
next reply other threads:[~2024-03-26 8:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-26 8:47 Adriaan Schmidt [this message]
2024-03-26 9:00 ` Anton Mikanovich
2024-03-26 9:37 ` Schmidt, Adriaan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240326084702.1796722-1-adriaan.schmidt@siemens.com \
--to=adriaan.schmidt@siemens.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox