From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6626668631260397568 X-Received: by 2002:a5d:45c5:: with SMTP id b5mr1608168wrs.24.1542891522716; Thu, 22 Nov 2018 04:58:42 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:dc8e:: with SMTP id r14ls3328650wrj.2.gmail; Thu, 22 Nov 2018 04:58:42 -0800 (PST) X-Google-Smtp-Source: AFSGD/UiYAW2iy+0s/HU+R3yWoEewF/qrMo6ztaJ5Prp6s5mwSA11URTYupCa4Gel7Za4wyrnSrv X-Received: by 2002:adf:f88c:: with SMTP id u12mr1539413wrp.18.1542891522202; Thu, 22 Nov 2018 04:58:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542891522; cv=none; d=google.com; s=arc-20160816; b=BRcKNEXnUEWdalFM0N296aJJfh8EvVGwmCXBwHf+BtBBE3d6+ew4ddZS9/iFJo3Jhz wRk0RrYMv5nAn+WSHdMc+q78sKHVpqSz68zFWE0I5jsBzrm74IP3l3HlBdE3jwc3MULq XJYibZ9tyUAW+oynRS7JghR4HezaIfs4BcCzIqQdo+ABfCsZ90RJ9A9XKpVcsr4YcEOY lFaViT/Ecx9xwszVFI8mLPGS7tU/66YMz9MaH+ccKbHj9wZK+alepR/7Svi2QwA3ptwl GCDjAIk2XqHOHSkdh4SozXSpSmS3y+Q6lfevCdzpqPyLFR6SHaDIxMPNTvOdyWAHBVtE aJGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:to:from; bh=/tqO/fAidv3kk8GTIemJ2/mDZN5DgmoI7l/4xguXRaA=; b=rxzszNHPvCEQ81+gohAv35JiEaarKfIZBr/1Ui/gVpuyi7d6hEDcG9Vlkccb5bvURT awV7B6qIL4L0Utk816RerobQ9I3gM002PPAdklzUobpFMRhFikyaZ6uLdDl3ROZU9dfh 0dvfibfkKUHctmX8kuro58KVQReE115lJoIqHVdTP8cGhWOqFWHzhl0JIgDmVaE2C5vy 3zPwOeZvXktKYM8NaxlDxA/8dBDueer4CzyxtMq5/OW00geVCY5Rw3SOiFRqYCpn7Upc 02at3Fls9LIUkVYFiRSqDI5Wo+wCQ17x0ZgzWl1I4RBy/gEfyEKvAfOMWknGTTe3D+FK 7LmA== 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 k140si145044wmd.2.2018.11.22.04.58.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Nov 2018 04:58:42 -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 wAMCwfQR031567 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 22 Nov 2018 13:58:41 +0100 Received: from md1f2u6c.ad001.siemens.net (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id wAMCwftD017254 for ; Thu, 22 Nov 2018 13:58:41 +0100 From: Jan Kiszka To: isar-users Subject: [PATCH 3/3] Append KERNEL_NAME to dependent custom modules and u-boot-script Date: Thu, 22 Nov 2018 13:58:40 +0100 Message-Id: <6d0d7c60da76a1b7e83a665c4f4e4f14b85981a2.1542891520.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: t8S1vULeCx/n From: Jan Kiszka 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/" -- 2.16.4