diff options
author | Ming Liu <peter.x.liu@external.atlascopco.com> | 2016-08-19 11:18:13 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-20 16:06:03 +0100 |
commit | e22dabab4d2cd0a1c80426c4880cf8838f73de17 (patch) | |
tree | e3dd1aa0b4e811e1a76da065cf2d1245824bb75b /meta | |
parent | 0c9f39cc8f92ccf30209115e1ccf46220c018388 (diff) | |
download | poky-e22dabab4d2cd0a1c80426c4880cf8838f73de17.tar.gz |
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>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/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 d039b1b947..bc8c1a8a88 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 \ | |||
97 | S = "${WORKDIR}/git" | 97 | S = "${WORKDIR}/git" |
98 | SRCREV = "48e0071048564c6af75ab969e842d6dec808da09" | 98 | SRCREV = "48e0071048564c6af75ab969e842d6dec808da09" |
99 | 99 | ||
100 | inherit systemd | 100 | inherit systemd update-rc.d python3native update-alternatives |
101 | inherit update-rc.d | 101 | |
102 | inherit python3native | 102 | ALTERNATIVE_${PN} = "bootchartd" |
103 | ALTERNATIVE_LINK_NAME[bootchartd] = "${base_sbindir}/bootchartd" | ||
104 | ALTERNATIVE_PRIORITY = "100" | ||
103 | 105 | ||
104 | # The only reason to build bootchart2-native is for a native pybootchartgui. | 106 | # The only reason to build bootchart2-native is for a native pybootchartgui. |
105 | BBCLASSEXTEND = "native" | 107 | BBCLASSEXTEND = "native" |
@@ -142,6 +144,7 @@ DEPENDS_append_class-native = " python3-pycairo-native" | |||
142 | 144 | ||
143 | PACKAGES =+ "bootchartd-stop-initscript" | 145 | PACKAGES =+ "bootchartd-stop-initscript" |
144 | FILES_bootchartd-stop-initscript += "${sysconfdir}/init.d ${sysconfdir}/rc*.d" | 146 | FILES_bootchartd-stop-initscript += "${sysconfdir}/init.d ${sysconfdir}/rc*.d" |
147 | RDEPENDS_bootchartd-stop-initscript = "${PN}" | ||
145 | 148 | ||
146 | FILES_${PN} += "${base_libdir}/bootchart/bootchart-collector" | 149 | FILES_${PN} += "${base_libdir}/bootchart/bootchart-collector" |
147 | FILES_${PN} += "${base_libdir}/bootchart/tmpfs" | 150 | FILES_${PN} += "${base_libdir}/bootchart/tmpfs" |