[oe-commits] [openembedded-core] 17/29: bootchart2: support usrmerge

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 291ec69e421984e8658bb4c83537e998b0dbc9b1
Author: Changqing Li <changqing.li at windriver.com>
AuthorDate: Fri Aug 30 15:37:47 2019 +0800

    bootchart2: support usrmerge
    
    Signed-off-by: Changqing Li <changqing.li at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb b/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb
index f9a98d4..465cdd9 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.