diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2016-12-07 12:08:25 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-02 11:24:36 +0000 |
| commit | cdcebd81c872cb7386c658998e27cf24e1d0447c (patch) | |
| tree | 2f0f0c129ea745985aa6bb759f4605be770cfef7 | |
| parent | 988aad01b20c18a8850db0ad6dc547525d94116c (diff) | |
| download | openembedded-core-cdcebd81c872cb7386c658998e27cf24e1d0447c.tar.gz openembedded-core-cdcebd81c872cb7386c658998e27cf24e1d0447c.tar.bz2 openembedded-core-cdcebd81c872cb7386c658998e27cf24e1d0447c.zip | |
initscripts: don't use update-alternatives
Stop using update-alternatives for managing /etc/init.d/functions. Also,
make the initscripts-functions subpackage to (runtime) conflict with
lsbinitscripts.
[YOCTO #10944]
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
| -rw-r--r-- | meta/classes/update-rc.d.bbclass | 3 | ||||
| -rw-r--r-- | meta/conf/distro/include/default-providers.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-core/initscripts/initscripts_1.0.bb | 9 | ||||
| -rw-r--r-- | meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 2 |
4 files changed, 6 insertions, 9 deletions
diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass index 9ba3daccaf..c3fefea5af 100644 --- a/meta/classes/update-rc.d.bbclass +++ b/meta/classes/update-rc.d.bbclass @@ -95,8 +95,7 @@ python populate_packages_updatercd () { return statement = "grep -q -w '/etc/init.d/functions' %s" % path if subprocess.call(statement, shell=True) == 0: - mlprefix = d.getVar('MLPREFIX') or "" - d.appendVar('RDEPENDS_' + pkg, ' %sinitscripts-functions' % (mlprefix)) + d.appendVar('RDEPENDS_' + pkg, ' initd-functions') def update_rcd_package(pkg): bb.debug(1, 'adding update-rc.d calls to preinst/postinst/prerm/postrm for %s' % pkg) diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index 3d7ef78d55..c1cc97fccc 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -54,3 +54,4 @@ PREFERRED_PROVIDER_nativesdk-openssl ?= "nativesdk-openssl" PREFERRED_PROVIDER_pkgconfig ?= "pkgconfig" PREFERRED_PROVIDER_nativesdk-pkgconfig ?= "nativesdk-pkgconfig" PREFERRED_PROVIDER_pkgconfig-native ?= "pkgconfig-native" +PREFERRED_RPROVIDER_initd-functions ?= "initscripts" 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" KERNEL_VERSION = "" -inherit update-alternatives DEPENDS_append = " update-rc.d-native" PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" PACKAGES =+ "${PN}-functions ${PN}-sushell" -RDEPENDS_${PN} = "${PN}-functions \ +RDEPENDS_${PN} = "initd-functions \ ${@bb.utils.contains('DISTRO_FEATURES','selinux','${PN}-sushell','',d)} \ " +RPROVIDES_${PN}-functions = "initd-functions" +RCONFLICTS_${PN}-functions = "lsbinitscripts" FILES_${PN}-functions = "${sysconfdir}/init.d/functions*" FILES_${PN}-sushell = "${base_sbindir}/sushell" -ALTERNATIVE_PRIORITY_${PN}-functions = "90" -ALTERNATIVE_${PN}-functions = "functions" -ALTERNATIVE_LINK_NAME[functions] = "${sysconfdir}/init.d/functions" - HALTARGS ?= "-d -f" 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}/*" FILES_sysvinit-pidof = "${base_bindir}/pidof.sysvinit ${base_sbindir}/killall5" FILES_sysvinit-sulogin = "${base_sbindir}/sulogin.sysvinit" -RDEPENDS_${PN} += "sysvinit-pidof initscripts-functions" +RDEPENDS_${PN} += "sysvinit-pidof initd-functions" CFLAGS_prepend = "-D_GNU_SOURCE " export LCRYPT = "-lcrypt" |