| Message ID | 20240909055139.899124-1-srinuvasan.a@siemens.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] meta/recipes-kernel/linux/files: use debhelper-compat to generate compat file | expand |
Hi All, With this change, tested few buster and bullseye and bookworm builds working fine, thanks -----Original Message----- From: Arjunan, Srinu (DI CTO FDS CES LX PBU 2) <srinuvasan.a@siemens.com> Sent: 09 September 2024 11:22 To: isar-users@googlegroups.com Cc: Kiszka, Jan (T CED) <jan.kiszka@siemens.com>; ubely@ilbers.de; Arjunan, Srinu (DI CTO FDS CES LX PBU 2) <srinuvasan.a@siemens.com> Subject: [PATCH v2] meta/recipes-kernel/linux/files: use debhelper-compat to generate compat file 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/files/debian/compat | 1 - meta/recipes-kernel/linux/files/debian/control.tmpl | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 meta/recipes-kernel/linux/files/debian/compat 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} -- 2.39.2
On Mon, 2024-09-09 at 11:21 +0530, srinuvasan.a@siemens.com 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/files/debian/compat | 1 - > meta/recipes-kernel/linux/files/debian/control.tmpl | 2 +- > 2 files changed, 1 insertion(+), 2 deletions(-) > delete mode 100644 meta/recipes-kernel/linux/files/debian/compat > > 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, This is not in TEMPLATE_VARS, so build fails with error like: ``` Filtered Build-Depends: debhelper-compat (= ${DEBIAN_COMPAT}), bc, kmod, cpio, build-essential:amd64, libelf-dev:amd64, libncurses- dev:amd64, libssl-dev:amd64, bison, dwarves, flex, git, rsync, build- essential:amd64, fakeroot:amd64, crossbuild-essential-armhf:amd64, libc-dev:armhf, libstdc++-dev:armhf dpkg-deb: error: parsing file '/<<RESOLVERDIR>>/sbuild-build-depends- main-dummy/DEBIAN/control' near line 4 package 'sbuild-build-depends- main-dummy:armhf': 'Depends' field, reference to 'debhelper-compat': version '${DEBIAN_COMPAT}': version number does not start with digit ``` > cpio, ${KBUILD_DEPENDS} > Homepage: http://www.kernel.org/ > > Package: linux-image-${KERNEL_NAME_PROVIDED}
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}