diff options
author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2016-12-07 12:25:35 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-06 10:13:55 +0000 |
commit | 09970d39b1d6870eb6e194343a5c0b318086b3d9 (patch) | |
tree | 0869c3c247a5c0bf3ff76c98f169e062b15d5bd7 | |
parent | 61ed8ab4357c03a336850e67ddc05f942806310f (diff) | |
download | poky-09970d39b1d6870eb6e194343a5c0b318086b3d9.tar.gz |
lsbinitscripts: don't use update-alternatives
Make lsbinitscripts (r)conflict with initscripts-functions package.
[YOCTO #10944]
(From OE-Core rev: e0e8e162cf19bcdfa7d9daa0bb51c32beabbd048)
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
(cherry picked from commit 1202307b24def6cb7e6ebc92b47736e42d32cbb6)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/lsb/lsbinitscripts_9.72.bb | 8 |
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 f1b53feef3..2d74a6f9d3 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" | |||
4 | LICENSE = "GPLv2" | 4 | LICENSE = "GPLv2" |
5 | DEPENDS = "popt glib-2.0" | 5 | DEPENDS = "popt glib-2.0" |
6 | 6 | ||
7 | RPROVIDES_${PN} += "initd-functions" | ||
7 | RDEPENDS_${PN} += "util-linux" | 8 | RDEPENDS_${PN} += "util-linux" |
9 | RCONFLICTS_${PN} = "initscripts-functions" | ||
8 | 10 | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6" | 11 | LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6" |
10 | 12 | ||
@@ -17,12 +19,6 @@ SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-${PV} | |||
17 | SRC_URI[md5sum] = "d6c798f40dceb117e12126d94cb25a9a" | 19 | SRC_URI[md5sum] = "d6c798f40dceb117e12126d94cb25a9a" |
18 | SRC_URI[sha256sum] = "1793677bdd1f7ee4cb00878ce43346196374f848a4c8e4559e086040fc7487db" | 20 | SRC_URI[sha256sum] = "1793677bdd1f7ee4cb00878ce43346196374f848a4c8e4559e086040fc7487db" |
19 | 21 | ||
20 | inherit update-alternatives | ||
21 | |||
22 | ALTERNATIVE_PRIORITY = "100" | ||
23 | ALTERNATIVE_${PN} = "functions" | ||
24 | ALTERNATIVE_LINK_NAME[functions] = "${sysconfdir}/init.d/functions" | ||
25 | |||
26 | # Since we are only taking the patched version of functions, no need to | 22 | # Since we are only taking the patched version of functions, no need to |
27 | # configure or compile anything so do not execute these | 23 | # configure or compile anything so do not execute these |
28 | do_configure[noexec] = "1" | 24 | do_configure[noexec] = "1" |