From: Peter Marko <[email protected]> VIRTUAL-RUNTIME_keymaps is defined in busybox init manager and also in some package groups. Defining distro features in recipes is wrong. Also this is not directly related to init manager. So move all these definitions to default-providers.inc
Signed-off-by: Peter Marko <[email protected]> --- v2: moved VIRTUAL-RUNTIME_keymaps to default-providers.inc v3: no change meta/conf/distro/include/default-providers.inc | 1 + meta/conf/distro/include/init-manager-mdev-busybox.inc | 1 - meta/recipes-core/packagegroups/packagegroup-base.bb | 3 --- meta/recipes-core/packagegroups/packagegroup-core-boot.bb | 3 --- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index b32c4e0d25..506d77811f 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -29,6 +29,7 @@ VIRTUAL-RUNTIME_getopt ?= "util-linux-getopt" VIRTUAL-RUNTIME_base-utils ?= "busybox" VIRTUAL-RUNTIME_base-utils-hwclock ?= "busybox-hwclock" VIRTUAL-RUNTIME_base-utils-syslog ?= "busybox-syslog" +VIRTUAL-RUNTIME_keymaps ?= "keymaps" # # Default recipe providers diff --git a/meta/conf/distro/include/init-manager-mdev-busybox.inc b/meta/conf/distro/include/init-manager-mdev-busybox.inc index 12091cba68..d9b05e1781 100644 --- a/meta/conf/distro/include/init-manager-mdev-busybox.inc +++ b/meta/conf/distro/include/init-manager-mdev-busybox.inc @@ -3,5 +3,4 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " systemd sysvinit" VIRTUAL-RUNTIME_dev_manager ??= "busybox-mdev" VIRTUAL-RUNTIME_init_manager ??= "busybox" VIRTUAL-RUNTIME_initscripts ??= "initscripts" -VIRTUAL-RUNTIME_keymaps ??= "keymaps" VIRTUAL-RUNTIME_login_manager ??= "busybox" 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 (#207960): https://lists.openembedded.org/g/openembedded-core/message/207960 Mute This Topic: https://lists.openembedded.org/mt/109811744/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
