summaryrefslogtreecommitdiffstats
path: root/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2019-09-06 10:19:26 +0800
committerKhem Raj <raj.khem@gmail.com>2019-09-05 21:50:12 -0700
commit86b4e8df8816f9ad5b30bc8f889b19f121680f39 (patch)
treee5f7f168f928e4569564854013947e9a75d83374 /meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch
parent8d4d608b4e937bb3b8e3b260bd75338c3ff7e8fd (diff)
downloadmeta-openembedded-86b4e8df8816f9ad5b30bc8f889b19f121680f39.tar.gz
xfsdump: support usrmerge
Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch')
-rw-r--r--meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch48
1 files changed, 48 insertions, 0 deletions
diff --git a/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch b/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch
new file mode 100644
index 0000000000..04ec7b34ac
--- /dev/null
+++ b/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch
@@ -0,0 +1,48 @@
1From 2da4cfe17b994d7f10017561ca8efe6b6bd5f3cf Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Thu, 5 Sep 2019 11:17:15 +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 | 4 +---
11 restore/Makefile | 4 +---
12 2 files changed, 2 insertions(+), 6 deletions(-)
13
14diff --git a/dump/Makefile b/dump/Makefile
15index 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)
30diff --git a/restore/Makefile b/restore/Makefile
31index 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--
472.7.4
48