1From fea8c4634469784c16211e2597411c18c72dfa4a Mon Sep 17 00:00:00 2001 2From: Changqing Li <changqing.li@windriver.com> 3Date: Thu, 5 Mar 2020 14:36:14 +0800 4Subject: [PATCH] xfsdump: support usrmerge 5 6Upstream-Status: Inappropriate [oe-specific] 7 8Signed-off-by: Changqing Li <changqing.li@windriver.com> 9--- 10 dump/Makefile | 6 +----- 11 restore/Makefile | 6 +----- 12 2 files changed, 2 insertions(+), 10 deletions(-) 13 14diff --git a/dump/Makefile b/dump/Makefile 15index 66f00d3..cc2d973 100644 16--- a/dump/Makefile 17+++ b/dump/Makefile 18@@ -97,12 +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- # skip symlink when /sbin is alread symlinked to /usr/sbin, like on Fedora 26- test $(PKG_ROOT_SBIN_DIR) -ef $(PKG_SBIN_DIR) || \ 27- $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND) 28+ $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) 29 install-dev: 30 31 .dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON) 32diff --git a/restore/Makefile b/restore/Makefile 33index ac3f8c8..3c46394 100644 34--- a/restore/Makefile 35+++ b/restore/Makefile 36@@ -111,12 +111,8 @@ default: depend $(LTCOMMAND) 37 include $(BUILDRULES) 38 39 install: default 40- $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR) 41- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR) 42 $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) 43- # skip symlink when /sbin is alread symlinked to /usr/sbin, like on Fedora 44- test $(PKG_ROOT_SBIN_DIR) -ef $(PKG_SBIN_DIR) || \ 45- $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND) 46+ $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) 47 install-dev: 48 49 .dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON) 50-- 512.7.4 52 53