| Brad Bishop | c1d3433 | 2019-09-09 14:56:00 -0400 | [diff] [blame^] | 1 | From 2da4cfe17b994d7f10017561ca8efe6b6bd5f3cf Mon Sep 17 00:00:00 2001 |
| 2 | From: Changqing Li <changqing.li@windriver.com> |
| 3 | Date: Thu, 5 Sep 2019 11:17:15 +0800 |
| 4 | Subject: [PATCH] xfsdump: support usrmerge |
| 5 | |
| 6 | Upstream-Status: Inappropriate [oe-specific] |
| 7 | |
| 8 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| 9 | --- |
| 10 | dump/Makefile | 4 +--- |
| 11 | restore/Makefile | 4 +--- |
| 12 | 2 files changed, 2 insertions(+), 6 deletions(-) |
| 13 | |
| 14 | diff --git a/dump/Makefile b/dump/Makefile |
| 15 | index 97879fa..14da664 100644 |
| 16 | --- a/dump/Makefile |
| 17 | +++ b/dump/Makefile |
| 18 | @@ -97,10 +97,8 @@ default: depend $(LTCOMMAND) |
| 19 | include $(BUILDRULES) |
| 20 | |
| 21 | install: default |
| 22 | - $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR) |
| 23 | - $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR) |
| 24 | $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) |
| 25 | - $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND) |
| 26 | + $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) |
| 27 | install-dev: |
| 28 | |
| 29 | .dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON) |
| 30 | diff --git a/restore/Makefile b/restore/Makefile |
| 31 | index c6f3f25..7835ecc 100644 |
| 32 | --- a/restore/Makefile |
| 33 | +++ b/restore/Makefile |
| 34 | @@ -107,10 +107,8 @@ default: depend $(LTCOMMAND) |
| 35 | include $(BUILDRULES) |
| 36 | |
| 37 | install: default |
| 38 | - $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR) |
| 39 | - $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR) |
| 40 | $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) |
| 41 | - $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND) |
| 42 | + $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) |
| 43 | install-dev: |
| 44 | |
| 45 | .dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON) |
| 46 | -- |
| 47 | 2.7.4 |
| 48 | |