[oe] [meta-filesystems][PATCH] xfsdump: support usrmerge

[Khem Raj]

this fails in a non usrmerge case e.g.

https://errors.yoctoproject.org/Errors/Details/268439/

On Wed, Sep 4, 2019 at 11:01 PM <changqing.li at windriver.com> wrote:
>
> From: Changqing Li <changqing.li at windriver.com>
>
> Signed-off-by: Changqing Li <changqing.li at windriver.com>
> ---
>  .../files/0001-xfsdump-support-usrmerge.patch      | 48 ++++++++++++++++++++++
>  .../recipes-utils/xfsdump/xfsdump_3.1.8.bb         |  2 +-
>  2 files changed, 49 insertions(+), 1 deletion(-)
>  create mode 100644 meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch
>
> 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 0000000..04ec7b3
> --- /dev/null
> +++ b/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch
> @@ -0,0 +1,48 @@
> +From 2da4cfe17b994d7f10017561ca8efe6b6bd5f3cf Mon Sep 17 00:00:00 2001
> +From: Changqing Li <changqing.li at windriver.com>
> +Date: Thu, 5 Sep 2019 11:17:15 +0800
> +Subject: [PATCH] xfsdump: support usrmerge
> +
> +Upstream-Status: Inappropriate [oe-specific]
> +
> +Signed-off-by: Changqing Li <changqing.li at windriver.com>
> +---
> + dump/Makefile    | 4 +---
> + restore/Makefile | 4 +---
> + 2 files changed, 2 insertions(+), 6 deletions(-)
> +
> +diff --git a/dump/Makefile b/dump/Makefile
> +index 97879fa..14da664 100644
> +--- a/dump/Makefile
> ++++ b/dump/Makefile
> +@@ -97,10 +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)
> ++      $(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
> +--- a/restore/Makefile
> ++++ b/restore/Makefile
> +@@ -107,10 +107,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)
> ++      $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR)
> + install-dev:
> +
> + .dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON)
> +--
> +2.7.4
> +
> diff --git a/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb b/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb
> index 0421aa0..9c8e78e 100644
> --- a/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb
> +++ b/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb
> @@ -12,7 +12,7 @@ DEPENDS = "xfsprogs attr"
>
>  SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsdump/${BP}.tar.xz \
>             file://remove-install-as-user.patch \
> -           file://work-with-new-version-of-xfsprogs.patch \
> +           ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-xfsdump-support-usrmerge.patch','',d)} \
>             "
>  SRC_URI[md5sum] = "84d3bc287b4a2bb5d16b2320a47049a7"
>  SRC_URI[sha256sum] = "ed14e67ae5b273c2698e767b43a46f033d361e540fe13feaaf9b110ee0edc585"
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel