From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6626668631260397568 X-Received: by 2002:a5d:4891:: with SMTP id g17mr122146wrq.20.1542973128188; Fri, 23 Nov 2018 03:38:48 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:ffc5:: with SMTP id x5ls3900029wrs.16.gmail; Fri, 23 Nov 2018 03:38:47 -0800 (PST) X-Google-Smtp-Source: AFSGD/XOA4QizB8a5GHOljBANcinpdWZ8mPkmEBC4aPcsbA+w9PNyS6bNlA2ruXsKE739EGJ/rJM X-Received: by 2002:adf:f248:: with SMTP id b8mr1417348wrp.9.1542973127721; Fri, 23 Nov 2018 03:38:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542973127; cv=none; d=google.com; s=arc-20160816; b=uDSb+iUXpY9r5B1gclMx2rCWRR5YjJplGuKRnO85aANfs0AanwfXtClwMFv1V/RMjJ nyytJRudacXf/TgmmTzeyVN6iElGuyxBhUNNVGBeKbwUpv5GIkg8Y+wRQA9YPw/LKt6B vwNmL6M73usg0X7/RT4PCF6WewuvrqOwifwdtmDHhiVQHbbpzr3kzOyalr+ppfVyz6S/ 6PSmIzI8qUkwBh5UKb5EXF8mf0yiOZfTSu5Zd6ps54V5v9EnfhZYtUO2g30LcqiV3YFr 54DrjX1//NnTJt2c1tErPmt3mkpzqh7vYQoguRmdkt1TEtnoxQqiKC8SWPu/s8c8ZaxH I1Mw== 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:references:to:from:subject; bh=yTP6B0GnOkucQjKGkYE4gZecanzd/IqdKTgMkY2lX70=; b=RD/HLLqLtuvQ23Al6tRL4kpgT35iQYVabEIgzytxIMO1ZBsfuQ6JI/Pt23vYbIXjld YAtvc6tfr5GQFnnjzP84MkuYNEuWj5EA7G3elQD6JcoO01CxEk1JdHna6K1LOhnwznr5 VAS4mzfqtJ2k40Ax6nE0rb4sU/fmjngXbEDGE+QzZWC3T3Egpp/P+YzilnbNwiKjPLZT wQqDh2B/rbCrkG/SrqLEr0NwRs+XYILsclIcXISbIMPmgyOKCO5eTjB4drZCVHMMeVgB cYuK5FsV5T3/bz9ueaZ39pJsd2FmMdaC9Mn/Z1+NqYsG1si4f2543qt9EbBLFv9S2Yvv ovzg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id r194si90205wmg.4.2018.11.23.03.38.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Nov 2018 03:38:47 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id wANBclYf026317 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 23 Nov 2018 12:38:47 +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 wANBcjb5005430; Fri, 23 Nov 2018 12:38:45 +0100 Subject: [PATCH v2 3/3] Append KERNEL_NAME to dependent custom modules and u-boot-script From: Jan Kiszka To: "Maxim Yu. Osipov" , isar-users References: <6d0d7c60da76a1b7e83a665c4f4e4f14b85981a2.1542891520.git.jan.kiszka@siemens.com> <8b6db4ba-fcbe-9d1d-a8b4-ae9650f8604a@ilbers.de> <01fd4fbe-6b45-6a49-0628-334a43a85bb6@siemens.com> Message-ID: Date: Fri, 23 Nov 2018 12:38:44 +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: <01fd4fbe-6b45-6a49-0628-334a43a85bb6@siemens.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: 4OpPCfvVBNhC 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 --- 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