-----Original Message-----
> From: openembedded-core@lists.openembedded.org
> <openembedded-core@lists.openembedded.org> On Behalf Of Peter Marko via
> lists.openembedded.org
> Sent: den 25 november 2024 19:37
> To: openembedded-core@lists.openembedded.org
> Cc: Peter Marko <peter.ma...@siemens.com>
> Subject: [OE-core][PATCH 2/2] init-manager: define VIRTUAL-RUNTIME_keymaps
> for all init managers
>
> From: Peter Marko <peter.ma...@siemens.com>
>
> VIRTUAL-RUNTIME_keymaps is defined in some init managers and also in
> some package groups. Defining distro features in recipes is wrong.
> Define it in all init managers instead.
How is keymaps related to whichever init manager is used?
Wouldn't it be better to remove it from init-manager-mdev-busybox.inc
and rely on the defaults in the packagegroups that use
${VIRTUAL-RUNTIME_keymaps}?
//Peter
>
> Signed-off-by: Peter Marko <peter.ma...@siemens.com>
> ---
> meta/conf/distro/include/init-manager-none.inc | 1 +
> meta/conf/distro/include/init-manager-systemd.inc | 1 +
> meta/conf/distro/include/init-manager-sysvinit.inc | 1 +
> meta/recipes-core/packagegroups/packagegroup-base.bb | 3 ---
> meta/recipes-core/packagegroups/packagegroup-core-boot.bb | 3 ---
> 5 files changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/meta/conf/distro/include/init-manager-none.inc
> b/meta/conf/distro/include/init-manager-none.inc
> index 6ece5c9906..3972e6d8aa 100644
> --- a/meta/conf/distro/include/init-manager-none.inc
> +++ b/meta/conf/distro/include/init-manager-none.inc
> @@ -2,3 +2,4 @@ VIRTUAL-RUNTIME_init_manager ??= "sysvinit"
> VIRTUAL-RUNTIME_initscripts ??= "initscripts"
> VIRTUAL-RUNTIME_login_manager ??= "busybox"
> VIRTUAL-RUNTIME_dev_manager ??= "udev"
> +VIRTUAL-RUNTIME_keymaps ?= "keymaps"
> diff --git a/meta/conf/distro/include/init-manager-systemd.inc
> b/meta/conf/distro/include/init-manager-systemd.inc
> index 0a76647459..8132135c25 100644
> --- a/meta/conf/distro/include/init-manager-systemd.inc
> +++ b/meta/conf/distro/include/init-manager-systemd.inc
> @@ -5,5 +5,6 @@ VIRTUAL-RUNTIME_init_manager ??= "systemd"
> VIRTUAL-RUNTIME_initscripts ??= "systemd-compat-units"
> VIRTUAL-RUNTIME_login_manager ??= "shadow-base"
> VIRTUAL-RUNTIME_dev_manager ??= "systemd"
> +VIRTUAL-RUNTIME_keymaps ?= "keymaps"
> # systemd hardcodes /root in its source codes, other values are not
> offically supported
> ROOT_HOME ?= "/root"
> diff --git a/meta/conf/distro/include/init-manager-sysvinit.inc
> b/meta/conf/distro/include/init-manager-sysvinit.inc
> index e2d17b358d..cfb3438632 100644
> --- a/meta/conf/distro/include/init-manager-sysvinit.inc
> +++ b/meta/conf/distro/include/init-manager-sysvinit.inc
> @@ -5,3 +5,4 @@ VIRTUAL-RUNTIME_init_manager ??= "sysvinit"
> VIRTUAL-RUNTIME_initscripts ??= "initscripts"
> VIRTUAL-RUNTIME_login_manager ??= "busybox"
> VIRTUAL-RUNTIME_dev_manager ??= "udev"
> +VIRTUAL-RUNTIME_keymaps ?= "keymaps"
> diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb
> b/meta/recipes-core/packagegroups/packagegroup-base.bb
> index 70a1035003..cb9d1f07af 100644
> --- a/meta/recipes-core/packagegroups/packagegroup-base.bb
> +++ b/meta/recipes-core/packagegroups/packagegroup-base.bb
> @@ -39,9 +39,6 @@ PACKAGES = ' \
> \
> '
>
> -# Override by distro if needed
> -VIRTUAL-RUNTIME_keymaps ?= "keymaps"
> -
> #
> # packagegroup-base contain stuff needed for base system (machine
> related)
> #
> diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
> b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
> index fa06092e27..5cdd161811 100644
> --- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
> +++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
> @@ -9,9 +9,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
>
> inherit packagegroup
>
> -# Distro can override the following VIRTUAL-RUNTIME providers:
> -VIRTUAL-RUNTIME_keymaps ?= "keymaps"
> -
> EFI_PROVIDER ??= "grub-efi"
>
> SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc',
> '${VIRTUAL-RUNTIME_base-utils-hwclock}', '', d)} \
> --
> 2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#207877):
https://lists.openembedded.org/g/openembedded-core/message/207877
Mute This Topic: https://lists.openembedded.org/mt/109776743/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
