From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6626668631260397568 X-Received: by 2002:a1c:ed04:: with SMTP id l4mr2032764wmh.21.1542972859388; Fri, 23 Nov 2018 03:34:19 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:e8d1:: with SMTP id k17ls3964995wrn.6.gmail; Fri, 23 Nov 2018 03:34:18 -0800 (PST) X-Google-Smtp-Source: AFSGD/VsvNmQyxNOjCzLCJ5FAAlFeP/iITJEe9kNFnnsIbCUhVrLZ5DDADwHLbBn4xP1697qhufm X-Received: by 2002:a5d:4501:: with SMTP id s1mr169283wrq.3.1542972858839; Fri, 23 Nov 2018 03:34:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542972858; cv=none; d=google.com; s=arc-20160816; b=mK+SKrcd2/HbD/7nwJ+oagFr99YMFRjFL5AGdgDfjMQ7MeSwfkL6L/TOKQPfuewd4F gqWseSoGkofjrcooEfUvSB/0KST2Dp6Q/+DQURQLNf88MTEhErPNTFTCymrTP47TZVXS aWxM4tstf1h5cNnUGXQWTayPCXVEI8xSBxlrauCkRyCgi8NIkhMphe9hRd5h9Ew8vaAm 9df4Ji1D+IJr3VOqSf7s2hbgXwoM78ZHUwF/y/ULiXvPpKy3FG3EGARlXhRY2EEtlJuj 3BSC2kngbTIjuV5O6wdCWqdg538ZTftOo/l4TLheVyCWiCDnji78Ya85f9uvJiTUzRF7 1lWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:to:subject; bh=yd4QbwZiFbP5MFW/jem3LjDpI256CXfUuZLqxBsbShA=; b=zp7Iya71fNSbe0WF27oU/LHqHWoDeNw9iCqrqJGf5R95BN/ymXH9jJLdjbTwftmuGL zJmApm+ULno7j1UMwZLKNSfKRx/sgTfK4pMB70ECbO3hG1qRP2mfNuF4RooR9JiGjhlz mLX9q+YpXqtrIy2oaIMWq7UT3QGYFsJL0ySA9vDxmrjSSpdb+mGdr3OXeNI1fIk5azYI zJirQJ+htrU6fPYrhb39rbAtxlCo7dxaOqt0/wAS7xEXAiJrzeuGhRk9563nIlmmuuEf cDasSYqrSTh1AbI0hjWrjSrupQmR3SpDgfcRITzbwqVk8t/MmQp8OmXFKll4jWhaBdBP DAKw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id x188si272796wmb.3.2018.11.23.03.34.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Nov 2018 03:34:18 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id wANBYIdB015224 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 23 Nov 2018 12:34:18 +0100 Received: from [139.25.68.37] (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id wANBYHjb022431; Fri, 23 Nov 2018 12:34:18 +0100 Subject: Re: [PATCH 3/3] Append KERNEL_NAME to dependent custom modules and u-boot-script To: "Maxim Yu. Osipov" , isar-users References: <6d0d7c60da76a1b7e83a665c4f4e4f14b85981a2.1542891520.git.jan.kiszka@siemens.com> <8b6db4ba-fcbe-9d1d-a8b4-ae9650f8604a@ilbers.de> From: Jan Kiszka Message-ID: <01fd4fbe-6b45-6a49-0628-334a43a85bb6@siemens.com> Date: Fri, 23 Nov 2018 12:34:17 +0100 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 In-Reply-To: <8b6db4ba-fcbe-9d1d-a8b4-ae9650f8604a@ilbers.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-TUID: CaDvcYHL98wL On 23.11.18 12:28, Maxim Yu. Osipov wrote: > On 11/22/18 3:58 PM, Jan Kiszka wrote: >> From: Jan Kiszka > > 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 >> --- >>   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