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

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

On 23.11.18 12:28, Maxim Yu. Osipov wrote:
> On 11/22/18 3:58 PM, Jan Kiszka wrote:
>> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> This patch breaks CI's vm_smoke_test causing failure reports (for all targets):
> 
> Check example module: FAIL
> 

Mind the share the logs? Would accelerate the analysis.

Jan

> To reproduce the problem launch "fast" CI:
> 
> $ ./scripts/ci_build.sh -q -f
> $ source isar-init-build-env
> $ vm_smoke_test -q -f
> 
> 
> 
> Regards,
> Maxim.
> 
> 
>> 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>
>> ---
>>   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/recipes-bsp/u-boot-script/u-boot-script_1.0.bb | 2 ++
>>   meta/recipes-kernel/linux-module/module.inc         | 2 ++
>>   6 files changed, 12 insertions(+), 3 deletions(-)
>>
>> diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md
>> index c95c7ac..306971e 100644
>> --- a/RECIPE-API-CHANGELOG.md
>> +++ b/RECIPE-API-CHANGELOG.md
>> @@ -106,3 +106,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/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/"
>>
> 
> 

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux