summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/bootchart2/bootchart2
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2019-09-06 11:37:26 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-07 07:47:24 +0100
commit4157600d31225c5ae53ba54318af30d3f7c3ccae (patch)
tree7f377dfe99050899afcb60b78e8d865162abc396 /meta/recipes-devtools/bootchart2/bootchart2
parentc143a3c4eaa901481e9e8bf0a48f32bbb8c100bb (diff)
downloadpoky-4157600d31225c5ae53ba54318af30d3f7c3ccae.tar.gz
bootchart2: switch to add patch from change source in do_install
it is not proper change source in do_install, it will make source not updated even local.conf have change the DISTRO_FEATURES [YOCTO #13493] (From OE-Core rev: c8b049f43931ac7581b6f57d03e4d1838d394e1f) Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/bootchart2/bootchart2')
-rw-r--r--meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch37
1 files changed, 37 insertions, 0 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