public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Subject: [PATCH v2] linux-module: Simplify interface to module makefiles
Date: Tue, 15 Jan 2019 09:55:23 +0100	[thread overview]
Message-ID: <e56fff06-9816-3fe7-db4c-e32c087592a5@siemens.com> (raw)
In-Reply-To: <0106a163-055a-2917-4388-35bd337ef64b@siemens.com>

From: Jan Kiszka <jan.kiszka@siemens.com>

Not all module makefile respect DESTDIR nor even have build targets
which take KDIR as input. So call the kernel makefile ourselves, just
requiring the module makefile to provide Kbuild rules.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

Changes in v2:
 - update RECIPE-API-CHANGELOG

 RECIPE-API-CHANGELOG.md                             | 5 +++++
 meta/recipes-kernel/linux-module/files/debian/rules | 6 ++++++
 meta/recipes-kernel/linux-module/module.inc         | 1 +
 3 files changed, 12 insertions(+)

diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md
index 06a01e3..832f0ed 100644
--- a/RECIPE-API-CHANGELOG.md
+++ b/RECIPE-API-CHANGELOG.md
@@ -124,3 +124,8 @@ updated hence recipes using them shouldn't be impacted per se.
 
 These packages depend on a specific kernel. Its identification is now appended
 to the binary package names in the form "-${KERNEL_NAME}".
+
+### Reduce requirements on custom module makefiles
+
+It's now sufficient to provide only kbuild rules. Makefile targets like modules
+or modules_install as well as KDIR and DESTDIR evaluation are no longer needed.
diff --git a/meta/recipes-kernel/linux-module/files/debian/rules b/meta/recipes-kernel/linux-module/files/debian/rules
index 5c1d8be..7a89e41 100755
--- a/meta/recipes-kernel/linux-module/files/debian/rules
+++ b/meta/recipes-kernel/linux-module/files/debian/rules
@@ -21,5 +21,11 @@ ifneq (,$(findstring 86,$(DEB_HOST_GNU_CPU)))
 export ARCH=x86
 endif
 
+override_dh_auto_build:
+	$(MAKE) -C $(KDIR) M=$(PWD) modules
+
+override_dh_auto_install:
+	$(MAKE) -C $(KDIR) M=$(PWD) INSTALL_MOD_PATH=$(PWD)/debian/$(PN) modules_install
+
 %:
 	CFLAGS= LDFLAGS= dh $@ --parallel
diff --git a/meta/recipes-kernel/linux-module/module.inc b/meta/recipes-kernel/linux-module/module.inc
index 5d85200..cb7b8ad 100644
--- a/meta/recipes-kernel/linux-module/module.inc
+++ b/meta/recipes-kernel/linux-module/module.inc
@@ -43,4 +43,5 @@ dpkg_runbuild_prepend() {
         export KDIR=$(dpkg -L --root=${BUILDCHROOT_DIR} ${KERNEL_DEP} | \
                       grep "/lib/modules/.*/build")
     fi
+    export PN=${PN}
 }
-- 
2.16.4

      reply	other threads:[~2019-01-15  8:55 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-15  8:17 [PATCH] " Jan Kiszka
2019-01-15  8:55 ` Jan Kiszka [this message]

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=e56fff06-9816-3fe7-db4c-e32c087592a5@siemens.com \
    --to=jan.kiszka@siemens.com \
    --cc=isar-users@googlegroups.com \
    /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