[PATCH v2 3/3] Append KERNEL_NAME to dependent custom modules and u-boot-script

[Jan Kiszka <jan.kiszka@siemens.com>]

When building different kernels for different images of the same
distro/arch tuple via multiconfig, modules and u-boot-script packages
become non-differentiable. Address this by appending the kernel name to
their binary package names.

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

Changes in v2:
 - adjust AUTOLOAD of example-module: package name changed, but not the
   module name

 RECIPE-API-CHANGELOG.md                                   | 5 +++++
 meta-isar/conf/local.conf.sample                          | 2 +-
 meta-isar/conf/machine/de0-nano-soc.conf                  | 2 +-
 meta-isar/conf/multiconfig/bananapi-stretch.conf          | 2 +-
 meta-isar/recipes-kernel/example-module/example-module.bb | 2 +-
 meta/recipes-bsp/u-boot-script/u-boot-script_1.0.bb       | 2 ++
 meta/recipes-kernel/linux-module/module.inc               | 2 ++
 7 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md
index b6315e7..06a01e3 100644
--- a/RECIPE-API-CHANGELOG.md
+++ b/RECIPE-API-CHANGELOG.md
@@ -119,3 +119,8 @@ isar-image-base-debian-stretch-qemuarm.vmlinuz-4.9.0-8-armmp
 
 It should be noted that the `KERNEL_IMAGE` and `INITRD_IMAGE` variables were
 updated hence recipes using them shouldn't be impacted per se.
+
+### Append kernel name to custom module and u-boot-script packages
+
+These packages depend on a specific kernel. Its identification is now appended
+to the binary package names in the form "-${KERNEL_NAME}".
diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample
index ffcb7ab..4a60068 100644
--- a/meta-isar/conf/local.conf.sample
+++ b/meta-isar/conf/local.conf.sample
@@ -160,7 +160,7 @@ CONF_VERSION = "1"
 
 #
 # The default list of extra packages to be installed.
-IMAGE_INSTALL = "example-hello example-raw example-module enable-fsck"
+IMAGE_INSTALL = "example-hello example-raw example-module-${KERNEL_NAME} enable-fsck"
 
 #
 # Enable cross-compilation support
diff --git a/meta-isar/conf/machine/de0-nano-soc.conf b/meta-isar/conf/machine/de0-nano-soc.conf
index 63b2cfb..184da4a 100644
--- a/meta-isar/conf/machine/de0-nano-soc.conf
+++ b/meta-isar/conf/machine/de0-nano-soc.conf
@@ -15,4 +15,4 @@ WKS_FILE ?= "de0-nano-soc"
 IMAGER_INSTALL += "u-boot-de0-nano-soc"
 IMAGER_BUILD_DEPS += "u-boot-de0-nano-soc"
 
-IMAGE_INSTALL += "u-boot-tools u-boot-script"
+IMAGE_INSTALL += "u-boot-tools u-boot-script-${KERNEL_NAME}"
diff --git a/meta-isar/conf/multiconfig/bananapi-stretch.conf b/meta-isar/conf/multiconfig/bananapi-stretch.conf
index 7fafe69..bf89652 100644
--- a/meta-isar/conf/multiconfig/bananapi-stretch.conf
+++ b/meta-isar/conf/multiconfig/bananapi-stretch.conf
@@ -13,7 +13,7 @@ KERNEL_NAME ?= "armmp"
 DISTRO_APT_SOURCES_append = " conf/distro/debian-stretch-backports.list"
 DISTRO_APT_PREFERENCES += "conf/multiconfig/preferences.bananapi.conf"
 
-IMAGE_INSTALL += "u-boot-script"
+IMAGE_INSTALL += "u-boot-script-${KERNEL_NAME}"
 
 IMAGE_TYPE ?= "wic-img"
 WKS_FILE ?= "bananapi"
diff --git a/meta-isar/recipes-kernel/example-module/example-module.bb b/meta-isar/recipes-kernel/example-module/example-module.bb
index b62ef65..d9d6eb1 100644
--- a/meta-isar/recipes-kernel/example-module/example-module.bb
+++ b/meta-isar/recipes-kernel/example-module/example-module.bb
@@ -21,4 +21,4 @@ SRC_URI += "file://src"
 
 S = "${WORKDIR}/src"
 
-AUTOLOAD = "${PN}"
+AUTOLOAD = "example-module"
diff --git a/meta/recipes-bsp/u-boot-script/u-boot-script_1.0.bb b/meta/recipes-bsp/u-boot-script/u-boot-script_1.0.bb
index 2806ba7..a827c35 100644
--- a/meta/recipes-bsp/u-boot-script/u-boot-script_1.0.bb
+++ b/meta/recipes-bsp/u-boot-script/u-boot-script_1.0.bb
@@ -12,6 +12,8 @@ WKS_FULL_PATH = "${@get_wks_full_path(d)}"
 
 DESCRIPTION = "Boot script generator for U-Boot"
 
+PN .= "-${KERNEL_NAME}"
+
 SRC_URI = " \
     file://update-u-boot-script \
     file://u-boot-script \
diff --git a/meta/recipes-kernel/linux-module/module.inc b/meta/recipes-kernel/linux-module/module.inc
index 9af3a93..509dd96 100644
--- a/meta/recipes-kernel/linux-module/module.inc
+++ b/meta/recipes-kernel/linux-module/module.inc
@@ -9,6 +9,8 @@ FILESPATH =. "${LAYERDIR_core}/recipes-kernel/linux-module/files:"
 
 DESCRIPTION ?= "Custom kernel module ${PN}"
 
+PN .= "-${KERNEL_NAME}"
+
 DEPENDS += "linux-headers-${KERNEL_NAME}"
 
 SRC_URI += "file://debian/"
-- 
2.16.4