From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7239976793797558272 X-Received: by 2002:a92:c08b:0:b0:33a:b6ca:c4d3 with SMTP id h11-20020a92c08b000000b0033ab6cac4d3mr7963704ile.12.1685688457579; Thu, 01 Jun 2023 23:47:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6e02:4aa:b0:331:2c30:78bc with SMTP id e10-20020a056e0204aa00b003312c3078bcls239458ils.1.-pod-prod-01-us; Thu, 01 Jun 2023 23:47:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7QI69JPz4jmkBe+7jT+n77faXmBgkw+oFZHIZqdVSOQAmMPXmg3Xxx+t9bp7QJvMxEpKm1 X-Received: by 2002:a5d:8f8b:0:b0:774:8510:8285 with SMTP id l11-20020a5d8f8b000000b0077485108285mr1650525iol.18.1685688456967; Thu, 01 Jun 2023 23:47:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685688456; cv=none; d=google.com; s=arc-20160816; b=HKpx4NBWQY3HWZdTBaVGEvOzBjjJE9LKcyjj1XpgALf1woFR0p/64aeVof7bfrC4Uy hP8xCpc1S0NqYAV4gYofI4wypUqosNqoelckfCeL1RY1DFGrJafBbK2iSWU6Pb2d2LjU KuIz6aL6G/pF2xjH3UOtyA0mq//1GNCEjJSfz6hYvRouG9+FEzDcf5cAjQ8ogGVDsxBY SdMDk7otFF9ImZ03+k7amnK2fN969EHy3DdemxsJe0TFLkcswod7utMiQFBfjYQpvCuw wc/dwmAxRGFMCKouhiSave2hWSNIxVX3A88QO6M0yAQn1QMilk1iQ+Irnkc5J9kaq9RH fv/w== 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=NpNPujRJp4VBebkZkFiOW55jJH5RtMIy4Pyd76kU6rQ=; b=rGvZEQwpvNCOno2oHlSqmtEmQerx7IwXiqpVtgZu7dxeoDnMeLGKMwjLg5aDbNsz9K 4YwxQPB6n8/ZIygjEq6E2P9e1y9AjL1yYTLAZl/B1MjBwdryPHqiMFt5SOBfPYprkkwd BZ5xBiT63+KyeuTXegwLjFtEtvSNxNIYLs7mye2O/XZIGw7jWAP3SmsjZf1luyu8A7DF qCOB453CbX8tv0uQKpIaNhKhF6mznmVh8Di8/rIoSftBLLUFQse5y3go0LZKjxCZa+cM Ng3+Xa6/O+VnGU1Nj4FMxSdXWpSthIxzC0MGK/Ke4RdoHX4v+mWQ1ZX+k6N+ymmRQquY euRQ== 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 l5-20020a023905000000b0040fc30ac205si30361jaa.0.2023.06.01.23.47.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 Jun 2023 23:47:36 -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 3526lTcr003460 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 2 Jun 2023 08:47:30 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 02/10] ubuntu: Fix WKS_FILE overriding Date: Fri, 2 Jun 2023 08:47:21 +0200 Message-Id: <20230602064729.10331-3-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230602064729.10331-1-ubely@ilbers.de> References: <20230602064729.10331-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: 1P/Pn2I3uNhk 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 be122a6a..a1ff929e 100644 --- a/meta-test/recipes-ci/images/isar-image-ci.bb +++ b/meta-test/recipes-ci/images/isar-image-ci.bb @@ -10,3 +10,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