diff options
| author |   Changqing Li <changqing.li@windriver.com> | 2019-08-30 15:37:47 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-01 22:33:07 +0100 |
| commit | afea3c7d6524a8a2d615e2218b26b2e60c93e16d (patch) | |
| tree | 767d3566a55f615141a4e58406c5de9d65a0739b /meta/recipes-devtools | |
| parent | f46768df79e3578fb7a0d50cc0592be58327f34e (diff) | |
| download | openembedded-core-contrib-afea3c7d6524a8a2d615e2218b26b2e60c93e16d.tar.gz | |
bootchart2: support usrmerge
(From OE-Core rev: 291ec69e421984e8658bb4c83537e998b0dbc9b1)
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb | 6 |
1 files changed, 6 insertions, 0 deletions
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 |