From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7073380206728183808 X-Received: by 2002:a05:6512:1690:b0:448:2372:3e3e with SMTP id bu16-20020a056512169000b0044823723e3emr2293933lfb.324.1646899947581; Thu, 10 Mar 2022 00:12:27 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:1693:b0:448:3742:2320 with SMTP id bu19-20020a056512169300b0044837422320ls3354173lfb.1.gmail; Thu, 10 Mar 2022 00:12:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJyHzW7UyeqnNwGwOEWHmsCV05lnrOJoJ++UO0z7tp14l/eZU5G3nFrmXMC4w4ApR+TXKgaH X-Received: by 2002:ac2:5a0e:0:b0:448:2e86:9c0e with SMTP id q14-20020ac25a0e000000b004482e869c0emr2200213lfn.423.1646899946720; Thu, 10 Mar 2022 00:12:26 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1646899946; cv=pass; d=google.com; s=arc-20160816; b=YdTKjP5MQLblecgexTypUjMfneYPcXe5/NrTwDiupB2zx62yS8fpXE9DTVtlABXAxP EvffiU1ESO69ulAwL8u0J8pT6jIiaaakkfbnvnb4EXP+72h54rYkXeDejDvbzV7Ms6As 6doiQJNGnnzJ0EMsi6ksHyOU4FnprAhysppNfnMAXkcen17KeLFWH8G4IFp8Q+t59ncH aa2wLaq9VaUaulchVNKvMRnn7UMCMrrVqCmwe1jLHDj/cMVlvH2zCYjeJRQsRC2auWFr 0xW0zhObkOSOXv0Seyq9jwH3t7TQLKhzLR1sjx6I62xVPe28XNrDLhzVeZ6kKN1WgD8A u8Fw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:subject:cc:to:from:date:dkim-signature; bh=n7wNOzjNdvczQ4i2k+eUsoVU5ba+YvLQQo+QjLFsZYk=; b=Kk1z5beIweNRJjpdFnfGLVXIOoYLEFZUun7h8jznIvsWPZ3h05TKz4vfadeCQkbM2+ 1P5JkO5ec7R5bwxup1Kz166q4lEjDCq06llE36mbJxwYwBckkE3gKp86bc5TdYNc9cte PqWajLO86ffLN8FtdJUx3/lT8PHCoyiki/WJ9iphn5BpWXOIhZV1ApJAm0TtzwAACdka 0uErAkFF2Gv6q1fp5RZ+jfiT/9BjN4yWDJZd0f8RT14hvtmcB8hyWRBcUIyPULsWZ/pv SIRG16UXXFxc8aDnadBRPnkHiSu4Nk8RTf0kpAcEor4yewB/MPcgPN8csW1rctAxnug4 wb3A== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Qn6olZR0; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0d::60a as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on060a.outbound.protection.outlook.com. [2a01:111:f400:fe0d::60a]) by gmr-mx.google.com with ESMTPS id bu30-20020a056512169e00b0044842a98a98si247212lfb.2.2022.03.10.00.12.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Mar 2022 00:12:26 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0d::60a as permitted sender) client-ip=2a01:111:f400:fe0d::60a; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Qn6olZR0; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0d::60a as permitted sender) smtp.mailfrom=henning.schild@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=atSK9GRgIcTSwNSBDj6uMy5holUJfliUOmMK0Z5waJLl6p6vhPYR1XLKxXx7L8AMyKZpFq3whSwrvamIZjC9+pg9RC/DppUS3jcSMVP4Z+x4+YsROY43n1x2MZQFZ4w8I+WoX5X0yJDGSW2BNvBANCb0Mbf7Bw/p7qC0obFAQHPleFZWfoeEmvrUmzG2cmxkj4l4X7yD0TvI0y2NIhSuImi5cT8BHafNNv9TjZD4j/YXRnjXW1YAbEd6e9xavqiPIp1k1fo16yoeEktaj6brM+Snd57CKKxTWS/cwPJafDgWn43jSfY5Z/rHS4iU7BWp9w8xvqqeTGqpZylzOjHJdw== 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=n7wNOzjNdvczQ4i2k+eUsoVU5ba+YvLQQo+QjLFsZYk=; b=lhIjJ4rwk2A/unKzQxNmsYzLmQeUuuQHrsxYSxVRporcwN4UuPycF8EWgh8NvgaX9wACzW4508Iq9RmKmE2eGB1CCQ0Qdt2bEgYxNRKK5Gj5jZ8b+kRyTtEwREMbBsoEKms+/4r3WKFHTdBKSC1GQoGWR54/9VqYN9RMM01VOkrk2TuR1xvigIEWwiByS069CN8J0C8GzzNFwmO2rrHKarXIrF3nbKS0ZjYa/ph5ohi2ftMU/kU1NHegBo7jU4lJAKd492lwWV28G2hRrSXoolEcOe9Wob3gBzEsA4mfNmPJGB5K6YkhkL50aI5JbDbDe/JAW4IYItbtgyACCnTZlg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; 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=n7wNOzjNdvczQ4i2k+eUsoVU5ba+YvLQQo+QjLFsZYk=; b=Qn6olZR0DXhQg5gmtqkFjGERGHplaotDDpZMHryrwLU1zAQMFEJ17I6JhaUu7gmXB8KuVdUBjAliHWDjVyB1QwuwrhDbyhEG+bF9RGJFDZmZUF1lHRz4xDONZkMulxz/SmbeENjELOPye+slB7R2Ef5kAUZOHN5v/QwTvKm8ocjCBOXaTU1lzqH6ZST6y0mFfgxh+fQlSOG6kwHPzcYFQPWlSn/hk6O8Y8Uzu7mBfVUGca9uM3EZjCi3aJog9iOmMXECv4ud4CIMQ6203Z/WATskGgJhPNbJZPNiCTVPMD4JTG12M7vTya0AN3mfphkPa7CJn5v7UFPFrI3LDqUzLQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:155::20) by PAXPR10MB4799.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:156::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.22; Thu, 10 Mar 2022 08:12:25 +0000 Received: from AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM ([fe80::d433:79c4:958b:1551]) by AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM ([fe80::d433:79c4:958b:1551%7]) with mapi id 15.20.5061.022; Thu, 10 Mar 2022 08:12:25 +0000 Date: Thu, 10 Mar 2022 09:12:21 +0100 From: Henning Schild To: Jan Kiszka Cc: isar-users Subject: Re: [PATCH] meta: Consolidate more common bits of Debian distro configs Message-ID: <20220310091221.54d0e5ca@md1za8fc.ad001.siemens.net> In-Reply-To: References: X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-ClientProxiedBy: AM6PR01CA0069.eurprd01.prod.exchangelabs.com (2603:10a6:20b:e0::46) To AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:155::20) Return-Path: henning.schild@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ecc4cf99-f088-4d86-3369-08da026db5a3 X-MS-TrafficTypeDiagnostic: PAXPR10MB4799:EE_ X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr 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: 6v/r2ybbuQhHQdQcNKGGbst5uTUJhXSH2k9aja23arWXFixfADw49lZtZ1/t0wfJ4TSePR6oFz/SBkhlJNjXrkubCs9/aGmIpx5xmUV3PlORDC7iMajop/p4JZ9SBceUCKadtOmc4ZI3axK5BUECxO8gMilwS1a1ZeTgRMNqNUqN7j7PtjVL0gg/Y2IH884ChN5Zn847DsGB4lUZhyAxduh1pr0PExoQ310zEf5sabVC8RQD+qvLocy+FFpm3bbrFZDe93w9SCFFaUc35W2OWAf2PknVN6Uof8M8DsL3T+NdtpkKReUSUDIqKBBaHQvKdhTcSMm74/y0WHrLedTFh0iSWSc5om36PL8IjsfDlgB3KPxPYsXbpHfc4WXIXnqPNkDnHWURBjbNwJToJIX4hcpMHxZdQXzvJ1Q40xvhydAGKHXiPpsJr8Kxzj/6OWqpBU2NAPQI/hv76QIG0PumPrz08BVFPStCY3Ccft6hvPYKD/lzLiCRmQZrnZ3ioIQJRHbuQy2uQCwj/3V2xMH+DFezRwprtHt8+GxpGdqAMdMleE7wLMu0Mq21524Y5+67r3cvKvyPnr1rtcUOHCrkJJ1wGqypbZbl8g2gcnFRONumcTjqvMfw11N2xTzWCg5Xh6b2m1n8kCO26vghcBbQoA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(83380400001)(6512007)(9686003)(6486002)(44832011)(1076003)(5660300002)(2906002)(186003)(8936002)(38100700002)(82960400001)(86362001)(508600001)(66556008)(6862004)(4326008)(8676002)(66476007)(66946007)(6666004)(316002)(6636002)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?XC6DDBbL7yT3Le9BKEf2/GfWFPFxjl6YFWBzlp6l3aka6bvsk/fBkvd5X6YF?= =?us-ascii?Q?uO8S5A6BeBFp3+20vYsoFdoqarldMSuQlmgCWPFCQlU1uG8FpBzYVTB40RO0?= =?us-ascii?Q?WzDTYHWmezFlJmsdS8vRRiMAa+eoVAz1a2izgv2Iz2wDKKT6OuAIXhHeY2ig?= =?us-ascii?Q?op8szc1+6xjh7wXzFcQ5d/kIeeKBz4j6mobiici9mkUDd6VnWGamq93xdqHN?= =?us-ascii?Q?rQI75Kwnqs+3A5oYX9KWGP+vATd9NBUKzXsCzzUuD1dwXJq/C6AtbjYuq9Q7?= =?us-ascii?Q?bVakcj1iQK+rGUHEvbkp6RphcwQtN0R5bDgmLOcrrcxh6BHJxuiL+YI1EuIB?= =?us-ascii?Q?Ox/wjtRFqiSKnpuON1TRLualP2Gt/oz02b3Pqy2XW9+SxNxe2F8JExt8gMEK?= =?us-ascii?Q?NNhkWxyJ+ABnFOV6iNqHxVvkgaWhEvPzXYf6+zySL5PlIdbZHzybyown5592?= =?us-ascii?Q?tYZ9OZ9NF3v3OD4e2+cvesApU3xgYhc7+mUrVmJABzrANfRBA7z5hE3V38NQ?= =?us-ascii?Q?fF1o1IhdCpdUiTg7Z01VVwUZQBfp7Ajif1KsVm2JhwWjjUJYyW9tjRhjZKJ1?= =?us-ascii?Q?i3z31DcTKaQconul2LN+ECEuh2L55pr7ndwNiikdXCnIDE3Ksb1dxU8GLJpj?= =?us-ascii?Q?w7hRMlWFIUYNFsmVp1TKnobnRAxEuSkzintUtM29yzn0akWNWKxuNe22BI3/?= =?us-ascii?Q?Letp4I18W6ky2lqIo6nE5RnaUvFVJG+q9EdhAxiFgGBrzB4LsfAeVSB+TLU1?= =?us-ascii?Q?+S9O5RrNV6FE7fEGqZkxES7/qcONocDolRaQX45X7kq3NxSl75iE3mm6DySb?= =?us-ascii?Q?TSeVg5TOXljPzWBvJa4J7bUotZOSiI/GR+bLVdL6/bI4F4bTREbfrOy9KXvi?= =?us-ascii?Q?DOm3XVoERwid1JdTnZseAIze4S6ASO9Zhwml8qUJWpToGLRRIVFOtDDyLo60?= =?us-ascii?Q?6Y+AFMVnEuqWdXsXmsXMoDMsmNRyfLcOEWiXCGqq3KniEYmqd9aqcl0W4q/E?= =?us-ascii?Q?SfVx0V2gez/o851dQ3R3iYS/KkQjeQ+YlWARXprHPqUro55Q6zmlv2857RSu?= =?us-ascii?Q?nC88UpjYwiOLWB5bfF4DLafNXlvIYcmrGAsHOQ0MMlf2y1rcjAXIYL6LbXuW?= =?us-ascii?Q?PMWMjiGxR4VgnTVFtUbLOYyAQR6IVrQXqR1LfoHPNBSNaeTZuXkS/Km1xyUS?= =?us-ascii?Q?iEgIa6z5HJyqQ9XcABlGmvNUsr5pCca11cu1JJhDLJEm+UZF6GD3CFCLDuPz?= =?us-ascii?Q?1yB9FpapzpK+IMBPhGnEzsGrqKbPseTEbbR3ixflk+bBLpW00uqVbMZNAUsj?= =?us-ascii?Q?yFpsp3v7vzY7xln52s3JykKpy2wlb+4csyU6C3cNDK3cNjTKhUTG1+64/6WC?= =?us-ascii?Q?Is0zk/tDxu6YgEla3K4H8Oo8JS2BcCehKykz3Ptd9T3s051+pxLOsA5+cO/y?= =?us-ascii?Q?FX712GMF9JFXhnZz0pQuSj9wspT3r1Re4xpSxQntxcceNjlpK5fbwgn3mA5A?= =?us-ascii?Q?hkc9FG+tXscY9VCVKaIesaQES+MkmXWmbF2z+td0y/FaTxiuINBQJPo+sw?= =?us-ascii?Q?=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: ecc4cf99-f088-4d86-3369-08da026db5a3 X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2022 08:12:24.9814 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: +fFr3tGEJx/B6MgFdZPzoKkkCLxWXe798F1Pe8diDrZQvy9hUN0ZS5w9JY4LeYLxYq0puFAghfSl0VMl2bDNSFVuTHKaje/5QBX90Swbdpg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR10MB4799 X-TUID: L2c+YXsAfotS 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. 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"