diff options
Diffstat (limited to 'meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb')
-rw-r--r-- | meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb b/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb index 465cdd9605..a938b2da49 100644 --- a/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb +++ b/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb | |||
@@ -93,6 +93,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)" | |||
93 | SRC_URI = "git://github.com/xrmx/bootchart.git \ | 93 | SRC_URI = "git://github.com/xrmx/bootchart.git \ |
94 | file://bootchartd_stop.sh \ | 94 | file://bootchartd_stop.sh \ |
95 | file://0001-collector-Allocate-space-on-heap-for-chunks.patch \ | 95 | file://0001-collector-Allocate-space-on-heap-for-chunks.patch \ |
96 | file://0001-bootchart2-support-usrmerge.patch \ | ||
96 | " | 97 | " |
97 | 98 | ||
98 | S = "${WORKDIR}/git" | 99 | S = "${WORKDIR}/git" |
@@ -114,6 +115,8 @@ UPDATERCPN = "bootchartd-stop-initscript" | |||
114 | INITSCRIPT_NAME = "bootchartd_stop.sh" | 115 | INITSCRIPT_NAME = "bootchartd_stop.sh" |
115 | INITSCRIPT_PARAMS = "start 99 2 3 4 5 ." | 116 | INITSCRIPT_PARAMS = "start 99 2 3 4 5 ." |
116 | 117 | ||
118 | EXTRA_OEMAKE = 'BASE_SBINDIR="${base_sbindir}"' | ||
119 | |||
117 | do_compile_prepend () { | 120 | do_compile_prepend () { |
118 | export PY_LIBDIR="${libdir}/${PYTHON_DIR}" | 121 | export PY_LIBDIR="${libdir}/${PYTHON_DIR}" |
119 | export BINDIR="${bindir}" | 122 | export BINDIR="${bindir}" |
@@ -121,10 +124,6 @@ do_compile_prepend () { | |||
121 | } | 124 | } |
122 | 125 | ||
123 | do_install () { | 126 | do_install () { |
124 | if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then | ||
125 | sed -i -e "s;install -m 755 -D bootchartd \$(DESTDIR)\$(EARLY_PREFIX)/sbin/;install -m 755 -D bootchartd \$(DESTDIR)/usr/sbin/;g" ${B}/Makefile | ||
126 | fi | ||
127 | sed -i -e "s;SYSTEMD_UNIT_DIR =; SYSTEMD_UNIT_DIR ?=;g" ${B}/Makefile | ||
128 | install -d ${D}${sysconfdir} # needed for -native | 127 | install -d ${D}${sysconfdir} # needed for -native |
129 | export PY_LIBDIR="${libdir}/${PYTHON_DIR}" | 128 | export PY_LIBDIR="${libdir}/${PYTHON_DIR}" |
130 | export BINDIR="${bindir}" | 129 | export BINDIR="${bindir}" |