Re: [PATCH v3] meta/recipes-kernel: use debhelper-compat to generate compat file

["'MOESSBAUER, Felix' via isar-users" <isar-users@googlegroups.com>]

On Fri, 2025-01-31 at 13:14 +0100, 'Jan Kiszka' via isar-users wrote:
> On 16.12.24 12:20, srinuvasan.a via isar-users wrote:
> > From: srinuvasan <srinuvasan.a@siemens.com>
> > 
> > debhelper supports the versions debhelper-compat (= 9) till
> > debhelper-compat (= 13),
> > hence set appropriate debian helper compatible version in the
> > debian/control file and remove the debian/compat file.
> > 
> > Signed-off-by: srinuvasan <srinuvasan.a@siemens.com>
> > ---
> >  meta/recipes-kernel/linux-module/files/debian/compat       | 1 -
> >  meta/recipes-kernel/linux-module/files/debian/control.tmpl | 2 +-
> >  meta/recipes-kernel/linux-module/module.inc                | 3 ++-
> >  meta/recipes-kernel/linux/files/debian/compat              | 1 -
> >  meta/recipes-kernel/linux/files/debian/control.tmpl        | 2 +-
> >  meta/recipes-kernel/linux/linux-custom.inc                 | 1 +
> >  6 files changed, 5 insertions(+), 5 deletions(-)
> >  delete mode 100644 meta/recipes-kernel/linux-
> > module/files/debian/compat
> >  delete mode 100644 meta/recipes-kernel/linux/files/debian/compat
> > 
> > diff --git a/meta/recipes-kernel/linux-module/files/debian/compat
> > b/meta/recipes-kernel/linux-module/files/debian/compat
> > deleted file mode 100644
> > index f599e28b..00000000
> > --- a/meta/recipes-kernel/linux-module/files/debian/compat
> > +++ /dev/null
> > @@ -1 +0,0 @@
> > -10
> > diff --git a/meta/recipes-kernel/linux-
> > module/files/debian/control.tmpl b/meta/recipes-kernel/linux-
> > module/files/debian/control.tmpl
> > index 67b08244..3ec419f6 100644
> > --- a/meta/recipes-kernel/linux-module/files/debian/control.tmpl
> > +++ b/meta/recipes-kernel/linux-module/files/debian/control.tmpl
> > @@ -2,7 +2,7 @@ Source: ${PN}
> >  Section: kernel
> >  Priority: optional
> >  Standards-Version: 3.9.6
> > -Build-Depends: ${DEBIAN_BUILD_DEPENDS}
> > +Build-Depends: debhelper-compat (= ${DEBIAN_COMPAT}),
> > ${DEBIAN_BUILD_DEPENDS}
> >  Maintainer: ISAR project <isar-users@googlegroups.com>
> >  
> >  Package: ${PN}
> > diff --git a/meta/recipes-kernel/linux-module/module.inc
> > b/meta/recipes-kernel/linux-module/module.inc
> > index 1734816b..3e8e5e7a 100644
> > --- a/meta/recipes-kernel/linux-module/module.inc
> > +++ b/meta/recipes-kernel/linux-module/module.inc
> > @@ -57,7 +57,8 @@ TEMPLATE_VARS += " \
> >      SIGNATURE_KEYFILE \
> >      SIGNATURE_CERTFILE \
> >      SIGNATURE_HASHFN \
> > -    PN"
> > +    PN \
> > +    DEBIAN_COMPAT"
> >  
> >  # Add custom cflags to the kernel build
> >  KCFLAGS ?= "-fdebug-prefix-map=${CURDIR}=. -fmacro-prefix-
> > map=${CURDIR}=."
> > diff --git a/meta/recipes-kernel/linux/files/debian/compat
> > b/meta/recipes-kernel/linux/files/debian/compat
> > deleted file mode 100644
> > index f599e28b..00000000
> > --- a/meta/recipes-kernel/linux/files/debian/compat
> > +++ /dev/null
> > @@ -1 +0,0 @@
> > -10
> > diff --git a/meta/recipes-kernel/linux/files/debian/control.tmpl
> > b/meta/recipes-kernel/linux/files/debian/control.tmpl
> > index 04ad0f4f..f4273ea9 100644
> > --- a/meta/recipes-kernel/linux/files/debian/control.tmpl
> > +++ b/meta/recipes-kernel/linux/files/debian/control.tmpl
> > @@ -2,7 +2,7 @@ Source: linux-${KERNEL_NAME_PROVIDED}
> >  Section: kernel
> >  Priority: optional
> >  Maintainer: ${MAINTAINER}
> > -Build-Depends: bc, kmod, cpio, ${KBUILD_DEPENDS}
> > +Build-Depends: debhelper-compat (= ${DEBIAN_COMPAT}), bc, kmod,
> > cpio, ${KBUILD_DEPENDS}
> >  Homepage: http://www.kernel.org/
> >  
> >  Package: linux-image-${KERNEL_NAME_PROVIDED}
> > diff --git a/meta/recipes-kernel/linux/linux-custom.inc
> > b/meta/recipes-kernel/linux/linux-custom.inc
> > index bcdacaa9..e825d29b 100644
> > --- a/meta/recipes-kernel/linux/linux-custom.inc
> > +++ b/meta/recipes-kernel/linux/linux-custom.inc
> > @@ -89,6 +89,7 @@ TEMPLATE_VARS += "                \
> >      HEADERS_INSTALL_EXTRA         \
> >      ISAR_ENABLE_COMPAT_ARCH       \
> >      COMPAT_DISTRO_ARCH            \
> > +    DEBIAN_COMPAT                 \
> >  "
> >  
> >  inherit dpkg
> 
> I /suspect/ (no time right now to dig into details) that this causes
> some regression with buster builds. I've just bumped isar in
> isar-cip-core, and this error shows up:
> 
> https://gitlab.com/cip-project/cip-core/isar-cip-core/-/jobs/9004463238
> 
> Does it ring some bell? Maybe this only reveals a sleeping issue, and
> actually use the "right" compat version now, but that would still be
> a
> regression.

Hi, I remember Florian Bezdeka reported on issues w.r.t. compat level
changes, but on bookworm:arm64 [1].

What I noticed is that this patch changes the compat level: Prior to
the patch we had debian/compat = 10, now we use compat level 12 for
buster. By that we now automatically enable dh_dwz (which was disabled
before 12). For details, see [2]. We now basically have the following
options (choose at least one):

- set the compat-level for the linux-module to 10 on buster
- make the build compatible with dh_dwz
- disable dh_dwz in the rules files or via DEB_BUILD_OPTIONS=nostrip on
buster (which might also have side effects)

[1] https://groups.google.com/g/isar-users/c/6obXqgY0CC4/m/k6EU-N69AwAJ
[2]
https://manpages.debian.org/testing/debhelper/debhelper-compat-upgrade-checklist.7.en.html

Felix

> 
> Jan
> 
> -- 
> Siemens AG, Foundational Technologies
> Linux Expert Center
> 

-- 
Siemens AG
Linux Expert Center
Friedrich-Ludwig-Bauer-Str. 3
85748 Garching, Germany


-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/cf857d8da6a2900d7814371ad1ea2e0d93bd522b.camel%40siemens.com.