From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6599936908158042112 X-Received: by 2002:a1c:a80e:: with SMTP id r14-v6mr154453wme.11.1536667559929; Tue, 11 Sep 2018 05:05:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:2d97:: with SMTP id t145-v6ls606643wmt.9.gmail; Tue, 11 Sep 2018 05:05:59 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYr/O17yI9B9w/ez5BFzIjfP6erhDRM6PxQu72DFPNWJGEpMi+oEO5niLPeQgUz+Ss2dtmd X-Received: by 2002:a1c:f303:: with SMTP id q3-v6mr128746wmq.16.1536667559426; Tue, 11 Sep 2018 05:05:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536667559; cv=none; d=google.com; s=arc-20160816; b=gIEob+pHh6i+eVsSxCmiJf4Qq3MpOE49CCc4UynylekTsgRA6xMgsuhAyRj2k8vgnq QQEeXKMdZilN4aVRKo0NAJM9907/K+qkrvEUurEcnremlQpCzDt+GomPsp16WqngAFLl nT7gfkFT8uqt9sZqVT6BLRLIWqVdlspG94Xukpv+/fenXPUb3ogVyMiMzhStudWaYrn0 2kZzHH5qA0GuTHmVncUpgTPy4P0YP3LwBQuii9EhfnfPnc/ksrmGNEfWwXDr5kqtmmFR v1KNLMoICqqRbOeX3f7ezfern0GmT7CV9XPYX3TDK0G9/E1PMn/39kvAUMJNFg/d4g/8 foNA== 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=EG/a4rT/ezREUhi5baJG9NVpy1twNo0yXAgn2ZIC77I=; b=YJHaVfxPvm7bdNIWjsICfQYEhLWfCinA+pgLYvxQOCrxOJF//FhK9ZJovXTzCzzc/2 dGC4r4VMTPWn62uqOmudqdIz8q75Jof0kw+qeMVajhzkMB7NmIdEOUDQBFRdJb8HYjqY OHjq0d5KP5R3dHa9BEthJoj51koMjDnkL6kYMLipdGC3EYHiB0/Z/YdP7r5MI+GgIDWl JSmWi3zPtQ1jfp7duSO6fFKfYjA7cxGTlZPrdWdCo6SN7Y1o7sUBuuQPhpRoMsiAMFPU Y8pUFBJ1MW65B0qQ5HlGH9z8+J/WS//VuA9Pez61Bb/1pFTsMLc5PGiUpvKrxQEsSQm/ IJkQ== 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 v18-v6si33091wmc.1.2018.09.11.05.05.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Sep 2018 05:05:59 -0700 (PDT) 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.sbs.de (mail1.sbs.de [192.129.41.35]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w8BC5wJE025573 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 11 Sep 2018 14:05:58 +0200 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 w8BC5vIZ000884 for ; Tue, 11 Sep 2018 14:05:58 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH 15/16] meta-isar: Move init preinstallation into distro conf Date: Tue, 11 Sep 2018 14:05:55 +0200 Message-Id: <8a3bf825d81883f2a4c5412aac791d43515d0056.1536667556.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: acA1jV9CkHyg From: Jan Kiszka Since stretch, we need to install init explicitly in order to get a bootable image. This is a distro property, nothing machine-specific. So move it to the related distro confs. Signed-off-by: Jan Kiszka --- meta-isar/conf/distro/debian-buster.conf | 2 ++ meta-isar/conf/distro/debian-stretch.conf | 2 ++ meta-isar/conf/multiconfig/bananapi-stretch.conf | 2 -- meta-isar/conf/multiconfig/qemuamd64-buster.conf | 2 -- meta-isar/conf/multiconfig/qemuamd64-stretch.conf | 2 -- meta-isar/conf/multiconfig/qemuarm-buster.conf | 2 -- meta-isar/conf/multiconfig/qemuarm-stretch.conf | 2 -- meta-isar/conf/multiconfig/qemuarm64-buster.conf | 2 -- meta-isar/conf/multiconfig/qemuarm64-stretch.conf | 2 -- meta-isar/conf/multiconfig/qemui386-buster.conf | 2 -- meta-isar/conf/multiconfig/qemui386-stretch.conf | 2 -- 11 files changed, 4 insertions(+), 18 deletions(-) diff --git a/meta-isar/conf/distro/debian-buster.conf b/meta-isar/conf/distro/debian-buster.conf index f3f843c..61367ef 100644 --- a/meta-isar/conf/distro/debian-buster.conf +++ b/meta-isar/conf/distro/debian-buster.conf @@ -7,4 +7,6 @@ DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh" DISTRO_KERNELS ?= "4kc-malta 5kc-malta 686 686-pae amd64 arm64 armmp \ armmp-lpae cloud-amd64 loongson-3 marvell octeon powerpc64le s390x" +IMAGE_PREINSTALL += "init" + WIC_IMAGER_INSTALL += "python3-distutils" diff --git a/meta-isar/conf/distro/debian-stretch.conf b/meta-isar/conf/distro/debian-stretch.conf index cce5493..b3d2c2d 100644 --- a/meta-isar/conf/distro/debian-stretch.conf +++ b/meta-isar/conf/distro/debian-stretch.conf @@ -8,3 +8,5 @@ DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh" 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" + +IMAGE_PREINSTALL += "init" diff --git a/meta-isar/conf/multiconfig/bananapi-stretch.conf b/meta-isar/conf/multiconfig/bananapi-stretch.conf index 96cfffd..7fafe69 100644 --- a/meta-isar/conf/multiconfig/bananapi-stretch.conf +++ b/meta-isar/conf/multiconfig/bananapi-stretch.conf @@ -10,8 +10,6 @@ DISTRO_ARCH ?= "armhf" KERNEL_NAME ?= "armmp" -IMAGE_PREINSTALL += "init" - DISTRO_APT_SOURCES_append = " conf/distro/debian-stretch-backports.list" DISTRO_APT_PREFERENCES += "conf/multiconfig/preferences.bananapi.conf" diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster.conf b/meta-isar/conf/multiconfig/qemuamd64-buster.conf index a6fc40e..059ea00 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-buster.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-buster.conf @@ -7,8 +7,6 @@ DISTRO_ARCH ?= "amd64" KERNEL_NAME ?= "amd64" -IMAGE_PREINSTALL += "init" - IMAGE_TYPE ?= "wic-img" WKS_FILE ?= "sdimage-efi" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" diff --git a/meta-isar/conf/multiconfig/qemuamd64-stretch.conf b/meta-isar/conf/multiconfig/qemuamd64-stretch.conf index 632f3b5..f9d283c 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-stretch.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-stretch.conf @@ -8,8 +8,6 @@ DISTRO_ARCH ?= "amd64" KERNEL_NAME ?= "amd64" -IMAGE_PREINSTALL += "init" - IMAGE_TYPE ?= "wic-img" WKS_FILE ?= "sdimage-efi" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" diff --git a/meta-isar/conf/multiconfig/qemuarm-buster.conf b/meta-isar/conf/multiconfig/qemuarm-buster.conf index f9c97ec..bc84c8b 100644 --- a/meta-isar/conf/multiconfig/qemuarm-buster.conf +++ b/meta-isar/conf/multiconfig/qemuarm-buster.conf @@ -7,8 +7,6 @@ DISTRO_ARCH ?= "armhf" KERNEL_NAME ?= "armmp" -IMAGE_PREINSTALL += "init" - QEMU_ROOTFS_DEV ?= "vda" QEMU_ARCH ?= "arm" diff --git a/meta-isar/conf/multiconfig/qemuarm-stretch.conf b/meta-isar/conf/multiconfig/qemuarm-stretch.conf index 3094d5b..a2e3df1 100644 --- a/meta-isar/conf/multiconfig/qemuarm-stretch.conf +++ b/meta-isar/conf/multiconfig/qemuarm-stretch.conf @@ -8,8 +8,6 @@ DISTRO_ARCH ?= "armhf" KERNEL_NAME ?= "armmp" -IMAGE_PREINSTALL += "init" - QEMU_ROOTFS_DEV ?= "vda" QEMU_ARCH ?= "arm" diff --git a/meta-isar/conf/multiconfig/qemuarm64-buster.conf b/meta-isar/conf/multiconfig/qemuarm64-buster.conf index 77141d1..40f1d41 100644 --- a/meta-isar/conf/multiconfig/qemuarm64-buster.conf +++ b/meta-isar/conf/multiconfig/qemuarm64-buster.conf @@ -9,8 +9,6 @@ DISTRO_ARCH ?= "arm64" KERNEL_NAME ?= "arm64" -IMAGE_PREINSTALL += "init" - QEMU_ROOTFS_DEV ?= "vda" QEMU_ARCH ?= "aarch64" diff --git a/meta-isar/conf/multiconfig/qemuarm64-stretch.conf b/meta-isar/conf/multiconfig/qemuarm64-stretch.conf index 90b5a84..dcef370 100644 --- a/meta-isar/conf/multiconfig/qemuarm64-stretch.conf +++ b/meta-isar/conf/multiconfig/qemuarm64-stretch.conf @@ -9,8 +9,6 @@ DISTRO_ARCH ?= "arm64" KERNEL_NAME ?= "arm64" -IMAGE_PREINSTALL += "init" - QEMU_ROOTFS_DEV ?= "vda" QEMU_ARCH ?= "aarch64" diff --git a/meta-isar/conf/multiconfig/qemui386-buster.conf b/meta-isar/conf/multiconfig/qemui386-buster.conf index 000769a..4216d85 100644 --- a/meta-isar/conf/multiconfig/qemui386-buster.conf +++ b/meta-isar/conf/multiconfig/qemui386-buster.conf @@ -7,8 +7,6 @@ DISTRO_ARCH ?= "i386" KERNEL_NAME ?= "686-pae" -IMAGE_PREINSTALL += "init" - IMAGE_TYPE ?= "wic-img" WKS_FILE ?= "directdisk-isar" IMAGER_INSTALL += "${SYSLINUX_BOOTLOADER_INSTALL}" diff --git a/meta-isar/conf/multiconfig/qemui386-stretch.conf b/meta-isar/conf/multiconfig/qemui386-stretch.conf index 6586947..037ba23 100644 --- a/meta-isar/conf/multiconfig/qemui386-stretch.conf +++ b/meta-isar/conf/multiconfig/qemui386-stretch.conf @@ -8,8 +8,6 @@ DISTRO_ARCH ?= "i386" KERNEL_NAME ?= "686-pae" -IMAGE_PREINSTALL += "init" - IMAGE_TYPE ?= "wic-img" WKS_FILE ?= "directdisk-isar" IMAGER_INSTALL += "${SYSLINUX_BOOTLOADER_INSTALL}" -- 2.16.4