From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7227180191860129792 X-Received: by 2002:a63:84c3:0:b0:50b:dda2:6140 with SMTP id k186-20020a6384c3000000b0050bdda26140mr1573584pgd.11.1682709017577; Fri, 28 Apr 2023 12:10:17 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:902:8e85:b0:1a2:8e32:c59d with SMTP id bg5-20020a1709028e8500b001a28e32c59dls5563209plb.8.-pod-prod-gmail; Fri, 28 Apr 2023 12:10:16 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7HKXoJLacKOoeK3cig+CVls8e8CcFtMo6tf7+HSyJLszN8JYQE6h+AJYDrXnW2dilM5Dcg X-Received: by 2002:a17:902:ea12:b0:1a9:712d:18b5 with SMTP id s18-20020a170902ea1200b001a9712d18b5mr7334338plg.67.1682709016547; Fri, 28 Apr 2023 12:10:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682709016; cv=none; d=google.com; s=arc-20160816; b=diltJxxvKIKXbmqq7gHw0K4N/qStxX3l3VFSIE1FTVL0jvMtyucbF0QCk8GcLGh/QV 1EZ9xgVZDe4GyIIbA438oCAcv48HVKy8Ey1Wv1GW/PhKvKvSSkd1d2gcdYRNaalk/3Pa uBsj6zTNyiwWqaE38/JLzMmG0tnuzScDI++6TknQDSDNm5sOqLXd0zNWkmlwjjo1fqJ3 TZa+dKQFMnmKqoVX3L1A55xjetB49HpFTpXZqgicE/xPt/cc04TJgxsMlzAC/zMDDV1g Zl/2r1Q22zE81BK93iotKThct5jdBhntoOmz7NJ5Kyx6mgK1wfwjEB4MsuFN81MxSShy myRw== 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:cc:to:from; bh=3JL7uWkPCbJ8IP+5BU6VtrJMXunAQgXl44q4Oa5wHuw=; b=qg6MFkWVs4ZEPYUM8NwbLwcgOVedteUYvcl0ZABow1sw+onMKD19RCzn2T6SX2B/9f cZBgRDI5RwW4wsk5sGm6ocmGxoYdUrNqXmoxkxmlTvKTBMEJ/Keq8+ejeJWlZFnmlWDd rZNnRjXGHqKkytEB92sP5jblUFsDk0fGU1++Rl4pwLDUZ+PsAt6aGU6hHE0HriJhESZi hoOEJXf771ceD313/hPV9yrsmk9lhhG/loPQ/2C0Uzd5zv5XId6wKnp2VWzAHl6mioVt RR5CCmaqUXzQCmnXAIAw5jWQ9OifZchowpigZ5QP50uCcy/dvdLOq8gRl75DXAp2VA4h gDFg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id q6-20020a170902f78600b001a51e7572cesi1104498pln.5.2023.04.28.12.10.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 28 Apr 2023 12:10:16 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@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 amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from user-B660.promwad.com (IN-213-226-141-183.bitemobile.lv [213.226.141.183] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 33SJA7F9011347 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 28 Apr 2023 21:10:10 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich , Felix Moessbauer Subject: [PATCH v1 02/10] ubuntu: Fix WKS_FILE overriding Date: Fri, 28 Apr 2023 22:09:56 +0300 Message-Id: <20230428191004.243993-3-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230428191004.243993-1-amikan@ilbers.de> References: <20230428191004.243993-1-amikan@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: g1j8VDspluvJ 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 --- meta-isar/conf/distro/ubuntu-focal.conf | 2 ++ meta-isar/conf/machine/qemuamd64.conf | 4 ---- meta-isar/conf/multiconfig/qemuamd64-focal.conf | 2 -- meta-test/recipes-ci/images/isar-image-ci.bb | 5 +++++ 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/meta-isar/conf/distro/ubuntu-focal.conf b/meta-isar/conf/distro/ubuntu-focal.conf index 0cb6958d..40b9b29c 100644 --- a/meta-isar/conf/distro/ubuntu-focal.conf +++ b/meta-isar/conf/distro/ubuntu-focal.conf @@ -17,6 +17,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 0c768258..c02b3860 100644 --- a/meta-isar/conf/machine/qemuamd64.conf +++ b/meta-isar/conf/machine/qemuamd64.conf @@ -4,15 +4,11 @@ DISTRO_ARCH ?= "amd64" KERNEL_NAME ?= "amd64" -KERNEL_NAME:ubuntu-focal ?= "generic" IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "sdimage-efi" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" -WKS_FILE:ubuntu-focal ?= "sdimage-efi-sd" -IMAGER_INSTALL:remove:ubuntu-focal = "${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-test/recipes-ci/images/isar-image-ci.bb b/meta-test/recipes-ci/images/isar-image-ci.bb index be122a6a..e17ae27e 100644 --- a/meta-test/recipes-ci/images/isar-image-ci.bb +++ b/meta-test/recipes-ci/images/isar-image-ci.bb @@ -10,3 +10,8 @@ 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}" -- 2.34.1