[oe-commits] [meta-openembedded] 02/02: xfsdump: fix error to work with xfsprogs 5.2.0

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit 0aa96837f9f73907e2d1851c88c2c5edd94e507e
Author: Yuan Chao <yuanc.fnst at cn.fujitsu.com>
AuthorDate: Thu Aug 15 11:20:43 2019 +0800

    xfsdump: fix error to work with xfsprogs 5.2.0
    
    Make it work with xfsprogs 5.2.0.
    
    "xfs_fsop_geom_v1_t" has changed to "struct xfs_fsop_geom_v1"
    in xfsprogs since version 5.2.0.
    
    Signed-off-by: Yuan Chao <yuanc.fnst at cn.fujitsu.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 .../files/work-with-new-version-of-xfsprogs.patch  | 28 ++++++++++++++++++++++
 .../recipes-utils/xfsdump/xfsdump_3.1.8.bb         |  1 +
 2 files changed, 29 insertions(+)

diff --git a/meta-filesystems/recipes-utils/xfsdump/files/work-with-new-version-of-xfsprogs.patch b/meta-filesystems/recipes-utils/xfsdump/files/work-with-new-version-of-xfsprogs.patch
new file mode 100644
index 0000000..4ce23d7
--- /dev/null
+++ b/meta-filesystems/recipes-utils/xfsdump/files/work-with-new-version-of-xfsprogs.patch
@@ -0,0 +1,28 @@
+Make it work with xfsprogs 5.2.0.
+
+"xfs_fsop_geom_v1_t" has changed to "struct xfs_fsop_geom_v1"
+in xfsprogs since version 5.2.0.
+
+Upstream-Status: Pending
+
+Signed-off-by: Yuan Chao <yuanc.fnst at cn.fujitsu.com>
+---
+ common/fs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/common/fs.c b/common/fs.c
+index 60cf0fd..2cc7031 100644
+--- a/common/fs.c
++++ b/common/fs.c
+@@ -204,7 +204,7 @@ fs_mounted( char *typs, char *chrs, char *mnts, uuid_t *idp )
+ int
+ fs_getid( char *mnts, uuid_t *idb )
+ {
+-	xfs_fsop_geom_v1_t geo;
++	struct xfs_fsop_geom_v1 geo;
+ 	int fd;
+ 
+ 	fd = open( mnts, O_RDONLY );
+-- 
+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 54ab30c..0421aa0 100644
--- a/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb
+++ b/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb
@@ -12,6 +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 \
            "
 SRC_URI[md5sum] = "84d3bc287b4a2bb5d16b2320a47049a7"
 SRC_URI[sha256sum] = "ed14e67ae5b273c2698e767b43a46f033d361e540fe13feaaf9b110ee0edc585"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.