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