diff options
| author |   Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> | 2020-02-24 17:27:29 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2020-02-24 10:03:17 -0800 |
| commit | b60c61a62cbe0679828a062fbd81faf241707340 (patch) | |
| tree | 3d7899b3992e873c727e298ef635bafaa0696402 /meta-filesystems | |
| parent | 7d06fdd77171c12a0f66b973eb2c3fcae14afa7d (diff) | |
| download | meta-openembedded-contrib-b60c61a62cbe0679828a062fbd81faf241707340.tar.gz | |
xfsdump: 3.1.8 -> 3.1.9
work-with-new-version-of-xfsprogs.patch
is removed because it is included in 3.1.9.
Signed-off-by: Zheng Ruoqin <zhengrq.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.9.bb (renamed from meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb) | 5 |
2 files changed, 2 insertions, 31 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 deleted file mode 100644 index 4ce23d7172..0000000000 --- a/meta-filesystems/recipes-utils/xfsdump/files/work-with-new-version-of-xfsprogs.patch +++ /dev/null @@ -1,28 +0,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. - -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.9.bb index 9c57558625..3e18fba74f 100644 --- a/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb +++ b/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.9.bb @@ -12,11 +12,10 @@ 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" +SRC_URI[md5sum] = "086f7582875b14c17522867ffe3e202b" +SRC_URI[sha256sum] = "55aeede6232ddce6c9e79e2af88d6f808534df1552eb2bfaf7fb85b92add6dd1" inherit autotools-brokensep |