[gnome-continuous-yocto/gnomeostree-3.28-rocko: 23/218] lsbinitscripts: don't use update-alternatives



commit 09970d39b1d6870eb6e194343a5c0b318086b3d9
Author: Markus Lehtonen <markus lehtonen linux intel com>
Date:   Wed Dec 7 12:25:35 2016 +0200

    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>

 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 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" 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]