| Brad Bishop | 79641f2 | 2019-09-10 07:20:22 -0400 | [diff] [blame] | 1 | From b6d1a1ff2de363b1b76c8c70f77ae56a4e4d4b56 Mon Sep 17 00:00:00 2001 |
| 2 | From: Changqing Li <changqing.li@windriver.com> |
| 3 | Date: Thu, 5 Sep 2019 18:37:31 +0800 |
| 4 | Subject: [PATCH] bootchart2: support usrmerge |
| 5 | |
| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 6 | Upstream-Status: Inappropriate [oe-specific] |
| Brad Bishop | 79641f2 | 2019-09-10 07:20:22 -0400 | [diff] [blame] | 7 | |
| 8 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| 9 | --- |
| 10 | Makefile | 4 ++-- |
| 11 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 12 | |
| 13 | diff --git a/Makefile b/Makefile |
| 14 | index 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 | -- |
| 36 | 2.7.4 |
| 37 | |