[PATCH 1/2] linux-module: use generated changelog instead of debian/changelog.tmpl

[Badrikesh Prusty]

The debian/changelog.tmpl file contains hardcoded values for the timestamp and
maintainer fields, resulting in incorrect build info in the generated binary.
Use the generated changelog to ensure accurate build info.

Signed-off-by: Badrikesh Prusty <badrikes...@siemens.com>
---
meta/recipes-kernel/linux-module/files/debian/changelog.tmpl | 5 -----
meta/recipes-kernel/linux-module/module.inc | 3 ++-
2 files changed, 2 insertions(+), 6 deletions(-)
delete mode 100644 meta/recipes-kernel/linux-module/files/debian/changelog.tmpl

diff --git a/meta/recipes-kernel/linux-module/files/debian/changelog.tmpl b/meta/recipes-kernel/linux-module/files/debian/changelog.tmpl
deleted file mode 100644
index 6e59e062..00000000
--- a/meta/recipes-kernel/linux-module/files/debian/changelog.tmpl
+++ /dev/null
@@ -1,5 +0,0 @@
-${PN} (${PV}) unstable; urgency=low
-
- * Generated package.
-
- -- ISAR project <isar-...@googlegroups.com> Tue, 6 Feb 2018 00:00:00 +0000
diff --git a/meta/recipes-kernel/linux-module/module.inc b/meta/recipes-kernel/linux-module/module.inc
index 3e8e5e7a..be3ea3f7 100644
--- a/meta/recipes-kernel/linux-module/module.inc
+++ b/meta/recipes-kernel/linux-module/module.inc
@@ -43,7 +43,6 @@ python() {
inherit dpkg

TEMPLATE_FILES = "debian/control.tmpl \
- debian/changelog.tmpl \
debian/rules.tmpl"
TEMPLATE_VARS += " \
KERNEL_NAME \
@@ -68,6 +67,8 @@ do_prepare_build() {
rm -rf ${S}/debian
cp -r ${WORKDIR}/debian ${S}/

+ deb_add_changelog
+
for module in ${AUTOLOAD}; do
echo "echo $module >> /etc/modules" >> ${S}/debian/postinst
done
--
2.39.5

[Badrikesh Prusty]

The debian/control.tmpl contains hardcoded value for the MAINTAINER field.
Assign a default MAINTAINER in meta/recipes-kernel/linux-module/module.inc,
allowing users to inherit and modify it as needed.

Signed-off-by: Badrikesh Prusty <badrikes...@siemens.com>
---

meta/recipes-kernel/linux-module/files/debian/control.tmpl | 2 +-
meta/recipes-kernel/linux-module/module.inc | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/linux-module/files/debian/control.tmpl b/meta/recipes-kernel/linux-module/files/debian/control.tmpl
index 3ec419f6..45fcbc0e 100644
--- a/meta/recipes-kernel/linux-module/files/debian/control.tmpl
+++ b/meta/recipes-kernel/linux-module/files/debian/control.tmpl
@@ -3,7 +3,7 @@ Section: kernel
Priority: optional
Standards-Version: 3.9.6
Build-Depends: debhelper-compat (= ${DEBIAN_COMPAT}), ${DEBIAN_BUILD_DEPENDS}
-Maintainer: ISAR project <isar-...@googlegroups.com>
+Maintainer: ${MAINTAINER}

Package: ${PN}
Architecture: any
diff --git a/meta/recipes-kernel/linux-module/module.inc b/meta/recipes-kernel/linux-module/module.inc
index be3ea3f7..4e4df551 100644
--- a/meta/recipes-kernel/linux-module/module.inc
+++ b/meta/recipes-kernel/linux-module/module.inc
@@ -8,6 +8,7 @@
FILESPATH:append := ":${FILE_DIRNAME}/files"

DESCRIPTION ?= "Custom kernel module ${PN}"
+MAINTAINER ?= "isar-users <isar-...@googlegroups.com>"

KERNEL_NAME ?= ""
# directory with KBuild file (M=${MODULE_DIR})
--
2.39.5

[Uladzimir Bely]

On Sun, 2025-02-09 at 15:30 +0530, 'Badrikesh Prusty' via isar-users
wrote:

Applied to next, thanks.

--
Best regards,
Uladzimir.