diff options
Diffstat (limited to 'meta')
7 files changed, 25 insertions, 6 deletions
diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf index 20e61232e9..9b1ee20aaa 100644 --- a/meta/conf/distro/defaultsetup.conf +++ b/meta/conf/distro/defaultsetup.conf | |||
@@ -23,3 +23,6 @@ PACKAGE_CLASSES ?= "package_ipk" | |||
23 | INHERIT_BLACKLIST = "blacklist" | 23 | INHERIT_BLACKLIST = "blacklist" |
24 | INHERIT_DISTRO ?= "debian devshell sstate license remove-libtool" | 24 | INHERIT_DISTRO ?= "debian devshell sstate license remove-libtool" |
25 | INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} ${INHERIT_DISTRO} ${INHERIT_BLACKLIST}" | 25 | INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} ${INHERIT_DISTRO} ${INHERIT_BLACKLIST}" |
26 | |||
27 | INIT_MANAGER ??= "none" | ||
28 | require conf/distro/include/init-manager-${INIT_MANAGER}.inc | ||
diff --git a/meta/conf/distro/include/init-manager-mdev-busybox.inc b/meta/conf/distro/include/init-manager-mdev-busybox.inc new file mode 100644 index 0000000000..4e3be14a82 --- /dev/null +++ b/meta/conf/distro/include/init-manager-mdev-busybox.inc | |||
@@ -0,0 +1,7 @@ | |||
1 | # enable mdev/busybox for init | ||
2 | DISTRO_FEATURES_BACKFILL_CONSIDERED_append = " systemd sysvinit" | ||
3 | VIRTUAL-RUNTIME_dev_manager ??= "busybox-mdev" | ||
4 | VIRTUAL-RUNTIME_init_manager ??= "busybox" | ||
5 | VIRTUAL-RUNTIME_initscripts ??= "initscripts" | ||
6 | VIRTUAL-RUNTIME_keymaps ??= "keymaps" | ||
7 | VIRTUAL-RUNTIME_login_manager ??= "busybox" | ||
diff --git a/meta/conf/distro/include/init-manager-none.inc b/meta/conf/distro/include/init-manager-none.inc new file mode 100644 index 0000000000..bbedf898f7 --- /dev/null +++ b/meta/conf/distro/include/init-manager-none.inc | |||
@@ -0,0 +1,3 @@ | |||
1 | VIRTUAL-RUNTIME_init_manager ??= "sysvinit" | ||
2 | VIRTUAL-RUNTIME_initscripts ??= "initscripts" | ||
3 | VIRTUAL-RUNTIME_login_manager ??= "busybox" | ||
diff --git a/meta/conf/distro/include/init-manager-systemd.inc b/meta/conf/distro/include/init-manager-systemd.inc new file mode 100644 index 0000000000..1558b85250 --- /dev/null +++ b/meta/conf/distro/include/init-manager-systemd.inc | |||
@@ -0,0 +1,6 @@ | |||
1 | # Use systemd for system initialization | ||
2 | DISTRO_FEATURES_append = " systemd" | ||
3 | DISTRO_FEATURES_BACKFILL_CONSIDERED_append = " sysvinit" | ||
4 | VIRTUAL-RUNTIME_init_manager ??= "systemd" | ||
5 | VIRTUAL-RUNTIME_initscripts ??= "systemd-compat-units" | ||
6 | VIRTUAL-RUNTIME_login_manager ??= "shadow-base" | ||
diff --git a/meta/conf/distro/include/init-manager-sysvinit.inc b/meta/conf/distro/include/init-manager-sysvinit.inc new file mode 100644 index 0000000000..6b662d60bb --- /dev/null +++ b/meta/conf/distro/include/init-manager-sysvinit.inc | |||
@@ -0,0 +1,6 @@ | |||
1 | # Use sysvinit for system initialization | ||
2 | DISTRO_FEATURES_append = " sysvinit" | ||
3 | DISTRO_FEATURES_BACKFILL_CONSIDERED_append = " systemd" | ||
4 | VIRTUAL-RUNTIME_init_manager ??= "sysvinit" | ||
5 | VIRTUAL-RUNTIME_initscripts ??= "initscripts" | ||
6 | VIRTUAL-RUNTIME_login_manager ??= "busybox" | ||
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb index 8dc445dc8f..3a2f50febb 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb | |||
@@ -18,9 +18,6 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" | |||
18 | 18 | ||
19 | # Distro can override the following VIRTUAL-RUNTIME providers: | 19 | # Distro can override the following VIRTUAL-RUNTIME providers: |
20 | VIRTUAL-RUNTIME_dev_manager ?= "udev" | 20 | VIRTUAL-RUNTIME_dev_manager ?= "udev" |
21 | VIRTUAL-RUNTIME_login_manager ?= "busybox" | ||
22 | VIRTUAL-RUNTIME_init_manager ?= "sysvinit" | ||
23 | VIRTUAL-RUNTIME_initscripts ?= "initscripts" | ||
24 | VIRTUAL-RUNTIME_keymaps ?= "keymaps" | 21 | VIRTUAL-RUNTIME_keymaps ?= "keymaps" |
25 | 22 | ||
26 | EFI_PROVIDER ??= "grub-efi" | 23 | EFI_PROVIDER ??= "grub-efi" |
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb index d38f545e06..2d96d1ba38 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb | |||
@@ -111,9 +111,6 @@ RDEPENDS_packagegroup-core-full-cmdline-dev-utils = "\ | |||
111 | patch \ | 111 | patch \ |
112 | " | 112 | " |
113 | 113 | ||
114 | VIRTUAL-RUNTIME_initscripts ?= "initscripts" | ||
115 | VIRTUAL-RUNTIME_init_manager ?= "sysvinit" | ||
116 | VIRTUAL-RUNTIME_login_manager ?= "busybox" | ||
117 | VIRTUAL-RUNTIME_syslog ?= "sysklogd" | 114 | VIRTUAL-RUNTIME_syslog ?= "sysklogd" |
118 | RDEPENDS_packagegroup-core-full-cmdline-initscripts = "\ | 115 | RDEPENDS_packagegroup-core-full-cmdline-initscripts = "\ |
119 | ${VIRTUAL-RUNTIME_initscripts} \ | 116 | ${VIRTUAL-RUNTIME_initscripts} \ |