From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7299890019491119104 X-Received: by 2002:a05:6402:5114:b0:544:3966:6904 with SMTP id m20-20020a056402511400b0054439666904mr41493edd.2.1699638091373; Fri, 10 Nov 2023 09:41:31 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:1387:b0:544:a163:413f with SMTP id b7-20020a056402138700b00544a163413fls335249edv.2.-pod-prod-08-eu; Fri, 10 Nov 2023 09:41:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IH+2uvvSINzPsEwkQWQVf6Qo86ipyrMFR/crvBk32+vTL+aOYL/hggp/KQQCzn/FBjGhTff X-Received: by 2002:a17:907:6d20:b0:9a3:c4f4:12de with SMTP id sa32-20020a1709076d2000b009a3c4f412demr7025313ejc.37.1699638089009; Fri, 10 Nov 2023 09:41:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699638088; cv=none; d=google.com; s=arc-20160816; b=evQNt/Xd0d76cH2vqXpYjhN5piYGPGSePmTk/OQ1jBgsLZzeYMCRQS/A1BxePYd2Lz bfTOQcZBLIEXwCTYSIaGZ8Dz2V6e08WVYMnlcsAi/p6Z1uCcDSGbsQTurq+GTf/TBdkH 7jq8Yh0DrZSkY87zlhUJ2E5r7ynugXoFPXAB230YndWWrO0IkgX/u4OXMe63ydk5WyzD WV+2T8M5zal0u4U4COUkUXlSZuvf4Ev2f1AKHMXO+orp+IeQjwsbx0ch9WNZgCW/Si// y5ygdaSJPAKcHRkjHYKY0Ix2u7X9CuyZx2hygIDiSkP/xPKKNkDJhbs+rRI3GyLcS/nz ZdyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=vSESxcvfKRxF7t2ZnDz/qOGPmji+MWi8kPI0FaNOudk=; fh=jG0qHt3CTUMEKKl5ieAxjdiNuiHKpV9cWwyhjpouQSU=; b=gkkNkgb25luLOPCVV5eg/si48SgPr70gaqXFTCmEEtNYYKHjAyCDEGzXbZxg82wi0o q68s5K5I6v+dX3KUvrF9fCWHgmyunJ6VZCHUZQY484zRmpjBYiP/L/5FadXrqcbIe7xP ZVAIs5luCgDaVTtB5iEH1m7/I0lNpIDPK9ojvHEl9NbhNT+EvtWAPzOsF9icZKFF+hFL EvAuaOZjMMwrXo5mw5xo70NDaUOC4Ql9swFLcT/2BCnDBwkK2vXqJc9MpYsa0elTRrNR e4gblB2egWngyIvVCp/+0OsqRSTBn8pY2WbShNuvu6xJfcPcODrKPOPyi24DcEQ0+/tZ 3EFA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=oSNBJZXw; spf=pass (google.com: domain of fm-294854-20231110174128b6ff17603e9a2b3d7e-iasrmt@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-294854-20231110174128b6ff17603e9a2b3d7e-iAsRMT@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-228.siemens.flowmailer.net (mta-65-228.siemens.flowmailer.net. [185.136.65.228]) by gmr-mx.google.com with ESMTPS id sa25-20020a1709076d1900b009e2c2a65c8asi694485ejc.0.2023.11.10.09.41.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Nov 2023 09:41:28 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-20231110174128b6ff17603e9a2b3d7e-iasrmt@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) client-ip=185.136.65.228; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=oSNBJZXw; spf=pass (google.com: domain of fm-294854-20231110174128b6ff17603e9a2b3d7e-iasrmt@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-294854-20231110174128b6ff17603e9a2b3d7e-iAsRMT@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-65-228.siemens.flowmailer.net with ESMTPSA id 20231110174128b6ff17603e9a2b3d7e for ; Fri, 10 Nov 2023 18:41:28 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=vSESxcvfKRxF7t2ZnDz/qOGPmji+MWi8kPI0FaNOudk=; b=oSNBJZXwuQn4eI09ouC9NYln3HJzHLniaXh8t+rEo0lPGXBe9VCrI7FlLKcOjmlpzqkMC4 sHJ1f5O3bGEPSLf7d+p7Od3ZoedwKgTzFzDo+eBghhw2U4T/3UU6fJBR2zqlOQihdK299bSD KaD3TrQ307O6wkZDR6ykuhCp1+Vtk=; From: Jan Kiszka To: isar-users Cc: Adriaan Schmidt Subject: [PATCH 2/4] Convert WIC_IMAGER_INSTALL to IMAGER_INSTALL:wic Date: Fri, 10 Nov 2023 18:41:25 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-TUID: GeHTOtWPTtFK From: Jan Kiszka This variable exists for historic reasons and will soon be deprecated. Convert own usage over. Signed-off-by: Jan Kiszka --- meta-isar/classes/rpi-sdimg.bbclass | 12 ++++++------ meta-isar/conf/distro/ubuntu-common.inc | 2 +- meta-isar/conf/machine/rpi-common.conf | 12 ++++++------ meta/conf/distro/debian-common.conf | 20 ++++++++++---------- meta/conf/distro/debian-sid-ports.conf | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/meta-isar/classes/rpi-sdimg.bbclass b/meta-isar/classes/rpi-sdimg.bbclass index d8163a47..fc63f7f9 100644 --- a/meta-isar/classes/rpi-sdimg.bbclass +++ b/meta-isar/classes/rpi-sdimg.bbclass @@ -7,12 +7,12 @@ IMAGE_TYPEDEP:rpi_sdimg = "wic" WKS_FILE ?= "rpi-sdimg" -WIC_IMAGER_INSTALL = "parted \ - dosfstools \ - mtools \ - e2fsprogs \ - python3-distutils \ - bmap-tools" +IMAGER_INSTALL:wic += "parted \ + dosfstools \ + mtools \ + e2fsprogs \ + python3-distutils \ + bmap-tools" IMAGE_BOOT_FILES ?= "${IMAGE_ROOTFS}/boot/*.*;./ \ ${IMAGE_ROOTFS}/boot/overlays/*;overlays/" diff --git a/meta-isar/conf/distro/ubuntu-common.inc b/meta-isar/conf/distro/ubuntu-common.inc index 6a990a89..9d8a843b 100644 --- a/meta-isar/conf/distro/ubuntu-common.inc +++ b/meta-isar/conf/distro/ubuntu-common.inc @@ -31,4 +31,4 @@ DISTRO_KERNELS ?= " \ IMAGE_PREINSTALL += "init" IMAGE_PREINSTALL += "initramfs-tools" -WIC_IMAGER_INSTALL += "python3-distutils" +IMAGER_INSTALL:wic += "python3-distutils" diff --git a/meta-isar/conf/machine/rpi-common.conf b/meta-isar/conf/machine/rpi-common.conf index 078ea195..ba5047ce 100644 --- a/meta-isar/conf/machine/rpi-common.conf +++ b/meta-isar/conf/machine/rpi-common.conf @@ -18,12 +18,12 @@ IMAGE_PREINSTALL += "raspberrypi-bootloader \ IMAGE_INSTALL += "bootconfig-${MACHINE}" -WIC_IMAGER_INSTALL = "parted \ - dosfstools \ - mtools \ - e2fsprogs \ - python3-distutils \ - bmap-tools" +IMAGER_INSTALL:wic += "parted \ + dosfstools \ + mtools \ + e2fsprogs \ + python3-distutils \ + bmap-tools" IMAGE_BOOT_FILES ?= "${IMAGE_ROOTFS}/boot/*.*;./ \ ${IMAGE_ROOTFS}/boot/overlays/*;overlays/" diff --git a/meta/conf/distro/debian-common.conf b/meta/conf/distro/debian-common.conf index 5610dcd4..1e1dfc83 100644 --- a/meta/conf/distro/debian-common.conf +++ b/meta/conf/distro/debian-common.conf @@ -12,16 +12,16 @@ DISTRO_APT_SOURCES ?= "conf/distro/${BASE_DISTRO}-${BASE_DISTRO_CODENAME}.list" IMAGE_PREINSTALL += "init" -WIC_IMAGER_INSTALL = "parted \ - gdisk \ - util-linux \ - dosfstools \ - mtools \ - e2fsprogs \ - python3-distutils \ - bmap-tools \ - tar \ - fdisk" +IMAGER_INSTALL:wic += "parted \ + gdisk \ + util-linux \ + dosfstools \ + mtools \ + e2fsprogs \ + python3-distutils \ + bmap-tools \ + tar \ + fdisk" GRUB_BOOTLOADER_INSTALL:amd64 = "grub-efi-amd64-bin" GRUB_BOOTLOADER_INSTALL:i386 = "grub-efi-ia32-bin" diff --git a/meta/conf/distro/debian-sid-ports.conf b/meta/conf/distro/debian-sid-ports.conf index b1709098..8a0b3a98 100644 --- a/meta/conf/distro/debian-sid-ports.conf +++ b/meta/conf/distro/debian-sid-ports.conf @@ -24,4 +24,4 @@ THIRD_PARTY_APT_KEYS += "${DEBIAN_PORTS_KEYS}" IMAGE_PREINSTALL += "init" -WIC_IMAGER_INSTALL += "python3-distutils" +IMAGER_INSTALL:wic += "python3-distutils" -- 2.35.3