diff options
author | Changqing Li <changqing.li@windriver.com> | 2020-03-05 16:27:59 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-03-05 13:22:15 -0800 |
commit | c39747bc66879d6a06031872a99bf04ec9d36721 (patch) | |
tree | 703153bd02196280ca0dc68f0071b3a6e0355502 /meta-filesystems | |
parent | 4211ff4855ae03edf53b55d443bcf5b452b05f7a (diff) | |
download | meta-openembedded-c39747bc66879d6a06031872a99bf04ec9d36721.tar.gz |
xfsdump: fix do patch error
update patch to fix do_patch error
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-filesystems')
-rw-r--r-- | meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch | 26 |
1 files changed, 15 insertions, 11 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 index 04ec7b34a..bfb25e87f 100644 --- a/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch +++ b/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch | |||
@@ -1,44 +1,48 @@ | |||
1 | From 2da4cfe17b994d7f10017561ca8efe6b6bd5f3cf Mon Sep 17 00:00:00 2001 | 1 | From fea8c4634469784c16211e2597411c18c72dfa4a Mon Sep 17 00:00:00 2001 |
2 | From: Changqing Li <changqing.li@windriver.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | Date: Thu, 5 Sep 2019 11:17:15 +0800 | 3 | Date: Thu, 5 Mar 2020 14:36:14 +0800 |
4 | Subject: [PATCH] xfsdump: support usrmerge | 4 | Subject: [PATCH] xfsdump: support usrmerge |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe-specific] | 6 | Upstream-Status: Inappropriate [oe-specific] |
7 | 7 | ||
8 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | 8 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
9 | --- | 9 | --- |
10 | dump/Makefile | 4 +--- | 10 | dump/Makefile | 6 +----- |
11 | restore/Makefile | 4 +--- | 11 | restore/Makefile | 6 +----- |
12 | 2 files changed, 2 insertions(+), 6 deletions(-) | 12 | 2 files changed, 2 insertions(+), 10 deletions(-) |
13 | 13 | ||
14 | diff --git a/dump/Makefile b/dump/Makefile | 14 | diff --git a/dump/Makefile b/dump/Makefile |
15 | index 97879fa..14da664 100644 | 15 | index 66f00d3..cc2d973 100644 |
16 | --- a/dump/Makefile | 16 | --- a/dump/Makefile |
17 | +++ b/dump/Makefile | 17 | +++ b/dump/Makefile |
18 | @@ -97,10 +97,8 @@ default: depend $(LTCOMMAND) | 18 | @@ -97,12 +97,8 @@ default: depend $(LTCOMMAND) |
19 | include $(BUILDRULES) | 19 | include $(BUILDRULES) |
20 | 20 | ||
21 | install: default | 21 | install: default |
22 | - $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR) | 22 | - $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR) |
23 | - $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR) | 23 | - $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR) |
24 | $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) | 24 | $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) |
25 | - $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND) | 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) | ||
26 | + $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) | 28 | + $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) |
27 | install-dev: | 29 | install-dev: |
28 | 30 | ||
29 | .dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON) | 31 | .dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON) |
30 | diff --git a/restore/Makefile b/restore/Makefile | 32 | diff --git a/restore/Makefile b/restore/Makefile |
31 | index c6f3f25..7835ecc 100644 | 33 | index ac3f8c8..3c46394 100644 |
32 | --- a/restore/Makefile | 34 | --- a/restore/Makefile |
33 | +++ b/restore/Makefile | 35 | +++ b/restore/Makefile |
34 | @@ -107,10 +107,8 @@ default: depend $(LTCOMMAND) | 36 | @@ -111,12 +111,8 @@ default: depend $(LTCOMMAND) |
35 | include $(BUILDRULES) | 37 | include $(BUILDRULES) |
36 | 38 | ||
37 | install: default | 39 | install: default |
38 | - $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR) | 40 | - $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR) |
39 | - $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR) | 41 | - $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR) |
40 | $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) | 42 | $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) |
41 | - $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND) | 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) | ||
42 | + $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) | 46 | + $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) |
43 | install-dev: | 47 | install-dev: |
44 | 48 | ||