aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2016-12-07 12:25:35 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-02 11:24:36 +0000
commit1202307b24def6cb7e6ebc92b47736e42d32cbb6 (patch)
tree056d81473589ec0080afa5298f0a39ccc622ee1c
parentcdcebd81c872cb7386c658998e27cf24e1d0447c (diff)
downloadopenembedded-core-1202307b24def6cb7e6ebc92b47736e42d32cbb6.zip
openembedded-core-1202307b24def6cb7e6ebc92b47736e42d32cbb6.tar.gz
openembedded-core-1202307b24def6cb7e6ebc92b47736e42d32cbb6.tar.bz2
lsbinitscripts: don't use update-alternatives
Make lsbinitscripts (r)conflict with initscripts-functions package. [YOCTO #10944] Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
-rw-r--r--meta/recipes-extended/lsb/lsbinitscripts_9.72.bb8
1 files changed, 2 insertions, 6 deletions
diff --git a/meta/recipes-extended/lsb/lsbinitscripts_9.72.bb b/meta/recipes-extended/lsb/lsbinitscripts_9.72.bb
index f1b53fe..2d74a6f 100644
--- a/meta/recipes-extended/lsb/lsbinitscripts_9.72.bb
+++ b/meta/recipes-extended/lsb/lsbinitscripts_9.72.bb
@@ -4,7 +4,9 @@ SECTION = "base"
LICENSE = "GPLv2"
DEPENDS = "popt glib-2.0"
+RPROVIDES_${PN} += "initd-functions"
RDEPENDS_${PN} += "util-linux"
+RCONFLICTS_${PN} = "initscripts-functions"
LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6"
@@ -17,12 +19,6 @@ SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-${PV}
SRC_URI[md5sum] = "d6c798f40dceb117e12126d94cb25a9a"
SRC_URI[sha256sum] = "1793677bdd1f7ee4cb00878ce43346196374f848a4c8e4559e086040fc7487db"
-inherit update-alternatives
-
-ALTERNATIVE_PRIORITY = "100"
-ALTERNATIVE_${PN} = "functions"
-ALTERNATIVE_LINK_NAME[functions] = "${sysconfdir}/init.d/functions"
-
# Since we are only taking the patched version of functions, no need to
# configure or compile anything so do not execute these
do_configure[noexec] = "1"