From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7243694205603676160 X-Received: by 2002:ac8:5c13:0:b0:3f5:aa3:ad09 with SMTP id i19-20020ac85c13000000b003f50aa3ad09mr15511419qti.16.1687241151492; Mon, 19 Jun 2023 23:05:51 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac8:6644:0:b0:3f6:824f:575a with SMTP id j4-20020ac86644000000b003f6824f575als1396991qtp.0.-pod-prod-07-us; Mon, 19 Jun 2023 23:05:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4m9o2oJGofuXwVnVtmUX2coglm7pwnNY5jMy3o3Pndp/kJxy02fRWvciSsOXktMHNJP9Cm X-Received: by 2002:a05:620a:4e2:b0:763:a149:5826 with SMTP id b2-20020a05620a04e200b00763a1495826mr3592057qkh.58.1687241150470; Mon, 19 Jun 2023 23:05:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687241150; cv=none; d=google.com; s=arc-20160816; b=iex2FEnt2scu2JOg9YaM4uDIGuKINOySBdH1ptIJuMWy7ezgMX2bvcLBmcvx8yUudr dltDzTNh1yS+vdG6VNoUj9Icq0zR6gCWX2/SvEQZKOcjrM5pN/LwI80yfZoIiLnhjNy0 x8aywRLFf/jJFTuCvW/WOkgS7LkcXSvAm81yjTlhqQD6Ab/nWJzDHoOZZ5BYc15V3fHs zqAFNG/cx2Ue5nrVmZvkbyiEFC0mE8w/g5R0m7fpKRcgAPFa+mVeKHNQ9+8HbkHaFd4q fRn301c8KzfwPOVa8dU3nZ01GESb+11zrCOKl0R7IhNoptEg8w2jLsKjcmUWA7btkzJe ixlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=vvkXFnuNWUx7ER9L9SiZk3W51vymPgUkyCn8tKG87WY=; b=Cw2ZiU8YXf5ID9Y7F6vgFpJi8Cf3rfFS0smldywQC9IXgAqyn1+M3cWTfT0EDQrIXf QMroJnR/SOoRR9yYF7MYOB+rtBOIccKuDU/vwGdQX54Qz0R5zmzW4mTPnZtxBmXyaG3t yx39L1rCwo6MaP/nnbMlIW72EmACUFyw+zZDSk0u0bxEosscSFBk8HuenR56kr0mwbCp 7R3Uh+8ICir6VnjrcSXhiQskvF9XfuzwIhGP4PoekMm9XZ+GCgqzolARTfL13X/R6f+1 cQBam29J7h5pOG/z8NlK89NUsuQDaN3LZcgE2d/la8LQJO0MIYRdmWX/X9Po+0HiexVu MJXw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id qf9-20020a05620a660900b0075d536e21e2si100587qkn.2.2023.06.19.23.05.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Jun 2023 23:05:50 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 35K65iY3027569 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 20 Jun 2023 08:05:48 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v4 08/12] meta-isar: Cleanup machine configs Date: Tue, 20 Jun 2023 08:05:40 +0200 Message-Id: <20230620060544.19745-9-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230620060544.19745-1-ubely@ilbers.de> References: <20230620060544.19745-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: Q444QkZAIpO0 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 --- 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