From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7073380206728183808 X-Received: by 2002:a05:600c:350f:b0:389:e77f:3c17 with SMTP id h15-20020a05600c350f00b00389e77f3c17mr1250713wmq.81.1646914790272; Thu, 10 Mar 2022 04:19:50 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:c855:0:b0:384:9952:e84a with SMTP id c21-20020a7bc855000000b003849952e84als2408394wml.0.gmail; Thu, 10 Mar 2022 04:19:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJx+kWH1Q+vJ/TalwQvZjrid1Xf3sG2/HCOVTHxhlTO0HaWvXb1oNR1j36QIbKSNL1OlVnsH X-Received: by 2002:a7b:c381:0:b0:37b:e01f:c1c0 with SMTP id s1-20020a7bc381000000b0037be01fc1c0mr11744613wmj.98.1646914789257; Thu, 10 Mar 2022 04:19:49 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1646914789; cv=pass; d=google.com; s=arc-20160816; b=wkPZLZTFlptlq23aevQVIBYinDLi4GharXx9Mq6ABvZ4lj6yp0T0uPhNGyAL5TYMlY I6qNdEVDJs9QrLiSUVqO25K8VtsTwwwYSOb5KrJvCUmKFZ8oUsBgp0toM5yB9v/BXzqn jgdAS9yBIAbndo2TMKI4ZFySrBJwTip2qU6FmGBrSBGovVinx+GBlRqxlfXdCHiproor mM3U4G5jiSHsgLHte44M4m8O1xiILTZ7RQ1hUFcMZIr6rKytQ94hjmwzuoR6Ph3tiSvM jrO3tI8mWdlLEeV2TD4f91y+VF8Jn0RlMEhuGgLOjd0XrL4QGUUFopFcak5Xsb+l0vrM XnNQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :dkim-signature; bh=3JlYNfvDPKWmgEWJJ3/XevyQvKM0AnEfkdCx1LZChaU=; b=AVR1eJiRrVLLt4tGfnayMk9B74iLJcZi+2WKYgE8rV3svzCFfjEOtZERmDOhTLIteA zw4l+jp6Z4OUYZJUoxaYd8pLole49XVO+Vk/WHZ18p9HClQt1rYgQ0oci0lzRfbmYwZ9 W4gmKndTKT9T8b3oOeJdW5tOJllXIhcuiY/p1Qy7Yap01N6xRQc9WR2FOJpe8S9LzamA rQVrVp7KblrxnY6jVQZVmSw2ogHGD4pPD78tnYF9be/eApzsx9cJ8puflsgpuMd00mlt RqQ5fZR7uTTvqwu9Cl8f3r0DsimAyov/KJnQ50W8HDUn6VXseu7uLMAe0g6HB23XNsf/ NM1A== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="giHBz/YJ"; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe09::61e as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03on061e.outbound.protection.outlook.com. [2a01:111:f400:fe09::61e]) by gmr-mx.google.com with ESMTPS id az24-20020a05600c601800b00389a1a68b71si467419wmb.0.2022.03.10.04.19.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Mar 2022 04:19:49 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe09::61e as permitted sender) client-ip=2a01:111:f400:fe09::61e; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="giHBz/YJ"; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe09::61e as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eg176BGDT/H01W4KljB/03hWGKYtOxlFKqcheXTVaEuJqydNar1bp6Lb2JGII6G46tuGLl0UdPID8k04mambXlpDbl9F/gEV1R8/rFZPeuPQgAkxzQc3cblE5RG0JnJbQstbDQltvEWwHga6uwMiMriXxyZr3Q18yEL0A6MREIssnf6j+AK1mUTYTYFfzCwci6nMbKgzaJ6WrKBbliBPBTuA2A6QWuKYsJS2p2QsRbK7yLrpkZRlj/DPtg9RxoHZ4Yb4dAjvcN/MtiTM/Mm+ewKQBlXGvwX0uFRscsyo/vwIVfTpkkQk41KCtHve9UnJ/QtRFnYPmn9qS40qzHY5dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3JlYNfvDPKWmgEWJJ3/XevyQvKM0AnEfkdCx1LZChaU=; b=L/qoD+gU8X7+t1s8mpZfepSYqoemDVEzIJAFF0v7t6FrbPbmjUoMLK5Zw0uZ/LsatGzfUUwe4qOuFR4cp6j6c5R1aS5XjGNFDSwX5BxnEq3a9LxTujmsx14+9ts3cpjm7PyP0Eaq8aP47DhISZVKvP0icvMCO9yvSvYaN4YZ7z3qbljx7AOG1oBr7oMptOIn/XzM9gBzjwuYEMdA2cE6L4OoJu1In9QQ7hQ2aZ+VjpimYDN9ZDGhTwA/bmm6CiocxKEmvWf34Tg0bjOwEN+b1owB69ZB8SKElMig6BdMBIZUxq7wn8Llos+TgLc3mXrnIRLmtSDBPwUj1yS2GHBMmg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.71) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3JlYNfvDPKWmgEWJJ3/XevyQvKM0AnEfkdCx1LZChaU=; b=giHBz/YJqghDvlMXS7wYPV8LtX/cmNXjDnaiqUwuersW5pyBh6kI2tUygFlpRYbOjNoTDoyCgvCUyG+TmA+4Sjq4gLbJD9KC3GQ5BNNGeMaQ5x0gr1NQcAyti1g3vyJzakNPBAd/cNVZxO+Nn038H6en/psVqPtYc92NhjQfWVsujrShHRYHSqpoybkufs2M08584MkD0rvKP84DEBcjZdD4UJHgG+VzSvzX0anQ5/Rk05uaTRZS7YOsgbPPR6zFBBckaZ6NQ2zVZsEvc8zRluQ1bH1h6zKqEXX9xU84BR7myNvw6k4k4pDdphPyplKMZxwZ/+Fj0n1znz76oWsF4w== Received: from OL1P279CA0030.NORP279.PROD.OUTLOOK.COM (2603:10a6:e10:13::17) by AM0PR10MB2417.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:d5::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.16; Thu, 10 Mar 2022 12:19:47 +0000 Received: from HE1EUR01FT011.eop-EUR01.prod.protection.outlook.com (2603:10a6:e10:13:cafe::f) by OL1P279CA0030.outlook.office365.com (2603:10a6:e10:13::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.20 via Frontend Transport; Thu, 10 Mar 2022 12:19:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.71) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.71 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.71; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.71) by HE1EUR01FT011.mail.protection.outlook.com (10.152.0.173) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5061.22 via Frontend Transport; Thu, 10 Mar 2022 12:19:47 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SKA.ad011.siemens.net (194.138.21.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Thu, 10 Mar 2022 13:19:46 +0100 Received: from [167.87.0.196] (167.87.0.196) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Thu, 10 Mar 2022 13:19:46 +0100 Message-ID: <18253366-9000-0d65-49ed-f14223228d1a@siemens.com> Date: Thu, 10 Mar 2022 13:19:45 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Subject: Re: [PATCH] meta: Consolidate more common bits of Debian distro configs Content-Language: en-US To: Henning Schild CC: isar-users References: <20220310091221.54d0e5ca@md1za8fc.ad001.siemens.net> From: Jan Kiszka In-Reply-To: <20220310091221.54d0e5ca@md1za8fc.ad001.siemens.net> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-Path: jan.kiszka@siemens.com X-Originating-IP: [167.87.0.196] X-ClientProxiedBy: DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: be74b1c6-dc55-4f9f-10ad-08da02904473 X-MS-TrafficTypeDiagnostic: AM0PR10MB2417:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2gQGhS/04g9a7jfpIiwiuPMGm40briPd3Q1pCvuqq4B92CTh3T7m9HJyGLYsIHf10sWMhQgdNFoFmS5S67/DzkktW3Jq+3q1iDRVgMGqXvUuVvYV8pinOuEFwqCQCtmTSy1mGSQYxsBfPRcFaCKu9vT9I7ku3oXDwbCh9SdZFToAGOLrUvn/gTV4YJ2FLxHWuJJb1mxGuttUb+n3WHDUCaiyckNondrmm9ZruHmpGFqD//nOm1PzXBNGXMdM/VsL2rQ3m9j79fSyN7zR0OkVw1vI2YUIMxZ/Ech3Hyd9RWxZMSsnxt45+KdpSzQ2/UA7JpJC7VKhL1DpoTmy9eA9D4YoZYTN08gqzXtKgikgyFyaaifwp25g7Zf69GAov6Mng9r00MpDlS58nqjiBHboDusX/UUEv+ZrDb7zHPbJpxn+/VfGplfecphOuSlDYzAzwy/kAQw75WjrZTn10ugfHqcVVyArZoVgVUGp+E0E7BZ9fYZz5IBqduWmQrmdr7znsca6tuCYqi61dlbJvbO3coBJQfFmo/GduTJOJNUhjwoDNLB76WFY5rRclohQ14OPnCoYOw9O50u5mfMfx0Wqc2tStSUwh0RHCtodFGVD1H7ragPo8ba8akiNptOk3SFKu174piWzbbkRwFCHkL5Lief16Frp1YhZJR2LmLIxNkOUL99gc+g1qdCiN1d0ef24M6kw5oiCOmm0XLOwjeUOka7qq58h0GlBumJnPtr9gLQXaVzs9h8TPPoXEr1RtFYkjtapI1wwSi7g+6x1bGJ1nQ== X-Forefront-Antispam-Report: CIP:194.138.21.71;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(4326008)(70206006)(53546011)(83380400001)(82310400004)(6636002)(8676002)(47076005)(44832011)(31696002)(36756003)(31686004)(86362001)(40460700003)(36860700001)(356005)(6862004)(5660300002)(8936002)(508600001)(81166007)(37006003)(16576012)(316002)(2906002)(16526019)(2616005)(956004)(186003)(26005)(336012)(82960400001)(6706004)(70586007)(3940600001)(36900700001)(43740500002);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2022 12:19:47.2520 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: be74b1c6-dc55-4f9f-10ad-08da02904473 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.71];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT011.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB2417 X-TUID: OpZMnEjdFjAX On 10.03.22 09:12, Henning Schild wrote: > Am Thu, 10 Mar 2022 09:07:39 +0100 > schrieb Jan Kiszka : > >> From: Jan Kiszka >> >> Preinstalling "init" is shared by all Debian versions, so make it >> common. In turn, move the stretch-specific WIC_IMAGER_INSTALL values >> into the stretch config. >> >> Signed-off-by: Jan Kiszka >> --- >> meta/conf/distro/debian-bookworm.conf | 4 ---- >> meta/conf/distro/debian-bullseye.conf | 4 ---- >> meta/conf/distro/debian-buster.conf | 4 ---- >> meta/conf/distro/debian-common.conf | 5 +++-- >> meta/conf/distro/debian-stretch.conf | 4 +++- >> 5 files changed, 6 insertions(+), 15 deletions(-) >> >> diff --git a/meta/conf/distro/debian-bookworm.conf >> b/meta/conf/distro/debian-bookworm.conf index c83d6588..7e614bf2 >> 100644 --- a/meta/conf/distro/debian-bookworm.conf >> +++ b/meta/conf/distro/debian-bookworm.conf >> @@ -13,7 +13,3 @@ DISTRO_KERNELS ?= "4kc-malta 5kc-malta 686-pae 686 >> alpha-generic alpha-smp \ mips64r6el octeon parisc parisc64 >> powerpc-smp powerpc powerpc64 \ powerpc64le riscv64 rpi rt-686-pae >> rt-amd64 rt-arm64 rt-armmp \ s390x sh7751r sh7785lcr sparc64-smp >> sparc64" - >> -IMAGE_PREINSTALL += "init" > > Since we supporting building container images as well, i wonder if that > is not something which might need to go into machine.conf instead of > distro.conf. > It once came from there, but that was long before containers. It probably needs some refreshment on why we need this. This here jus moves the code around. Jan > Henning > >> -WIC_IMAGER_INSTALL += "python3-distutils" >> diff --git a/meta/conf/distro/debian-bullseye.conf >> b/meta/conf/distro/debian-bullseye.conf index 98bd049a..9e072692 >> 100644 --- a/meta/conf/distro/debian-bullseye.conf >> +++ b/meta/conf/distro/debian-bullseye.conf >> @@ -10,7 +10,3 @@ DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh" >> DISTRO_KERNELS ?= "4kc-malta 5kc-malta 686 686-pae amd64 arm64 armmp >> \ armmp-lpae cloud-amd64 loongson-3 octeon powerpc64le rpi s390x >> marvell \ rt-686-pae rt-amd64 rt-arm64 rt-armmp" >> - >> -IMAGE_PREINSTALL += "init" >> - >> -WIC_IMAGER_INSTALL += "python3-distutils" >> diff --git a/meta/conf/distro/debian-buster.conf >> b/meta/conf/distro/debian-buster.conf index e7c837bb..c882460a 100644 >> --- a/meta/conf/distro/debian-buster.conf >> +++ b/meta/conf/distro/debian-buster.conf >> @@ -10,7 +10,3 @@ DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh" >> DISTRO_KERNELS ?= "4kc-malta 5kc-malta 686 686-pae amd64 arm64 armmp >> \ armmp-lpae cloud-amd64 loongson-3 marvell octeon powerpc64le rpi >> s390x \ rt-686-pae rt-amd64 rt-arm64 rt-armmp" >> - >> -IMAGE_PREINSTALL += "init" >> - >> -WIC_IMAGER_INSTALL += "python3-distutils" >> diff --git a/meta/conf/distro/debian-common.conf >> b/meta/conf/distro/debian-common.conf index b2e05e67..d24fc2bb 100644 >> --- a/meta/conf/distro/debian-common.conf >> +++ b/meta/conf/distro/debian-common.conf >> @@ -8,17 +8,18 @@ BASE_DISTRO = "debian" >> HOST_DISTRO_APT_SOURCES ?= "conf/distro/${HOST_DISTRO}.list" >> 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 \ >> + python3-distutils \ >> bmap-tools \ >> tar \ >> fdisk" >> -WIC_IMAGER_INSTALL_remove_debian-stretch = "fdisk" >> >> GRUB_BOOTLOADER_INSTALL_amd64 = "grub-efi-amd64-bin" >> GRUB_BOOTLOADER_INSTALL_i386 = "grub-efi-ia32-bin" >> diff --git a/meta/conf/distro/debian-stretch.conf >> b/meta/conf/distro/debian-stretch.conf index e1b9394a..8b38fa54 100644 >> --- a/meta/conf/distro/debian-stretch.conf >> +++ b/meta/conf/distro/debian-stretch.conf >> @@ -12,4 +12,6 @@ DISTRO_KERNELS ?= "4kc-malta 586 5kc-malta 686 >> 686-pae amd64 arm64 armmp \ armmp-lpae kirkwood loongson-3 marvell >> octeon orion5x powerpc64le \ rt-686-pae rt-amd64 s390x" >> >> -IMAGE_PREINSTALL += "init" >> +WIC_IMAGER_INSTALL += "python3" >> +WIC_IMAGER_INSTALL_remove = "fdisk" >> +WIC_IMAGER_INSTALL_remove = "python3-distutils" > -- Siemens AG, Technology Competence Center Embedded Linux