From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6522335616607191040 X-Received: by 10.46.106.19 with SMTP id f19mr259674ljc.18.1518599599227; Wed, 14 Feb 2018 01:13:19 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.46.85.84 with SMTP id j81ls1176257ljb.3.gmail; Wed, 14 Feb 2018 01:13:18 -0800 (PST) X-Google-Smtp-Source: AH8x225RiJJj7BxPhAYyYFONsZjv6c0Sq1Rr1/p3jICjfY90XuYoNPdsZ7nYi3GMF3w2jgL7qbgE X-Received: by 10.46.51.4 with SMTP id d4mr263233ljc.36.1518599598497; Wed, 14 Feb 2018 01:13:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518599598; cv=none; d=google.com; s=arc-20160816; b=P+TWeewrd9pVY3iIp57gGA2uefELHloZuR4ak/yMtKSKAvm1YftI1uAnVgwqjLfbW4 Boji5F2/GGC43saGbQsk62g6jOAhxziJAX0VPTmQXJHjfwwELdvZ11R8ijNonA52P0FP NCIDesZexJlbFsepMVJggd3j422P3Bh76fq7p8xrA77sD9/SHf/HKL/M3R0OaUGfp/su 6Qp+lHxcBTTB5/Zi3tvYKehSWWgefX4N4EZvGmKFojXnlw/H6wbUhFi1DXb5HUgqqtLA O1Hg2D8hqeEahW8cHBaYie9ZXAL2VfLMCSRKtxZ9Xea05s/bo/Z4JvIlGjO/qcR3E8Zg NSzw== 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:arc-authentication-results; bh=RyhN6rR3Kklxg30z07F77C9VfJc4C6Wy+IPGImbSsu8=; b=tIEfykFF3lNfXkVy0aRH/rX32QQcbtFl1V7vG+4J7wHispSWZlB0HKr7ifw5p1Eu9V J9Gu47R3WQroCkT7RhW253HoJWDrhl0l9G8xBECvUvdBbi3D0MPC+wyVBiEPoWYQ+s/u Lni8iZxrtdrurtFcOM2Blc5x2o3fZ4SQ0TcUEQ/rAvC1NVeouSfsBqUB0Pivqcvnqfsx HwYqpyFZzAjC4nVHu2G9Nh2Ag0ABbGDOxqhaN0D0qMsNJouI5LnWIZ8LRRaC5Zp+k9gl p2bDOeb+SzmBqCFvlvr1DCAItLf9E4C+i9sLt2062xKslZUkrZhJkW1eh2rtLcIlDYFc TEMg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id z11si746855lff.1.2018.02.14.01.13.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 01:13:18 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w1E9DHdo024664 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 14 Feb 2018 10:13:17 +0100 Received: from md1f2u6c.ww002.siemens.net ([167.87.36.169]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w1E9DHSZ028726 for ; Wed, 14 Feb 2018 10:13:17 +0100 From: Jan Kiszka To: isar-users Subject: [PATCH v5 1/5] Make distro kernel replaceable Date: Wed, 14 Feb 2018 10:13:11 +0100 Message-Id: X-Mailer: git-send-email 2.13.6 In-Reply-To: References: In-Reply-To: References: X-TUID: Fmq8UVfgNuxs From: Jan Kiszka Introduce the configuration variable KERNEL_NAME, typically to be defined by the machine, that selected the kernel that is installed and can also be depended on / built against. Create a shadow recipe linux-disto.bb that simply PROVIDES to the bitbake world distro kernel targets that exist in package form in either Debian or Raspian. Signed-off-by: Jan Kiszka --- meta-isar/conf/distro/debian-jessie.conf | 4 ++++ meta-isar/conf/distro/debian-stretch.conf | 3 +++ meta-isar/conf/distro/debian-wheezy.conf | 2 ++ meta-isar/conf/distro/raspbian-jessie.conf | 1 + meta-isar/conf/multiconfig/qemuamd64-jessie.conf | 2 +- meta-isar/conf/multiconfig/qemuamd64-stretch.conf | 7 +++---- meta-isar/conf/multiconfig/qemuarm-jessie.conf | 2 +- meta-isar/conf/multiconfig/qemuarm-stretch.conf | 7 +++---- meta-isar/conf/multiconfig/qemuarm-wheezy.conf | 2 +- meta-isar/conf/multiconfig/qemui386-jessie.conf | 2 +- meta-isar/conf/multiconfig/qemui386-stretch.conf | 7 +++---- meta-isar/conf/multiconfig/rpi-jessie.conf | 3 ++- meta-isar/recipes-core/images/isar-image-base.bb | 2 ++ meta/recipes-kernel/linux/linux-distro.bb | 13 +++++++++++++ 14 files changed, 40 insertions(+), 17 deletions(-) create mode 100644 meta/recipes-kernel/linux/linux-distro.bb diff --git a/meta-isar/conf/distro/debian-jessie.conf b/meta-isar/conf/distro/debian-jessie.conf index d4bc4b1..3e62b14 100644 --- a/meta-isar/conf/distro/debian-jessie.conf +++ b/meta-isar/conf/distro/debian-jessie.conf @@ -10,3 +10,7 @@ DISTRO_APT_SOURCE_SEC ?= "http://security.debian.org/debian-security" DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh" DISTRO_MULTICONF_BOOTSTRAP ?= "base updates security" DISTRO_MULTICONF_APTSOURCES ?= "${DISTRO_MULTICONF_BOOTSTRAP}" +DISTRO_KERNELS ?= "486 4kc-malta 586 5kc-malta 686-pae amd64 arm64 armmp \ + armmp-lpae ixp4xx kirkwood loongson-2e loongson-2f loongson-3 octeon \ + orion5x powerpc powerpc-smp powerpc64 powerpc64le r4k-ip22 r5k-ip32 \ + s390x sb1-bcm91250a versatile" diff --git a/meta-isar/conf/distro/debian-stretch.conf b/meta-isar/conf/distro/debian-stretch.conf index 74177fd..5a85d52 100644 --- a/meta-isar/conf/distro/debian-stretch.conf +++ b/meta-isar/conf/distro/debian-stretch.conf @@ -8,3 +8,6 @@ DISTRO_APT_SOURCE_SEC ?= "http://security.debian.org/debian-security" DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh" DISTRO_MULTICONF_BOOTSTRAP ?= "base updates security" DISTRO_MULTICONF_APTSOURCES ?= "${DISTRO_MULTICONF_BOOTSTRAP}" +DISTRO_KERNELS ?= "4kc-malta 586 5kc-malta 686 686-pae amd64 arm64 armmp \ + armmp-lpae kirkwood loongson-3 marvell octeon orion5x powerpc64le \ + rt-686-pae rt-amd64 s390x" diff --git a/meta-isar/conf/distro/debian-wheezy.conf b/meta-isar/conf/distro/debian-wheezy.conf index 017316e..f5ab6eb 100644 --- a/meta-isar/conf/distro/debian-wheezy.conf +++ b/meta-isar/conf/distro/debian-wheezy.conf @@ -10,3 +10,5 @@ DISTRO_APT_SOURCE_SEC ?= "http://security.debian.org/debian-security" DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh" DISTRO_MULTICONF_BOOTSTRAP ?= "base updates security" DISTRO_MULTICONF_APTSOURCES ?= "${DISTRO_MULTICONF_BOOTSTRAP}" +DISTRO_KERNELS ?= "486 686-pae amd64 rt-686-pae rt-amd64 versatile vexpress \ + iop32x ixp4xx kirkwood mv78xx0 mx5 omap orion5x" diff --git a/meta-isar/conf/distro/raspbian-jessie.conf b/meta-isar/conf/distro/raspbian-jessie.conf index bd3c280..c2a867d 100644 --- a/meta-isar/conf/distro/raspbian-jessie.conf +++ b/meta-isar/conf/distro/raspbian-jessie.conf @@ -10,3 +10,4 @@ DISTRO_APT_SOURCE_SEC ?= "" DISTRO_CONFIG_SCRIPT ?= "raspbian-configscript.sh" DISTRO_MULTICONF_BOOTSTRAP ?= "base" DISTRO_MULTICONF_APTSOURCES ?= "${DISTRO_MULTICONF_BOOTSTRAP}" +DISTRO_KERNELS ?= "rpi rpi2 rpi-rpfv rpi2-rpfv" diff --git a/meta-isar/conf/multiconfig/qemuamd64-jessie.conf b/meta-isar/conf/multiconfig/qemuamd64-jessie.conf index 51d39b6..b422008 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-jessie.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-jessie.conf @@ -6,7 +6,7 @@ MACHINE ?= "qemuamd64" DISTRO ?= "debian-jessie" DISTRO_ARCH ?= "amd64" -IMAGE_PREINSTALL += "linux-image-amd64" +KERNEL_NAME ?= "amd64" ROOTFS_DEV ?= "sda" diff --git a/meta-isar/conf/multiconfig/qemuamd64-stretch.conf b/meta-isar/conf/multiconfig/qemuamd64-stretch.conf index c59876a..64a62a1 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-stretch.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-stretch.conf @@ -6,10 +6,9 @@ MACHINE ?= "qemuamd64" DISTRO ?= "debian-stretch" DISTRO_ARCH ?= "amd64" -IMAGE_PREINSTALL += " \ - init \ - linux-image-amd64 \ -" +KERNEL_NAME ?= "amd64" + +IMAGE_PREINSTALL += "init" ROOTFS_DEV ?= "sda" diff --git a/meta-isar/conf/multiconfig/qemuarm-jessie.conf b/meta-isar/conf/multiconfig/qemuarm-jessie.conf index ed84c6c..74fb7d9 100644 --- a/meta-isar/conf/multiconfig/qemuarm-jessie.conf +++ b/meta-isar/conf/multiconfig/qemuarm-jessie.conf @@ -13,7 +13,7 @@ MACHINE ?= "qemuarm" DISTRO ?= "debian-jessie" DISTRO_ARCH ?= "armhf" -IMAGE_PREINSTALL += "linux-image-armmp" +KERNEL_NAME ?= "armmp" ROOTFS_DEV ?= "vda" diff --git a/meta-isar/conf/multiconfig/qemuarm-stretch.conf b/meta-isar/conf/multiconfig/qemuarm-stretch.conf index 1cce97a..00cdaa0 100644 --- a/meta-isar/conf/multiconfig/qemuarm-stretch.conf +++ b/meta-isar/conf/multiconfig/qemuarm-stretch.conf @@ -6,10 +6,9 @@ MACHINE ?= "qemuarm" DISTRO ?= "debian-stretch" DISTRO_ARCH ?= "armhf" -IMAGE_PREINSTALL += " \ - init \ - linux-image-armmp \ -" +KERNEL_NAME ?= "armmp" + +IMAGE_PREINSTALL += "init" ROOTFS_DEV ?= "vda" diff --git a/meta-isar/conf/multiconfig/qemuarm-wheezy.conf b/meta-isar/conf/multiconfig/qemuarm-wheezy.conf index 38ea191..11355a4 100644 --- a/meta-isar/conf/multiconfig/qemuarm-wheezy.conf +++ b/meta-isar/conf/multiconfig/qemuarm-wheezy.conf @@ -13,7 +13,7 @@ MACHINE ?= "qemuarm" DISTRO ?= "debian-wheezy" DISTRO_ARCH ?= "armhf" -IMAGE_PREINSTALL += "linux-image-vexpress" +KERNEL_NAME ?= "vexpress" ROOTFS_DEV ?= "mmcblk0" diff --git a/meta-isar/conf/multiconfig/qemui386-jessie.conf b/meta-isar/conf/multiconfig/qemui386-jessie.conf index d589661..e8c81fb 100644 --- a/meta-isar/conf/multiconfig/qemui386-jessie.conf +++ b/meta-isar/conf/multiconfig/qemui386-jessie.conf @@ -6,7 +6,7 @@ MACHINE ?= "qemui386" DISTRO ?= "debian-jessie" DISTRO_ARCH ?= "i386" -IMAGE_PREINSTALL += "linux-image-686-pae" +KERNEL_NAME ?= "686-pae" ROOTFS_DEV ?= "sda" diff --git a/meta-isar/conf/multiconfig/qemui386-stretch.conf b/meta-isar/conf/multiconfig/qemui386-stretch.conf index 40239e4..0ba7c5b 100644 --- a/meta-isar/conf/multiconfig/qemui386-stretch.conf +++ b/meta-isar/conf/multiconfig/qemui386-stretch.conf @@ -6,10 +6,9 @@ MACHINE ?= "qemui386" DISTRO ?= "debian-stretch" DISTRO_ARCH ?= "i386" -IMAGE_PREINSTALL += " \ - init \ - linux-image-686-pae \ -" +KERNEL_NAME ?= "686-pae" + +IMAGE_PREINSTALL += "init" ROOTFS_DEV ?= "sda" diff --git a/meta-isar/conf/multiconfig/rpi-jessie.conf b/meta-isar/conf/multiconfig/rpi-jessie.conf index d1dd9d9..3f33731 100644 --- a/meta-isar/conf/multiconfig/rpi-jessie.conf +++ b/meta-isar/conf/multiconfig/rpi-jessie.conf @@ -13,13 +13,14 @@ MACHINE ?= "rpi" DISTRO ?= "raspbian-jessie" DISTRO_ARCH ?= "armhf" +KERNEL_NAME ?= "rpi-rpfv" + IMAGE_PREINSTALL += " \ bind9-host \ dnsutils \ iproute2 \ iputils-ping \ isc-dhcp-client \ - linux-image-rpi-rpfv \ lrzsz \ net-tools \ netcat-openbsd \ diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb index 8678b51..b444258 100644 --- a/meta-isar/recipes-core/images/isar-image-base.bb +++ b/meta-isar/recipes-core/images/isar-image-base.bb @@ -18,6 +18,8 @@ PV = "1.0" inherit image +IMAGE_INSTALL += "linux-image-${KERNEL_NAME}" + DEPENDS += "${IMAGE_INSTALL}" IMAGE_PREINSTALL += "apt \ diff --git a/meta/recipes-kernel/linux/linux-distro.bb b/meta/recipes-kernel/linux/linux-distro.bb new file mode 100644 index 0000000..2a248f8 --- /dev/null +++ b/meta/recipes-kernel/linux/linux-distro.bb @@ -0,0 +1,13 @@ +# Distro kernel dummy package +# +# This software is a part of ISAR. +# Copyright (c) Siemens AG, 2018 +# +# SPDX-License-Identifier: MIT + +python() { + distro_kernels = d.getVar('DISTRO_KERNELS', True) or "" + for kernel in distro_kernels.split(): + d.appendVar('PROVIDES', ' linux-image-' + kernel) + d.appendVar('PROVIDES', ' linux-headers-' + kernel) +} -- 2.13.6