diff options
| author |   Yuan Chao <yuanc.fnst@cn.fujitsu.com> | 2019-08-15 11:20:43 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2019-08-14 22:33:09 -0700 |
| commit | 0aa96837f9f73907e2d1851c88c2c5edd94e507e (patch) | |
| tree | 2018b9a8752ed35f5fe9b465b0f9825c16325444 /meta-filesystems | |
| parent | a6eeacedd0f6444eef4efae3189f0a472fb9274d (diff) | |
| download | meta-openembedded-contrib-0aa96837f9f73907e2d1851c88c2c5edd94e507e.tar.gz | |
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@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-filesystems')
| -rw-r--r-- | meta-filesystems/recipes-utils/xfsdump/files/work-with-new-version-of-xfsprogs.patch | 28 | ||||
| -rw-r--r-- | meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb | 1 |
2 files changed, 29 insertions, 0 deletions
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 0000000000..4ce23d7172 --- /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@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 54ab30cbbb..0421aa06d4 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" |