[PATCH 1/1] fix: trixie package exceptions

[PATCH 1/1] fix: trixie package exceptions

[Adriaan Schmidt]

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

Re: [PATCH 1/1] fix: trixie package exceptions

[Anton Mikanovich]

26/03/2024 10:47, 'Adriaan Schmidt' via isar-users wrote:
> 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}"
Maybe its better to make systemd-boot-efi to be default and set 
overrides for
Buster and Bullseye? This will not require adding new overrides for the next
releases and will be easier to track when removing Buster and Bullseye 
in the
future.
>   
>   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, \

RE: [PATCH 1/1] fix: trixie package exceptions

[Schmidt, Adriaan]

Anton Mikanovich <amikan@ilbers.de>, Sent: Dienstag, 26. März 2024 10:01:
> 26/03/2024 10:47, 'Adriaan Schmidt' via isar-users wrote:
> > 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}"
> Maybe its better to make systemd-boot-efi to be default and set overrides for
> Buster and Bullseye? This will not require adding new overrides for the next
> releases and will be easier to track when removing Buster and Bullseye in the
> future.

I was actually thinking the same when I wrote the patch...
V2 coming up...
Adriaan

> >
> >   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, \
>