From 291ec69e421984e8658bb4c83537e998b0dbc9b1 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Fri, 30 Aug 2019 15:37:47 +0800 Subject: bootchart2: support usrmerge Signed-off-by: Changqing Li Signed-off-by: Richard Purdie --- meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'meta/recipes-devtools/bootchart2') diff --git a/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb b/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb index f9a98d4509..465cdd9605 100644 --- a/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb +++ b/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb @@ -121,11 +121,17 @@ do_compile_prepend () { } do_install () { + if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then + sed -i -e "s;install -m 755 -D bootchartd \$(DESTDIR)\$(EARLY_PREFIX)/sbin/;install -m 755 -D bootchartd \$(DESTDIR)/usr/sbin/;g" ${B}/Makefile + fi + sed -i -e "s;SYSTEMD_UNIT_DIR =; SYSTEMD_UNIT_DIR ?=;g" ${B}/Makefile install -d ${D}${sysconfdir} # needed for -native export PY_LIBDIR="${libdir}/${PYTHON_DIR}" export BINDIR="${bindir}" export DESTDIR="${D}" export LIBDIR="${base_libdir}" + export PKGLIBDIR="${base_libdir}/bootchart" + export SYSTEMD_UNIT_DIR="${systemd_unitdir}/system" oe_runmake install install -d ${D}${sysconfdir}/init.d -- cgit 1.2.3-korg