summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/bootchart2
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/bootchart2')
-rw-r--r--meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch37
-rw-r--r--meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb7
2 files changed, 40 insertions, 4 deletions
diff --git a/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch b/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch
new file mode 100644
index 0000000000..8ee6723df1
--- /dev/null
+++ b/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch
@@ -0,0 +1,37 @@
1From b6d1a1ff2de363b1b76c8c70f77ae56a4e4d4b56 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Thu, 5 Sep 2019 18:37:31 +0800
4Subject: [PATCH] bootchart2: support usrmerge
5
6Upstream-Status: Inappropriate[oe-specific]
7
8Signed-off-by: Changqing Li <changqing.li@windriver.com>
9---
10 Makefile | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/Makefile b/Makefile
14index 1cc2974..f988904 100644
15--- a/Makefile
16+++ b/Makefile
17@@ -36,7 +36,7 @@ endif
18 PY_SITEDIR ?= $(PY_LIBDIR)/site-packages
19 LIBC_A_PATH = /usr$(LIBDIR)
20 # Always lib, even on systems that otherwise use lib64
21-SYSTEMD_UNIT_DIR = $(EARLY_PREFIX)/lib/systemd/system
22+SYSTEMD_UNIT_DIR ?= $(EARLY_PREFIX)/lib/systemd/system
23 COLLECTOR = \
24 collector/collector.o \
25 collector/output.o \
26@@ -99,7 +99,7 @@ install-chroot:
27 install -d $(DESTDIR)$(PKGLIBDIR)/tmpfs
28
29 install-collector: all install-chroot
30- install -m 755 -D bootchartd $(DESTDIR)$(EARLY_PREFIX)/sbin/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX)
31+ install -m 755 -D bootchartd $(DESTDIR)${BASE_SBINDIR}/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX)
32 install -m 644 -D bootchartd.conf $(DESTDIR)/etc/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX).conf
33 install -m 755 -D bootchart-collector $(DESTDIR)$(PKGLIBDIR)/$(PROGRAM_PREFIX)bootchart$(PROGRAM_SUFFIX)-collector
34
35--
362.7.4
37
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+)*)"
93SRC_URI = "git://github.com/xrmx/bootchart.git \ 93SRC_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
98S = "${WORKDIR}/git" 99S = "${WORKDIR}/git"
@@ -114,6 +115,8 @@ UPDATERCPN = "bootchartd-stop-initscript"
114INITSCRIPT_NAME = "bootchartd_stop.sh" 115INITSCRIPT_NAME = "bootchartd_stop.sh"
115INITSCRIPT_PARAMS = "start 99 2 3 4 5 ." 116INITSCRIPT_PARAMS = "start 99 2 3 4 5 ."
116 117
118EXTRA_OEMAKE = 'BASE_SBINDIR="${base_sbindir}"'
119
117do_compile_prepend () { 120do_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
123do_install () { 126do_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}"