diff options
Diffstat (limited to 'meta-poky')
-rw-r--r-- | meta-poky/conf/distro/poky-altcfg.conf | 4 | ||||
-rw-r--r-- | meta-poky/conf/distro/poky-tiny.conf | 2 | ||||
-rw-r--r-- | meta-poky/conf/distro/poky.conf | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/meta-poky/conf/distro/poky-altcfg.conf b/meta-poky/conf/distro/poky-altcfg.conf index f03306e798..b6dbcad4ef 100644 --- a/meta-poky/conf/distro/poky-altcfg.conf +++ b/meta-poky/conf/distro/poky-altcfg.conf | |||
@@ -8,8 +8,8 @@ DISTRO = "poky-altcfg" | |||
8 | DISTROOVERRIDES = "poky:poky-altcfg" | 8 | DISTROOVERRIDES = "poky:poky-altcfg" |
9 | #DISTROOVERRIDES = "poky:linuxstdbase" | 9 | #DISTROOVERRIDES = "poky:linuxstdbase" |
10 | 10 | ||
11 | INIT_MANAGER:poky-altcfg = "systemd" | 11 | POKY_INIT_MANAGER:poky-altcfg = "systemd" |
12 | # systemd isn't suitable with musl | 12 | # systemd isn't suitable with musl |
13 | INIT_MANAGER:poky-altcfg:libc-musl = "sysvinit" | 13 | POKY_INIT_MANAGER:poky-altcfg:libc-musl = "sysvinit" |
14 | 14 | ||
15 | require conf/distro/include/poky-distro-alt-test-config.inc | 15 | require conf/distro/include/poky-distro-alt-test-config.inc |
diff --git a/meta-poky/conf/distro/poky-tiny.conf b/meta-poky/conf/distro/poky-tiny.conf index ce466e30b7..74f2fc7422 100644 --- a/meta-poky/conf/distro/poky-tiny.conf +++ b/meta-poky/conf/distro/poky-tiny.conf | |||
@@ -86,7 +86,7 @@ DISTRO_FEATURES:class-native = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO | |||
86 | DISTRO_FEATURES:class-nativesdk = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" | 86 | DISTRO_FEATURES:class-nativesdk = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" |
87 | 87 | ||
88 | # enable mdev/busybox for init | 88 | # enable mdev/busybox for init |
89 | INIT_MANAGER:poky-tiny = "mdev-busybox" | 89 | POKY_INIT_MANAGER:poky-tiny = "mdev-busybox" |
90 | 90 | ||
91 | # FIXME: Consider adding "modules" to MACHINE_FEATURES and using that in | 91 | # FIXME: Consider adding "modules" to MACHINE_FEATURES and using that in |
92 | # packagegroup-core-base to select modutils-initscripts or not. Similar with "net" and | 92 | # packagegroup-core-base to select modutils-initscripts or not. Similar with "net" and |
diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf index dc0e8e76ab..a7e07b248a 100644 --- a/meta-poky/conf/distro/poky.conf +++ b/meta-poky/conf/distro/poky.conf | |||
@@ -65,7 +65,8 @@ INHERIT += "uninative" | |||
65 | BB_SIGNATURE_HANDLER ?= "OEEquivHash" | 65 | BB_SIGNATURE_HANDLER ?= "OEEquivHash" |
66 | BB_HASHSERVE ??= "auto" | 66 | BB_HASHSERVE ??= "auto" |
67 | 67 | ||
68 | INIT_MANAGER = "sysvinit" | 68 | POKY_INIT_MANAGER = "sysvinit" |
69 | INIT_MANAGER ?= "${POKY_INIT_MANAGER}" | ||
69 | 70 | ||
70 | # We need debug symbols so that SPDX license manifests for the kernel work | 71 | # We need debug symbols so that SPDX license manifests for the kernel work |
71 | KERNEL_EXTRA_FEATURES:append = " features/debug/debug-kernel.scc" | 72 | KERNEL_EXTRA_FEATURES:append = " features/debug/debug-kernel.scc" |