From: Jan Kiszka <jan.kiszka@siemens.com>
To: Henning Schild <henning.schild@siemens.com>
Cc: isar-users <isar-users@googlegroups.com>
Subject: Re: [PATCH] meta: Consolidate more common bits of Debian distro configs
Date: Thu, 10 Mar 2022 13:19:45 +0100 [thread overview]
Message-ID: <18253366-9000-0d65-49ed-f14223228d1a@siemens.com> (raw)
In-Reply-To: <20220310091221.54d0e5ca@md1za8fc.ad001.siemens.net>
On 10.03.22 09:12, Henning Schild wrote:
> Am Thu, 10 Mar 2022 09:07:39 +0100
> schrieb Jan Kiszka <jan.kiszka@siemens.com>:
>
>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>
>> 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 <jan.kiszka@siemens.com>
>> ---
>> 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
next prev parent reply other threads:[~2022-03-10 12:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-10 8:07 Jan Kiszka
2022-03-10 8:12 ` Henning Schild
2022-03-10 12:19 ` Jan Kiszka [this message]
2022-03-21 15:01 ` Anton Mikanovich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=18253366-9000-0d65-49ed-f14223228d1a@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=henning.schild@siemens.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox