]> code.ossystems Code Review - openembedded-core.git/commitdiff
bootchart2: Add ALTERNATIVE configuration for bootchartd
authorMing Liu <peter.x.liu@external.atlascopco.com>
Fri, 19 Aug 2016 09:18:13 +0000 (11:18 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 20 Aug 2016 15:05:28 +0000 (16:05 +0100)
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>

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb

index d039b1b94773e5c8142b5317fe5afae9243d0ac5..bc8c1a8a887e6c53e8affdd4643da445aa80b353 100644 (file)
@@ -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"