]> code.ossystems Code Review - openembedded-core.git/commitdiff
lsbinitscripts: don't use update-alternatives
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>
Wed, 7 Dec 2016 10:25:35 +0000 (12:25 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 2 Dec 2017 11:24:36 +0000 (11:24 +0000)
Make lsbinitscripts (r)conflict with initscripts-functions package.

[YOCTO #10944]

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
meta/recipes-extended/lsb/lsbinitscripts_9.72.bb

index f1b53feef31a74427ff62bcd78fe30e5d8595bb9..2d74a6f9d3bfbb6adc32af5ede62a9aae4399ae2 100644 (file)
@@ -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"