diff mbox series

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

Message ID 20241216112050.1286204-1-srinuvasan.a@siemens.com
State Accepted, archived
Headers show
Series [v3] meta/recipes-kernel: use debhelper-compat to generate compat file | expand

Commit Message

srinuvasan.a Dec. 16, 2024, 11:20 a.m. UTC 
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

Comments

Srinuvasan Arjunan Dec. 16, 2024, 11:15 a.m. UTC | #1 
Apologies for the delayed response, additionally added compat for 
linux-modules too, thanks!  

On Monday, December 16, 2024 at 4:42:52 PM UTC+5:30 srinuv...@siemens.com 
wrote:

> From: srinuvasan <srinuv...@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 <srinuv...@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-...@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
> -- 
> 2.39.5
>
>
Uladzimir Bely Dec. 20, 2024, 7:48 a.m. UTC | #2 
On Mon, 2024-12-16 at 16:50 +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-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

Applied to next, thanks.
diff mbox series

Patch

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