From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7073380206728183808 X-Received: by 2002:a05:651c:1544:b0:248:39d:207f with SMTP id y4-20020a05651c154400b00248039d207fmr2303349ljp.151.1646899666715; Thu, 10 Mar 2022 00:07:46 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:1693:b0:448:3742:2320 with SMTP id bu19-20020a056512169300b0044837422320ls3345158lfb.1.gmail; Thu, 10 Mar 2022 00:07:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJy2waNYL8icLrDCveIou/y/HSQBMhT0ZNsJjMV0cLpDepoKOH+9kEldEfx8HWwMz21EC+Vu X-Received: by 2002:a05:6512:3c92:b0:448:5062:268 with SMTP id h18-20020a0565123c9200b0044850620268mr2381122lfv.84.1646899665610; Thu, 10 Mar 2022 00:07:45 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1646899665; cv=pass; d=google.com; s=arc-20160816; b=CZAwilWUChmjk8k79jDXVmad+U0ox7hjE83aukQFCpxwPFU/+95S10yrGn0iysfk9x lKiC3mE37dEBkHHsWzMiXMVJHeCagTOyIeb+yWFjjNB+Cc/KQQ2sN1byAjp/4HahyrZh X+g7Yr4eixNUozwEs0vHmP/HoX1p80n5F8uIRcNQjUKd9ZBsjuGLIZKU6ttT2Mkh1/uT 41czaentY1vzLgxCD/AckAnqf5KocQ3x11fE4y1H2fd1uDa4dMC4W2vD0K2gHgnFwPfI Q89m1ktTf+xhZIRDbhByk8dka4WtlynOCOX+3niHHci3M5JDi4/ZFmPA0S2vX6kZe6Nt AC3A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:cc:to:content-language:subject:from :user-agent:mime-version:date:message-id:dkim-signature; bh=0LkucDkdXhXZpBp64RapXMJghfdeFjJuP9VryIwcdDY=; b=LyxZ+40yr7ajEjLpAu21GRwibeZX6h6ioFnQItjQOsqBCF4MC2surw+q6QLcs/dohs PWfZlejyejou9pPfIPzAFVicxEAK470fcPtvCYlD8XvGv3/rJAHCS2H5ZDJfefXIlQmg HEN2JbtmeWGaJBYS+OsmbqHlptrcI9ZP1oCJbeExK3qfuHNyERA8kHk3rG/yCmSWJrPG JDXjSrq0OE+yGvmxiVDMqUWO/WSMpdh8It5YoHw0oKnnAkgJwpru1mAS95kVTR0PmnBv KTJXDD7eOPas/nlA0Vlwhl9pgGWDdz/DKO9Ap/6QteQfdLXNLZTKY7rrKTBYqo/TTgjy Hc5Q== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=bRm8GNyr; 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:fe08::629 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-AM5-obe.outbound.protection.outlook.com (mail-am5eur03on0629.outbound.protection.outlook.com. [2a01:111:f400:fe08::629]) by gmr-mx.google.com with ESMTPS id x40-20020a056512132800b0044827fbbd47si163634lfu.9.2022.03.10.00.07.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Mar 2022 00:07:45 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe08::629 as permitted sender) client-ip=2a01:111:f400:fe08::629; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=bRm8GNyr; 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:fe08::629 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=cUqrTVC+k+LRUtTz2N6xwbe04+HyeqrMmz5ljSUQWpeioquwGBb4PGEceoJuTYeBYzVmo+i6OsvaiBXU538FbRVDJRPEpi0taVjd/j92GYslJk86fEfbY93C3Ib/bddS809/h3+8lStSQgk9URKzy5QRG0xBNDSXINGszui+baQweqGwZqufJdP0TIbAah/+g0X2ygWevXECyUjJecEitizZaEDglO0igFE224A25fqzqtandFmoJCMxz7qrjU+CZ6U4N8owBWV8b/tkEkmSEZDUN2XtCqjGI/oEufJ37cuh3vm3MXaDMF1eMGnyMs5NhP+vEnf+21AU+JtY5S8hHg== 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=0LkucDkdXhXZpBp64RapXMJghfdeFjJuP9VryIwcdDY=; b=cWkL9374pYEQ/psNkyN4AA7TOtYUhOKTA+YemWiUkKYbfGuAESrZQUkkS5KnY+dRxN96R+5nHpNQJGfYkJ7VTZFzrU9z4DeDli/6ROaxD4PtI9YO5/EUEjN7luF2+hmfaSwq2It/L4AyoZaOgiYxYSMcOEezhBVhnt7Hvyj4QanogNvyUM/efkYpAEvYZXcymWLInp9/X8ntPc0CKCwHEeG6ZS5LTGFRjtUIB8fFhb/P6SZelEJTi4W2M4sNr2RBiu6YtpuNE2kY/U8RzAzc8L0Wj/XtwjOfsemAgCL4DNWYEeJBwG6224L7G+S0M/x/hCqA2xpshxP9bn76xC0XAQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.73) 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=0LkucDkdXhXZpBp64RapXMJghfdeFjJuP9VryIwcdDY=; b=bRm8GNyr0Pvf5aogTI8VyXTiuq+oVMQ2sA5t+xPT+/lGBMP53/kQlGa4HxWo0z58ghu23vuWFsDprEY7NHFSfFvHrZ+Yp6+4fGnwJsvI9NKKle8qCLVNzZwaNpedAqe8smqLR0I/1aiczsgQRWtjEmtkSbIXqGwWbGhi6eKZ1Gs+qd3RmkieBz1L/MbVRQnJhIH8Y5akPpSDtA21dHWpyl+YYODPBsi3PzMMlhJyRfaT1FVsNEOtLpaI7U5YSQnXoXjjGEYYkczHkMgnVxhpswfntdZc3sQ6HFDsKCq1pcfq7s+bzryj0el2Hkdj/zOz65Ivf5jQCqWJwpjQ+cNXRQ== Received: from SV0P279CA0062.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:14::13) by DB9PR10MB4361.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:1fd::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.21; Thu, 10 Mar 2022 08:07:44 +0000 Received: from HE1EUR01FT064.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:14:cafe::95) by SV0P279CA0062.outlook.office365.com (2603:10a6:f10:14::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.22 via Frontend Transport; Thu, 10 Mar 2022 08:07:44 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.73) 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.73 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.73; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.73) by HE1EUR01FT064.mail.protection.outlook.com (10.152.1.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5038.14 via Frontend Transport; Thu, 10 Mar 2022 08:07:42 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SNA.ad011.siemens.net (194.138.21.73) 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 09:07:40 +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 09:07:39 +0100 Message-ID: Date: Thu, 10 Mar 2022 09:07:39 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 From: Jan Kiszka Subject: [PATCH] meta: Consolidate more common bits of Debian distro configs Content-Language: en-US To: isar-users CC: Henning Schild 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: DEMCHDC89YA.ad011.siemens.net (139.25.226.104) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 80e2a9b5-d8d7-41d5-52c6-08da026d0da2 X-MS-TrafficTypeDiagnostic: DB9PR10MB4361: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: XTdfEMyqyKmdLGVmhZMFyhg7prDP5O+9BxlTTxqSZ+j4Octp6bc/Hh6czM0zBXmgP6YPWwltehpnuEMwgILRjTp/EdgiWRblMNWukqH3ZxE/QHQxbY6pYBcoUkIrhFQxsPuRLKZDEpJDo1v6kNYmBzisBUCGMgWzn6zPxw9usg1sFCH2mxbMUiBGU9tfI6rECApB0m1w2KTy3c/xe0R40/X8AUbQQXTVCiyClMX/MNUVS/tIXK5rD7HnOBFZRcUk6HcUQZU1h6U+nX/9Kf4DN54Yq76IIfo+WEWAtqULG3Ofd49tcF5b4Hlq+0ORXHpx9SRmDL020D+G8dozEeq+0NkPoYt0M2H3gN6oTxmULa8xmkgqMtrJuT7rniCCHuAmCWUM2C7R46TSgUcMTiZVUqxHwu5esSIwW3uPKRy6X9wER9uOKvL0c69Vy9nDxHThctrmChKw2JE2kCc4BR0gE7xKe/1tfys4ia8AGrAefh4wYqpsQde+PeV1dhAVdf5LO8mtFyV+I0lSHS4bLT132wSl0uNLHedcDb7PctdaeYXXLrr2YJPOtrUOlAwDgVAfxWQTVSr9b12CRmL/teRfD6ngy2V9+qPdgiqgH53/fgmtlQyBIgibEfdIurMdJaDsKUJrzmrcZovEKMatR6z0vCeyKwVUERD82B5Jer6rr3Yff4IldgpnZ/FFPafE3wJynQy1vvYS3ncDQa+/apJec+aZawVviORqK3iGzsuMHbeMMjmUCwxUl9ldb+VJ0nCEkf9TIwYbjC1DHSkkWgCNAQ== X-Forefront-Antispam-Report: CIP:194.138.21.73;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(36840700001)(40470700004)(46966006)(36860700001)(44832011)(82310400004)(2906002)(316002)(6706004)(6916009)(70586007)(70206006)(82960400001)(81166007)(356005)(4326008)(5660300002)(8676002)(31696002)(86362001)(508600001)(107886003)(16576012)(40460700003)(956004)(31686004)(8936002)(2616005)(47076005)(336012)(36756003)(83380400001)(16526019)(186003)(26005)(3940600001)(43740500002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2022 08:07:42.6810 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 80e2a9b5-d8d7-41d5-52c6-08da026d0da2 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.73];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT064.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR10MB4361 X-TUID: g1hGakj5pLxK 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" - -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" -- 2.34.1