From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7243694205603676160 X-Received: by 2002:a92:a30e:0:b0:341:d535:8c0a with SMTP id a14-20020a92a30e000000b00341d5358c0amr10528551ili.29.1687241148599; Mon, 19 Jun 2023 23:05:48 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6e02:583:b0:33b:5017:ce30 with SMTP id c3-20020a056e02058300b0033b5017ce30ls722338ils.1.-pod-prod-04-us; Mon, 19 Jun 2023 23:05:48 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ48soeMUR3No3Uk5nsEcO4GmUkhrd9qWAflYnupf5TVBgdkU4EgNqI0C8sxBBSNn+lE9mDS X-Received: by 2002:a5e:8909:0:b0:763:5ce2:4cfc with SMTP id k9-20020a5e8909000000b007635ce24cfcmr11241126ioj.8.1687241148003; Mon, 19 Jun 2023 23:05:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687241147; cv=none; d=google.com; s=arc-20160816; b=y/WbqzZ77QZjKL9aQt3yrX5L7hG42NtcyIk5g57TOSyADBFhpsTJZNCs8W5A76rjTA yiLTvLNlEzWlrVcHUD8NLdS3ZeUAVFbvO6A4TgqoHS0QKOrS2uVG9O5Np6xKW5J2Mv3M ozntV2hVBkQmqe4ta31O5sE7hvQNDMMXrwFFzxwwuPab0ZCD1LKOZQu6xeo88n68m6uB f9f5VTJuQndE0YzgGdXkvVWDIkyc1u8MV6npq0U/unRAGVRSZRRun7uwcV+ZDetbwid8 xpoOXNvavH0E3E/cMjVkxFi10Mam3t+XMdckvMSWvz+K+q3342PPBowO8M3xyi9zL/h6 kE3Q== 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=9SMro7TEys+iIfBv3r6G9Ms7b5PdI7/KOprdDf0Sk4k=; b=MchL4VZcjut8rNDXm+KK/41fWwg7CBOm1ldLYl19Keisiw/P8aWwlzZUY9RraPXq/W tZtuCI26rjvBWSfnzcDajIGc2Xf/TxPHyglAk435wmdxt2kgiVJaE3fi4HNtfY2qtx7K w9tWfKI47cXNajVrxOwqrkpOU9E1IcWQHj8e5LxVrdB4GL8UeDdpkgl3CP/54kdfM3JY JmfE4+LfyAEscE+cCzVirAh3UDReaXxV89m7nP4Y0gime/F3K8He+wJHBpIFGEgDWYPJ JYrRCbWKb5Lx9KiwyWaqFTQqyvRwzvWY1JdHmHq2TayzXcCk3+MjDhWb6ciojkQldXTE ZaZw== 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 z24-20020a029f18000000b0042681c2d789si128894jal.5.2023.06.19.23.05.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Jun 2023 23:05:47 -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 35K65iXv027569 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 20 Jun 2023 08:05:46 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v4 02/12] ubuntu: Fix WKS_FILE overriding Date: Tue, 20 Jun 2023 08:05:34 +0200 Message-Id: <20230620060544.19745-3-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: WvHl3ttJr0vQ From: Anton Mikanovich To enable setting custom WKS_FILE inside local.conf move overridden value from machine config to meta-test. Also move distro-related changing of KERNEL_NAME distro config. Reported-by: Felix Moessbauer Signed-off-by: Anton Mikanovich Signed-off-by: Uladzimir Bely --- meta-isar/conf/distro/ubuntu-common.inc | 2 ++ meta-isar/conf/machine/qemuamd64.conf | 7 ------- meta-isar/conf/multiconfig/qemuamd64-focal.conf | 2 -- meta-isar/conf/multiconfig/qemuamd64-jammy.conf | 2 -- meta-test/recipes-ci/images/isar-image-ci.bb | 10 ++++++++++ 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/meta-isar/conf/distro/ubuntu-common.inc b/meta-isar/conf/distro/ubuntu-common.inc index becb7e0a..6a990a89 100644 --- a/meta-isar/conf/distro/ubuntu-common.inc +++ b/meta-isar/conf/distro/ubuntu-common.inc @@ -16,6 +16,8 @@ BOOTSTRAP_KEY = "file://${LAYERDIR_isar}/conf/distro/ubuntu.public.key;sha256sum DISTRO_BOOTSTRAP_KEYS += "${BOOTSTRAP_KEY}" HOST_DISTRO_BOOTSTRAP_KEYS += "${BOOTSTRAP_KEY}" +# kernel package name is linux-image-generic in Ubuntu +KERNEL_NAME = "generic" # that is what debootstrap_1.0.118ubuntu1 does anyways DISTRO_DEBOOTSTRAP_SCRIPT = "/usr/share/debootstrap/scripts/gutsy" diff --git a/meta-isar/conf/machine/qemuamd64.conf b/meta-isar/conf/machine/qemuamd64.conf index 11842ec4..c02b3860 100644 --- a/meta-isar/conf/machine/qemuamd64.conf +++ b/meta-isar/conf/machine/qemuamd64.conf @@ -4,18 +4,11 @@ DISTRO_ARCH ?= "amd64" KERNEL_NAME ?= "amd64" -KERNEL_NAME:ubuntu-focal ?= "generic" -KERNEL_NAME:ubuntu-jammy ?= "generic" IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "sdimage-efi" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" -WKS_FILE:ubuntu-focal ?= "sdimage-efi-sd" -WKS_FILE:ubuntu-jammy ?= "sdimage-efi-sd" -IMAGER_INSTALL:remove:ubuntu-focal = "${GRUB_BOOTLOADER_INSTALL}" -IMAGER_INSTALL:remove:ubuntu-jammy = "${GRUB_BOOTLOADER_INSTALL}" - WKS_FILE:debian-bullseye ?= "sdimage-efi-btrfs" IMAGER_INSTALL:remove:debian-bullseye = "${GRUB_BOOTLOADER_INSTALL}" IMAGER_INSTALL:append:debian-bullseye = " ${SYSTEMD_BOOTLOADER_INSTALL} btrfs-progs" diff --git a/meta-isar/conf/multiconfig/qemuamd64-focal.conf b/meta-isar/conf/multiconfig/qemuamd64-focal.conf index 3de0b809..09076eba 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-focal.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-focal.conf @@ -5,5 +5,3 @@ MACHINE ?= "qemuamd64" DISTRO ?= "ubuntu-focal" - -IMAGER_INSTALL += "${SYSTEMD_BOOTLOADER_INSTALL}" diff --git a/meta-isar/conf/multiconfig/qemuamd64-jammy.conf b/meta-isar/conf/multiconfig/qemuamd64-jammy.conf index 7dd395c2..ec893604 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-jammy.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-jammy.conf @@ -5,5 +5,3 @@ MACHINE ?= "qemuamd64" DISTRO ?= "ubuntu-jammy" - -IMAGER_INSTALL += "${SYSTEMD_BOOTLOADER_INSTALL}" diff --git a/meta-test/recipes-ci/images/isar-image-ci.bb b/meta-test/recipes-ci/images/isar-image-ci.bb index 93c7065b..567c6cda 100644 --- a/meta-test/recipes-ci/images/isar-image-ci.bb +++ b/meta-test/recipes-ci/images/isar-image-ci.bb @@ -12,3 +12,13 @@ ISAR_RELEASE_CMD = "git -C ${LAYERDIR_test} describe --tags --dirty --match 'v[0 # Setup SSH server on board IMAGE_INSTALL += "isar-ci-ssh-setup" + +# qemuamd64-focal +WKS_FILE:qemuamd64:ubuntu-focal ?= "sdimage-efi-sd" +IMAGER_INSTALL:remove:qemuamd64:ubuntu-focal ?= "${GRUB_BOOTLOADER_INSTALL}" +IMAGER_INSTALL:append:qemuamd64:ubuntu-focal ?= " ${SYSTEMD_BOOTLOADER_INSTALL}" + +# qemuamd64-jammy +WKS_FILE:qemuamd64:ubuntu-jammy ?= "sdimage-efi-sd" +IMAGER_INSTALL:remove:qemuamd64:ubuntu-jammy ?= "${GRUB_BOOTLOADER_INSTALL}" +IMAGER_INSTALL:append:qemuamd64:ubuntu-jammy ?= " ${SYSTEMD_BOOTLOADER_INSTALL}" -- 2.20.1