From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6626668631260397568 X-Received: by 2002:a1c:344f:: with SMTP id b76-v6mr2263864wma.2.1542972495665; Fri, 23 Nov 2018 03:28:15 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:5384:: with SMTP id d4-v6ls3935603wrv.0.gmail; Fri, 23 Nov 2018 03:28:15 -0800 (PST) X-Google-Smtp-Source: AFSGD/WFkMiyCaTj9g88PSoHT6XgoYKV6oi8t7TiNm/XqNf5QUQg5rlAiHRdH5ur4hoqO2tHiNfU X-Received: by 2002:a5d:4dd0:: with SMTP id f16-v6mr1915699wru.10.1542972495398; Fri, 23 Nov 2018 03:28:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542972495; cv=none; d=google.com; s=arc-20160816; b=gzlIrdiaIQVJbuXlT/GvpqCHkCL+mNjq3IhUNFdT6Myl0zBUe1ogtDXHZ8Epmv6vMl 0wmoWnKaj78C0HxOMMO34HUo2d61mTLI7Dob44igbmjEYbwF5Mp0pfcfqaDdLO6GOp2J Xs1pf4w1IGqtePLbu10Sjb6VexuIcW/UZlkUjDyhGYTzrRuSxbBf3glHpfB5S6AxvV7x WoLh4c9sAubWebU5QG9500jhdv56fFmEhEv1K346hB4+txwNKOUWn9Ue4diYnn3uznwx f7zNkbbD+nq0tGqOw14wmhGJ4yzEaRLBbzueDZXshCMv5vQrPwBI+rtpGBtMpAmCWMqN brQw== 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:organization:from:references:to:subject; bh=H5igdCjjaVo3bONDoAQQk8vM4F1tCgCyhdQbhW9nqNk=; b=B8cCOsA+aLOVeebcwsx6qrknFk4XO5013OWyDhDY61uoqb8GQhXXHNR2cDqkRJWEH4 LlcMSYCu+W0pnq7LiCDxnkWLaKXomZ+lB8F93va9mnRpnMjEwx2CM9aojPgsv5Or2t6a /2BQUKKCJQhp70Sp28CX0m0XYVXEZ+7D2G6wULAnfg+kidXKE3YBx41cywB+cJN2TEku D+szTMvViDKuEtLuJ0r7mhy6CL56CC5BkvlxuROX+6HzhCE63PEkGaUOH/vS3Nd7kWco 4/AkVQaEyu03iWBITH5G3fDm6Bs7j6sHwU7cUdOqAMm2LzNkdWGczUWyErZWZtJXH+op zm7Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id j20si42753wme.1.2018.11.23.03.28.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Nov 2018 03:28:15 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from [192.168.50.180] (nat-ppp-217.71.235.199-satnet-spb.ru [217.71.235.199] (may be forged)) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id wANBSCOl025281 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Fri, 23 Nov 2018 12:28:14 +0100 Subject: Re: [PATCH 3/3] Append KERNEL_NAME to dependent custom modules and u-boot-script To: Jan Kiszka , isar-users References: <6d0d7c60da76a1b7e83a665c4f4e4f14b85981a2.1542891520.git.jan.kiszka@siemens.com> From: "Maxim Yu. Osipov" Organization: ilbers GmbH Message-ID: <8b6db4ba-fcbe-9d1d-a8b4-ae9650f8604a@ilbers.de> Date: Fri, 23 Nov 2018 14:28:07 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.3.0 MIME-Version: 1.0 In-Reply-To: <6d0d7c60da76a1b7e83a665c4f4e4f14b85981a2.1542891520.git.jan.kiszka@siemens.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: +ZuM94+Z/qku 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 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/" > -- Maxim Osipov ilbers GmbH Maria-Merian-Str. 8 85521 Ottobrunn Germany +49 (151) 6517 6917 mosipov@ilbers.de http://ilbers.de/ Commercial register Munich, HRB 214197 General Manager: Baurzhan Ismagulov