From: "'Jan Kiszka' via isar-users" <isar-users@googlegroups.com>
To: srinuvasan.a@siemens.com, isar-users@googlegroups.com
Cc: ubely@ilbers.de
Subject: Re: [PATCH v3] meta/recipes-kernel: use debhelper-compat to generate compat file
Date: Fri, 31 Jan 2025 13:14:12 +0100 [thread overview]
Message-ID: <e638b93f-5c63-4053-a3f6-4cfa502bdd1f@siemens.com> (raw)
In-Reply-To: <20241216112050.1286204-1-srinuvasan.a@siemens.com>
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.
Jan
--
Siemens AG, Foundational Technologies
Linux Expert Center
--
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/e638b93f-5c63-4053-a3f6-4cfa502bdd1f%40siemens.com.
next prev parent reply other threads:[~2025-01-31 12:14 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-09 6:51 [PATCH] meta/recipes-kernel/linux/files: " srinuvasan.a via isar-users
2024-08-09 16:43 ` 'Jan Kiszka' via isar-users
2024-08-11 14:20 ` Srinuvasan Arjunan
2024-08-27 15:45 ` Uladzimir Bely
2024-08-28 5:04 ` 'Arjunan, Srinu' via isar-users
2024-09-09 5:51 ` [PATCH v2] " srinuvasan.a via isar-users
2024-09-09 5:53 ` 'Arjunan, Srinu' via isar-users
2024-09-11 11:28 ` Uladzimir Bely
2024-12-16 11:20 ` [PATCH v3] meta/recipes-kernel: " srinuvasan.a via isar-users
2024-12-16 11:15 ` Srinuvasan Arjunan
2024-12-20 7:48 ` Uladzimir Bely
2025-01-31 12:14 ` 'Jan Kiszka' via isar-users [this message]
2025-01-31 12:31 ` 'MOESSBAUER, Felix' via isar-users
2025-01-31 12:39 ` 'Jan Kiszka' via isar-users
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e638b93f-5c63-4053-a3f6-4cfa502bdd1f@siemens.com \
--to=isar-users@googlegroups.com \
--cc=jan.kiszka@siemens.com \
--cc=srinuvasan.a@siemens.com \
--cc=ubely@ilbers.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox