[PATCH v2 1/1] fix: package exceptions for distro versions

[Adriaan Schmidt <adriaan.schmidt@siemens.com>]

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 <adriaan.schmidt@siemens.com>
---
 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