summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2016-12-14 13:51:37 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-06 10:13:55 +0000
commita57b91883d3256ebda15f141e13c25ef936891d2 (patch)
treeda030b90f3c36fca9ab3bc3f05a224e1a2b2404e
parent09970d39b1d6870eb6e194343a5c0b318086b3d9 (diff)
downloadpoky-a57b91883d3256ebda15f141e13c25ef936891d2.tar.gz
initscripts: rrecommend initscripts-functions
In order to make that the default provider for initd-functions. [YOCTO #10944] (From OE-Core rev: 8401db8eb3beca12fd76da2448f99a61c3383a33) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> (cherry picked from commit d32eaebed5726c6157a2ac993baeb6d16683ade7) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/initscripts/initscripts_1.0.bb2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index 1167735756..91eea4b8c2 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -50,6 +50,8 @@ PACKAGES =+ "${PN}-functions ${PN}-sushell"
50RDEPENDS_${PN} = "initd-functions \ 50RDEPENDS_${PN} = "initd-functions \
51 ${@bb.utils.contains('DISTRO_FEATURES','selinux','${PN}-sushell','',d)} \ 51 ${@bb.utils.contains('DISTRO_FEATURES','selinux','${PN}-sushell','',d)} \
52 " 52 "
53# Recommend pn-functions so that it will be a preferred default provider for initd-functions
54RRECOMMENDS_${PN} = "${PN}-functions"
53RPROVIDES_${PN}-functions = "initd-functions" 55RPROVIDES_${PN}-functions = "initd-functions"
54RCONFLICTS_${PN}-functions = "lsbinitscripts" 56RCONFLICTS_${PN}-functions = "lsbinitscripts"
55FILES_${PN}-functions = "${sysconfdir}/init.d/functions*" 57FILES_${PN}-functions = "${sysconfdir}/init.d/functions*"