From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6626668631260397568 X-Received: by 2002:a1c:8588:: with SMTP id h130-v6mr2119179wmd.14.1542976565980; Fri, 23 Nov 2018 04:36:05 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:974a:: with SMTP id z71-v6ls3190051wmd.2.canary-gmail; Fri, 23 Nov 2018 04:36:05 -0800 (PST) X-Google-Smtp-Source: AFSGD/WPQPcO6GCFy20H0j7gdzTpTdmPlKoFEpUQgKlUpDwcN0tK4YaK/WXybBp3jg3LUS5I5YtP X-Received: by 2002:a1c:3ad3:: with SMTP id h202mr1161291wma.25.1542976565716; Fri, 23 Nov 2018 04:36:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542976565; cv=none; d=google.com; s=arc-20160816; b=QngEwyr1GzOhd1JjGml0+W2DFrxme9sjZOARCHQUIHqpaRMh5GzP055YijKIPVhPoY YL3oS56CpNpONXA5F2TthSKDdvNg/90hfzuyT1sE9ocobq1SM+LM/7jlBwonx/GJpEv+ TFvPQLy2gj/GROlc4BHXaqXG1ZMhtDnjGhfjNopVp6UYzywNhRM+znZH4FAdS58bpnZM vkkLQY5S1smz1OmtroDxJsmIWDvytj513DRIKvgAe9zLb5HV6966rqDyyad3akEuwAwU ++fz8OCEwffZUgWff2NqCi2G3N7meDVBCgCSjJDpFabvAoRYCzJSBOxM3CHSDO3/vOjU DubQ== 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=GygYurjhR05p9dfkJPk/rgMFZpRWz9wfFznn0+La5Kw=; b=IT7RTBDIiY4iiV/usZ+hxJnW5ITv9ZZlfcwCxovHlSaMucUHlxwUbhRbZLVrb+Bwcw 5JbQCis5G7Vs8itjYMGkuGVcVbLlVpHXqg7V5IggkGg6hQkB7+6tFTYU8kKHsTr1sW/u xhvi5YwGQAC7JKSJ8/qnAVAlcZB8gUwnJioB5rQRTHu9XNnrAaFjDaBv8vy6EQWe/9yt T3CUxmbBjo6rZfbF1WnmBy4TSVhVvDWyaj6dEKoMBZIjFjkbmKF8V9ZJoMgyKUZ+WDIx N9HWtY01M4OaK7ESr9wmt5c+i24zrjzhblhh3rNVCFLIFBknLHVhtOTVZ9MHWYKalHOQ IFJQ== 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 69si447380wrb.1.2018.11.23.04.36.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Nov 2018 04:36:05 -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 wANCa1Ej025437 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Fri, 23 Nov 2018 13:36:03 +0100 Subject: Re: [PATCH v2 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> <8b6db4ba-fcbe-9d1d-a8b4-ae9650f8604a@ilbers.de> <01fd4fbe-6b45-6a49-0628-334a43a85bb6@siemens.com> From: "Maxim Yu. Osipov" Organization: ilbers GmbH Message-ID: Date: Fri, 23 Nov 2018 15:35:56 +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: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: oNy8gJZ+Dcf1 On 11/23/18 2:38 PM, Jan Kiszka wrote: > 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. Applied to the 'next', Thanks, Maxim. > Signed-off-by: Jan Kiszka > --- > > 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/" > -- 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