[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1991/8267] bootchart2: Add ALTERNATIVE configuration for bootchartd



commit e22dabab4d2cd0a1c80426c4880cf8838f73de17
Author: Ming Liu <peter x liu external atlascopco com>
Date:   Fri Aug 19 11:18:13 2016 +0200

    bootchart2: Add ALTERNATIVE configuration for bootchartd
    
    Since busybox also provides the bootchartd command use the
    update-alternatives mechanism to address this.
    
    Also let bootchartd-stop-initscript RDEPENDS on bootchart2, since
    /sbin/bootchartd is being called in that script.
    
    Ming Liu <peter x liu external atlascopco com>
    
    (From OE-Core rev: 4c4f440d3a8eb6171f619bceacf57835d1b9841a)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../bootchart2/bootchart2_0.14.8.bb                |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb 
b/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb
index d039b1b..bc8c1a8 100644
--- a/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb
+++ b/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb
@@ -97,9 +97,11 @@ SRC_URI = "git://github.com/mmeeks/bootchart.git \
 S = "${WORKDIR}/git"
 SRCREV = "48e0071048564c6af75ab969e842d6dec808da09"
 
-inherit systemd
-inherit update-rc.d
-inherit python3native
+inherit systemd update-rc.d python3native update-alternatives
+
+ALTERNATIVE_${PN} = "bootchartd"
+ALTERNATIVE_LINK_NAME[bootchartd] = "${base_sbindir}/bootchartd"
+ALTERNATIVE_PRIORITY = "100"
 
 # The only reason to build bootchart2-native is for a native pybootchartgui.
 BBCLASSEXTEND = "native"
@@ -142,6 +144,7 @@ DEPENDS_append_class-native = " python3-pycairo-native"
 
 PACKAGES =+ "bootchartd-stop-initscript"
 FILES_bootchartd-stop-initscript += "${sysconfdir}/init.d ${sysconfdir}/rc*.d"
+RDEPENDS_bootchartd-stop-initscript = "${PN}"
 
 FILES_${PN} += "${base_libdir}/bootchart/bootchart-collector"
 FILES_${PN} += "${base_libdir}/bootchart/tmpfs"


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