-
Notifications
You must be signed in to change notification settings - Fork 723
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
update patch to fix do_patch error Signed-off-by: Changqing Li <[email protected]> Signed-off-by: Khem Raj <[email protected]>
- Loading branch information
Showing
1 changed file
with
15 additions
and
11 deletions.
There are no files selected for viewing
26 changes: 15 additions & 11 deletions
26
meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,44 +1,48 @@ | ||
| From 2da4cfe17b994d7f10017561ca8efe6b6bd5f3cf Mon Sep 17 00:00:00 2001 | ||
| From fea8c4634469784c16211e2597411c18c72dfa4a Mon Sep 17 00:00:00 2001 | ||
| From: Changqing Li <[email protected]> | ||
| Date: Thu, 5 Sep 2019 11:17:15 +0800 | ||
| Date: Thu, 5 Mar 2020 14:36:14 +0800 | ||
| Subject: [PATCH] xfsdump: support usrmerge | ||
|
|
||
| Upstream-Status: Inappropriate [oe-specific] | ||
|
|
||
| Signed-off-by: Changqing Li <[email protected]> | ||
| --- | ||
| dump/Makefile | 4 +--- | ||
| restore/Makefile | 4 +--- | ||
| 2 files changed, 2 insertions(+), 6 deletions(-) | ||
| dump/Makefile | 6 +----- | ||
| restore/Makefile | 6 +----- | ||
| 2 files changed, 2 insertions(+), 10 deletions(-) | ||
|
|
||
| diff --git a/dump/Makefile b/dump/Makefile | ||
| index 97879fa..14da664 100644 | ||
| index 66f00d3..cc2d973 100644 | ||
| --- a/dump/Makefile | ||
| +++ b/dump/Makefile | ||
| @@ -97,10 +97,8 @@ default: depend $(LTCOMMAND) | ||
| @@ -97,12 +97,8 @@ default: depend $(LTCOMMAND) | ||
| include $(BUILDRULES) | ||
|
|
||
| install: default | ||
| - $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR) | ||
| - $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR) | ||
| $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) | ||
| - $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND) | ||
| - # skip symlink when /sbin is alread symlinked to /usr/sbin, like on Fedora | ||
| - test $(PKG_ROOT_SBIN_DIR) -ef $(PKG_SBIN_DIR) || \ | ||
| - $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND) | ||
| + $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) | ||
| install-dev: | ||
|
|
||
| .dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON) | ||
| diff --git a/restore/Makefile b/restore/Makefile | ||
| index c6f3f25..7835ecc 100644 | ||
| index ac3f8c8..3c46394 100644 | ||
| --- a/restore/Makefile | ||
| +++ b/restore/Makefile | ||
| @@ -107,10 +107,8 @@ default: depend $(LTCOMMAND) | ||
| @@ -111,12 +111,8 @@ default: depend $(LTCOMMAND) | ||
| include $(BUILDRULES) | ||
|
|
||
| install: default | ||
| - $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR) | ||
| - $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR) | ||
| $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) | ||
| - $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND) | ||
| - # skip symlink when /sbin is alread symlinked to /usr/sbin, like on Fedora | ||
| - test $(PKG_ROOT_SBIN_DIR) -ef $(PKG_SBIN_DIR) || \ | ||
| - $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND) | ||
| + $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) | ||
| install-dev: | ||
|
|
||
|
|
||