diff options
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/initscripts/initscripts_1.0.bb | 9 | ||||
-rw-r--r-- | meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index fea4f22e95..1167735756 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb | |||
@@ -43,21 +43,18 @@ SRC_URI_append_arm = " file://alignment.sh" | |||
43 | 43 | ||
44 | KERNEL_VERSION = "" | 44 | KERNEL_VERSION = "" |
45 | 45 | ||
46 | inherit update-alternatives | ||
47 | DEPENDS_append = " update-rc.d-native" | 46 | DEPENDS_append = " update-rc.d-native" |
48 | PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" | 47 | PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" |
49 | 48 | ||
50 | PACKAGES =+ "${PN}-functions ${PN}-sushell" | 49 | PACKAGES =+ "${PN}-functions ${PN}-sushell" |
51 | RDEPENDS_${PN} = "${PN}-functions \ | 50 | RDEPENDS_${PN} = "initd-functions \ |
52 | ${@bb.utils.contains('DISTRO_FEATURES','selinux','${PN}-sushell','',d)} \ | 51 | ${@bb.utils.contains('DISTRO_FEATURES','selinux','${PN}-sushell','',d)} \ |
53 | " | 52 | " |
53 | RPROVIDES_${PN}-functions = "initd-functions" | ||
54 | RCONFLICTS_${PN}-functions = "lsbinitscripts" | ||
54 | FILES_${PN}-functions = "${sysconfdir}/init.d/functions*" | 55 | FILES_${PN}-functions = "${sysconfdir}/init.d/functions*" |
55 | FILES_${PN}-sushell = "${base_sbindir}/sushell" | 56 | FILES_${PN}-sushell = "${base_sbindir}/sushell" |
56 | 57 | ||
57 | ALTERNATIVE_PRIORITY_${PN}-functions = "90" | ||
58 | ALTERNATIVE_${PN}-functions = "functions" | ||
59 | ALTERNATIVE_LINK_NAME[functions] = "${sysconfdir}/init.d/functions" | ||
60 | |||
61 | HALTARGS ?= "-d -f" | 58 | HALTARGS ?= "-d -f" |
62 | 59 | ||
63 | do_configure() { | 60 | do_configure() { |
diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb index 884857a96d..22a0ecf839 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | |||
@@ -68,7 +68,7 @@ FILES_${PN} += "${base_sbindir}/* ${base_bindir}/*" | |||
68 | FILES_sysvinit-pidof = "${base_bindir}/pidof.sysvinit ${base_sbindir}/killall5" | 68 | FILES_sysvinit-pidof = "${base_bindir}/pidof.sysvinit ${base_sbindir}/killall5" |
69 | FILES_sysvinit-sulogin = "${base_sbindir}/sulogin.sysvinit" | 69 | FILES_sysvinit-sulogin = "${base_sbindir}/sulogin.sysvinit" |
70 | 70 | ||
71 | RDEPENDS_${PN} += "sysvinit-pidof initscripts-functions" | 71 | RDEPENDS_${PN} += "sysvinit-pidof initd-functions" |
72 | 72 | ||
73 | CFLAGS_prepend = "-D_GNU_SOURCE " | 73 | CFLAGS_prepend = "-D_GNU_SOURCE " |
74 | export LCRYPT = "-lcrypt" | 74 | export LCRYPT = "-lcrypt" |