diff options
-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 000000000..4ce23d717 --- /dev/null +++ b/meta-filesystems/recipes-utils/xfsdump/files/work-with-new-version-of-xfsprogs.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | Make it work with xfsprogs 5.2.0. | ||
2 | |||
3 | "xfs_fsop_geom_v1_t" has changed to "struct xfs_fsop_geom_v1" | ||
4 | in xfsprogs since version 5.2.0. | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Yuan Chao <yuanc.fnst@cn.fujitsu.com> | ||
9 | --- | ||
10 | common/fs.c | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/common/fs.c b/common/fs.c | ||
14 | index 60cf0fd..2cc7031 100644 | ||
15 | --- a/common/fs.c | ||
16 | +++ b/common/fs.c | ||
17 | @@ -204,7 +204,7 @@ fs_mounted( char *typs, char *chrs, char *mnts, uuid_t *idp ) | ||
18 | int | ||
19 | fs_getid( char *mnts, uuid_t *idb ) | ||
20 | { | ||
21 | - xfs_fsop_geom_v1_t geo; | ||
22 | + struct xfs_fsop_geom_v1 geo; | ||
23 | int fd; | ||
24 | |||
25 | fd = open( mnts, O_RDONLY ); | ||
26 | -- | ||
27 | 2.7.4 | ||
28 | |||
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 54ab30cbb..0421aa06d 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" | |||
12 | 12 | ||
13 | SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsdump/${BP}.tar.xz \ | 13 | SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsdump/${BP}.tar.xz \ |
14 | file://remove-install-as-user.patch \ | 14 | file://remove-install-as-user.patch \ |
15 | file://work-with-new-version-of-xfsprogs.patch \ | ||
15 | " | 16 | " |
16 | SRC_URI[md5sum] = "84d3bc287b4a2bb5d16b2320a47049a7" | 17 | SRC_URI[md5sum] = "84d3bc287b4a2bb5d16b2320a47049a7" |
17 | SRC_URI[sha256sum] = "ed14e67ae5b273c2698e767b43a46f033d361e540fe13feaaf9b110ee0edc585" | 18 | SRC_URI[sha256sum] = "ed14e67ae5b273c2698e767b43a46f033d361e540fe13feaaf9b110ee0edc585" |