summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/init-manager-none.inc1
-rw-r--r--meta/conf/distro/include/init-manager-sysvinit.inc1
-rw-r--r--meta/recipes-core/images/core-image-tiny-initramfs.bb3
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-boot.bb1
4 files changed, 5 insertions, 1 deletions
diff --git a/meta/conf/distro/include/init-manager-none.inc b/meta/conf/distro/include/init-manager-none.inc
index bbedf898f7..6ece5c9906 100644
--- a/meta/conf/distro/include/init-manager-none.inc
+++ b/meta/conf/distro/include/init-manager-none.inc
@@ -1,3 +1,4 @@
1VIRTUAL-RUNTIME_init_manager ??= "sysvinit" 1VIRTUAL-RUNTIME_init_manager ??= "sysvinit"
2VIRTUAL-RUNTIME_initscripts ??= "initscripts" 2VIRTUAL-RUNTIME_initscripts ??= "initscripts"
3VIRTUAL-RUNTIME_login_manager ??= "busybox" 3VIRTUAL-RUNTIME_login_manager ??= "busybox"
4VIRTUAL-RUNTIME_dev_manager ??= "udev"
diff --git a/meta/conf/distro/include/init-manager-sysvinit.inc b/meta/conf/distro/include/init-manager-sysvinit.inc
index aa2393944d..e2d17b358d 100644
--- a/meta/conf/distro/include/init-manager-sysvinit.inc
+++ b/meta/conf/distro/include/init-manager-sysvinit.inc
@@ -4,3 +4,4 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " systemd"
4VIRTUAL-RUNTIME_init_manager ??= "sysvinit" 4VIRTUAL-RUNTIME_init_manager ??= "sysvinit"
5VIRTUAL-RUNTIME_initscripts ??= "initscripts" 5VIRTUAL-RUNTIME_initscripts ??= "initscripts"
6VIRTUAL-RUNTIME_login_manager ??= "busybox" 6VIRTUAL-RUNTIME_login_manager ??= "busybox"
7VIRTUAL-RUNTIME_dev_manager ??= "udev"
diff --git a/meta/recipes-core/images/core-image-tiny-initramfs.bb b/meta/recipes-core/images/core-image-tiny-initramfs.bb
index 7a71d55b1e..c2aa68c788 100644
--- a/meta/recipes-core/images/core-image-tiny-initramfs.bb
+++ b/meta/recipes-core/images/core-image-tiny-initramfs.bb
@@ -6,6 +6,9 @@ first 'init' program more efficiently. core-image-tiny-initramfs doesn't \
6actually generate an image but rather generates boot and rootfs artifacts \ 6actually generate an image but rather generates boot and rootfs artifacts \
7that can subsequently be picked up by external image generation tools such as wic." 7that can subsequently be picked up by external image generation tools such as wic."
8 8
9# if distro does not override VIRTUAL-RUNTIME_dev_manager and default in different, busybox is compiled without mdev support
10# however this keeps the image small by not installing heavy-weight manager and in initramfs it may not even be necessary
11# override in distro if needed
9VIRTUAL-RUNTIME_dev_manager ?= "busybox-mdev" 12VIRTUAL-RUNTIME_dev_manager ?= "busybox-mdev"
10 13
11PACKAGE_INSTALL = "initramfs-live-boot-tiny packagegroup-core-boot dropbear ${VIRTUAL-RUNTIME_base-utils} ${VIRTUAL-RUNTIME_dev_manager} base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}" 14PACKAGE_INSTALL = "initramfs-live-boot-tiny packagegroup-core-boot dropbear ${VIRTUAL-RUNTIME_base-utils} ${VIRTUAL-RUNTIME_dev_manager} base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
index fecc3334ea..fa06092e27 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
@@ -10,7 +10,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
10inherit packagegroup 10inherit packagegroup
11 11
12# Distro can override the following VIRTUAL-RUNTIME providers: 12# Distro can override the following VIRTUAL-RUNTIME providers:
13VIRTUAL-RUNTIME_dev_manager ?= "udev"
14VIRTUAL-RUNTIME_keymaps ?= "keymaps" 13VIRTUAL-RUNTIME_keymaps ?= "keymaps"
15 14
16EFI_PROVIDER ??= "grub-efi" 15EFI_PROVIDER ??= "grub-efi"