From: Uladzimir Bely <ubely@ilbers.de>
To: isar-users@googlegroups.com
Subject: [PATCH v4 08/12] meta-isar: Cleanup machine configs
Date: Tue, 20 Jun 2023 08:05:40 +0200 [thread overview]
Message-ID: <20230620060544.19745-9-ubely@ilbers.de> (raw)
In-Reply-To: <20230620060544.19745-1-ubely@ilbers.de>
Some stuff from IMAGE_INSTALL / IMAGE_PREINSTALL like `sshd-regen-keys`
or `expand-on-first-boot` should not be part of machine configs.
Move it to the isar-image-ci configuration for the targets that
we tested. If a downstream relays on these packages for some hardware
targets they should adjust their `local.conf` or image recipe.
Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
RECIPE-API-CHANGELOG.md | 8 ++++++++
meta-isar/conf/machine/phyboard-mira.conf | 1 -
meta-isar/conf/machine/qemuamd64-sb.conf | 2 --
meta-isar/conf/machine/qemuamd64.conf | 3 ---
meta-isar/conf/machine/rpi-common.conf | 17 +++++------------
.../conf/machine/starfive-visionfive2.conf | 3 ---
meta-isar/conf/machine/virtualbox.conf | 1 -
meta-isar/conf/machine/vmware.conf | 1 -
.../multiconfig/imx6-sabrelite-bullseye.conf | 2 --
.../conf/multiconfig/imx6-sabrelite-buster.conf | 2 --
meta-test/recipes-ci/images/isar-image-ci.bb | 2 ++
11 files changed, 15 insertions(+), 27 deletions(-)
diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md
index bc892f53..e25ed38e 100644
--- a/RECIPE-API-CHANGELOG.md
+++ b/RECIPE-API-CHANGELOG.md
@@ -497,3 +497,11 @@ to `DEPENDS` or `IMAGE_INSTALL`.
Some CI-related recipes and images moves to meta-test from meta-isar, so if
a downstream used them, they should update their layers.conf accordingly.
+
+### Cleanup machine configs and multiconfigs from irrelevant packages
+
+Machine configs and multiconfigs should not include any IMAGE_INSTALL and
+IMAGE_PREINSTALL entries that doesn't refers to machine configuration, such as
+`expand-on-first-boot` or `sshd-regen-keys`.
+The configs are cleaned up now and this fact may force downstreams to modify
+their configuration if they relied on these packages.
diff --git a/meta-isar/conf/machine/phyboard-mira.conf b/meta-isar/conf/machine/phyboard-mira.conf
index 82e65343..0bc60cb0 100644
--- a/meta-isar/conf/machine/phyboard-mira.conf
+++ b/meta-isar/conf/machine/phyboard-mira.conf
@@ -18,7 +18,6 @@ IMAGE_FSTYPES ?= "ubi ubifs"
DTB_FILES = "imx6q-phytec-mira-ff-rdk-nand.dtb"
-IMAGE_INSTALL += "sshd-regen-keys"
IMAGE_INSTALL += "barebox"
BAREBOX_CONFIG = "imx_v7_defconfig"
diff --git a/meta-isar/conf/machine/qemuamd64-sb.conf b/meta-isar/conf/machine/qemuamd64-sb.conf
index c581ab39..84ef89eb 100644
--- a/meta-isar/conf/machine/qemuamd64-sb.conf
+++ b/meta-isar/conf/machine/qemuamd64-sb.conf
@@ -9,8 +9,6 @@ IMAGE_FSTYPES ?= "wic"
WKS_FILE ?= "sdimage-efi-sb-debian"
IMAGER_INSTALL += "${GRUB_DEBIAN_SB_CHAIN}"
-IMAGE_INSTALL += "sshd-regen-keys"
-
QEMU_ARCH ?= "x86_64"
QEMU_MACHINE ?= "q35"
QEMU_CPU ?= ""
diff --git a/meta-isar/conf/machine/qemuamd64.conf b/meta-isar/conf/machine/qemuamd64.conf
index cdee9bdd..f417ce24 100644
--- a/meta-isar/conf/machine/qemuamd64.conf
+++ b/meta-isar/conf/machine/qemuamd64.conf
@@ -9,9 +9,6 @@ IMAGE_FSTYPES ?= "wic"
WKS_FILE ?= "sdimage-efi"
IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
-IMAGE_INSTALL += "sshd-regen-keys"
-IMAGE_INSTALL += "expand-on-first-boot"
-
QEMU_ARCH ?= "x86_64"
QEMU_MACHINE ?= "q35"
QEMU_CPU ?= ""
diff --git a/meta-isar/conf/machine/rpi-common.conf b/meta-isar/conf/machine/rpi-common.conf
index 327ac91b..078ea195 100644
--- a/meta-isar/conf/machine/rpi-common.conf
+++ b/meta-isar/conf/machine/rpi-common.conf
@@ -1,5 +1,5 @@
# This software is a part of ISAR.
-# Copyright (C) 2022 ilbers GmbH
+# Copyright (C) 2023 ilbers GmbH
BOOT_SPACE ?= "81920"
MACHINE_SERIAL ?= "serial0"
@@ -12,18 +12,11 @@ KERNEL_TYPE = "raspios"
KERNEL_IMAGE_PKG ?= "raspberrypi-kernel"
KERNEL_HEADERS_PKG ?= "raspberrypi-kernel-headers"
-IMAGE_PREINSTALL += " \
- fdisk \
- iproute2 \
- iputils-ping \
- isc-dhcp-client \
- raspberrypi-bootloader \
- raspi-config \
- systemd-sysv \
- "
+IMAGE_PREINSTALL += "raspberrypi-bootloader \
+ raspi-config \
+ systemd-sysv"
-IMAGE_INSTALL += "expand-on-first-boot \
- bootconfig-${MACHINE}"
+IMAGE_INSTALL += "bootconfig-${MACHINE}"
WIC_IMAGER_INSTALL = "parted \
dosfstools \
diff --git a/meta-isar/conf/machine/starfive-visionfive2.conf b/meta-isar/conf/machine/starfive-visionfive2.conf
index a07b064f..b051902f 100644
--- a/meta-isar/conf/machine/starfive-visionfive2.conf
+++ b/meta-isar/conf/machine/starfive-visionfive2.conf
@@ -20,9 +20,6 @@ IMAGER_BUILD_DEPS += " \
jh7110-u-boot-spl-image \
visionfive2-u-boot-firmware"
-IMAGE_INSTALL += "sshd-regen-keys"
-IMAGE_INSTALL += "expand-on-first-boot"
-
# DTB file for OpenSBI
DTB_UBOOT_JH7110_VF2 = "starfive_visionfive2.dtb"
# DTB file for booting
diff --git a/meta-isar/conf/machine/virtualbox.conf b/meta-isar/conf/machine/virtualbox.conf
index 8c3e9bac..de3d04c3 100644
--- a/meta-isar/conf/machine/virtualbox.conf
+++ b/meta-isar/conf/machine/virtualbox.conf
@@ -10,7 +10,6 @@ KERNEL_NAME ?= "amd64"
WKS_FILE ?= "sdimage-efi"
IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
-IMAGE_INSTALL += "expand-on-first-boot"
VMDK_SUBFORMAT = "monolithicSparse"
IMAGE_FSTYPES ?= "ova"
diff --git a/meta-isar/conf/machine/vmware.conf b/meta-isar/conf/machine/vmware.conf
index 42503374..fba639b1 100644
--- a/meta-isar/conf/machine/vmware.conf
+++ b/meta-isar/conf/machine/vmware.conf
@@ -12,7 +12,6 @@ WKS_FILE ?= "sdimage-efi"
IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
OVF_TEMPLATE_FILE ?= "vm-img-vmware.ovf.tmpl"
-IMAGE_INSTALL += "expand-on-first-boot"
VMDK_SUBFORMAT = "streamOptimized"
IMAGE_FSTYPES ?= "ova"
diff --git a/meta-isar/conf/multiconfig/imx6-sabrelite-bullseye.conf b/meta-isar/conf/multiconfig/imx6-sabrelite-bullseye.conf
index 92615f22..909eadc5 100644
--- a/meta-isar/conf/multiconfig/imx6-sabrelite-bullseye.conf
+++ b/meta-isar/conf/multiconfig/imx6-sabrelite-bullseye.conf
@@ -7,5 +7,3 @@ DISTRO ?= "debian-bullseye"
DISTRO_ARCH ?= "armhf"
KERNEL_NAME ?= "armmp"
-
-IMAGE_INSTALL += "sshd-regen-keys"
diff --git a/meta-isar/conf/multiconfig/imx6-sabrelite-buster.conf b/meta-isar/conf/multiconfig/imx6-sabrelite-buster.conf
index c19f193c..54aed3e6 100644
--- a/meta-isar/conf/multiconfig/imx6-sabrelite-buster.conf
+++ b/meta-isar/conf/multiconfig/imx6-sabrelite-buster.conf
@@ -9,5 +9,3 @@ DISTRO ?= "debian-buster"
DISTRO_ARCH ?= "armhf"
KERNEL_NAME ?= "armmp"
-
-IMAGE_INSTALL += "sshd-regen-keys"
diff --git a/meta-test/recipes-ci/images/isar-image-ci.bb b/meta-test/recipes-ci/images/isar-image-ci.bb
index 733f7204..6d6c49c8 100644
--- a/meta-test/recipes-ci/images/isar-image-ci.bb
+++ b/meta-test/recipes-ci/images/isar-image-ci.bb
@@ -12,6 +12,7 @@ ISAR_RELEASE_CMD = "git -C ${LAYERDIR_test} describe --tags --dirty --match 'v[0
# Setup SSH server on board
IMAGE_INSTALL += "isar-ci-ssh-setup"
+IMAGE_INSTALL += "sshd-regen-keys"
# qemuamd64-bookworm
WKS_FILE:qemuamd64:debian-bookworm ?= "multipart-efi.wks"
@@ -19,6 +20,7 @@ WKS_FILE:qemuamd64:debian-bookworm ?= "multipart-efi.wks"
# qemuamd64-bullseye
IMAGE_FSTYPES:append:qemuamd64:debian-bullseye ?= " cpio.gz tar.gz"
WKS_FILE:qemuamd64:debian-bullseye ?= "sdimage-efi-btrfs"
+IMAGE_INSTALL:append:qemuamd64:debian-bullseye = " expand-on-first-boot"
IMAGER_INSTALL:remove:qemuamd64:debian-bullseye ?= "${GRUB_BOOTLOADER_INSTALL}"
IMAGER_INSTALL:append:qemuamd64:debian-bullseye ?= " ${SYSTEMD_BOOTLOADER_INSTALL} btrfs-progs"
IMAGE_PREINSTALL:append:qemuamd64:debian-bullseye ?= " btrfs-progs"
--
2.20.1
next prev parent reply other threads:[~2023-06-20 6:05 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-20 6:05 [PATCH v4 00/12] Move testsuite hacks to separate layer Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 01/12] CI: Introduce meta-test layer Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 02/12] ubuntu: Fix WKS_FILE overriding Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 03/12] CI: Move qemuamd64-bookworm hacks to CI layer Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 04/12] CI: Move qemuamd64-bullseye " Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 05/12] CI: Move qemuamd64-buster " Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 06/12] CI: Move qemuarm-bookworm " Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 07/12] CI: Move qemuarm64-bookworm " Uladzimir Bely
2023-06-20 6:05 ` Uladzimir Bely [this message]
2023-06-20 6:05 ` [PATCH v4 09/12] meta-isar: Remove qemuamd64-sb settings from multiconfig Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 10/12] meta-isar: Base qemuamd64-sb config on qemuamd64 Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 11/12] meta-isar: Remove imx6-sabrelite settings from multiconfig Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 12/12] meta-isar: Unify multiconfigs to use weak assignments Uladzimir Bely
2023-06-21 13:49 ` [PATCH v4 00/12] Move testsuite hacks to separate layer Henning Schild
2023-06-27 5:21 ` Uladzimir Bely
2023-06-27 5:32 ` Uladzimir Bely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230620060544.19745-9-ubely@ilbers.de \
--to=ubely@ilbers.de \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox