From 80f47fd89294c7ffa17b74f0fd8ec22811d41637 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 11 Sep 2017 08:10:53 -0700 Subject: xfsdump: Upgrade to 3.1.7 Fix build on musl Point to new SRC_URI Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- ...-c99-defined-int64_t-instead-of-__int64_t.patch | 28 ++++++++++++++ .../recipes-utils/xfsdump/xfsdump_3.1.6.bb | 43 --------------------- .../recipes-utils/xfsdump/xfsdump_3.1.7.bb | 44 ++++++++++++++++++++++ 3 files changed, 72 insertions(+), 43 deletions(-) create mode 100644 meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-Use-c99-defined-int64_t-instead-of-__int64_t.patch delete mode 100644 meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.6.bb create mode 100644 meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.7.bb (limited to 'meta-filesystems/recipes-utils') diff --git a/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-Use-c99-defined-int64_t-instead-of-__int64_t.patch b/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-Use-c99-defined-int64_t-instead-of-__int64_t.patch new file mode 100644 index 000000000..1fe1bde8b --- /dev/null +++ b/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-Use-c99-defined-int64_t-instead-of-__int64_t.patch @@ -0,0 +1,28 @@ +From f1e822d546e08cc195eaeb38ca172bd0c3800aa9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 9 Sep 2017 07:48:48 -0700 +Subject: [PATCH] xfsdump: Use c99 defined int64_t instead of __int64_t + +Signed-off-by: Khem Raj +--- +Upstream-Status: Submitted + + common/hsmapi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/common/hsmapi.c b/common/hsmapi.c +index 6054773..0709dbe 100644 +--- a/common/hsmapi.c ++++ b/common/hsmapi.c +@@ -585,7 +585,7 @@ HsmModifyExtentMap( + struct getbmapx *bmap) + { + dmf_f_ctxt_t *dmf_f_ctxtp = (dmf_f_ctxt_t *)contextp; +- __int64_t length; ++ int64_t length; + + if (bmap[0].bmv_entries <= 0) { + return 1; /* caller must already be at EOF */ +-- +2.14.1 + diff --git a/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.6.bb b/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.6.bb deleted file mode 100644 index d1033cff1..000000000 --- a/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.6.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "XFS Filesystem Dump Utility" -DESCRIPTION = "The xfsdump package contains xfsdump, xfsrestore and a \ - number of other utilities for administering XFS filesystems.\ - xfsdump examines files in a filesystem, determines which \ - need to be backed up, and copies those files to a \ - specified disk, tape or other storage medium." -HOMEPAGE = "http://oss.sgi.com/projects/xfs" -SECTION = "base" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://doc/COPYING;md5=15c832894d10ddd00dfcf57bee490ecc" -DEPENDS = "xfsprogs attr" - -SRC_URI = "ftp://oss.sgi.com/projects/xfs/cmd_tars/${BPN}-${PV}.tar.gz \ - file://remove-install-as-user.patch \ - file://0001-Include-fcntl.h-for-O_EXCL.patch \ - file://0002-Replace-__uint32_t-with-uint32_t.patch \ - file://0003-replace-use-of-SIGCLD-with-SIGCHLD.patch \ - file://0004-include-limit.h-for-PATH_MAX.patch \ - file://0005-include-sys-types.h-for-u_int32_t-in-attr-attributes.patch \ - " -SRC_URI[md5sum] = "50353cd4f4b435685955363e6044f4d1" -SRC_URI[sha256sum] = "7f78c11ca527477d90e5e62b0778f3ad96f2b71c19173044e9aca9515fff42d0" - -inherit autotools-brokensep - -PARALLEL_MAKE = "" -PACKAGECONFIG ??= "" -PACKAGECONFIG[gettext] = "--enable-gettext=yes,--enable-gettext=no,gettext" - -CFLAGS += "-D_FILE_OFFSET_BITS=64" - -EXTRA_OEMAKE += "'LIBTOOL=${HOST_SYS}-libtool' V=1" - -do_configure () { - export DEBUG="-DNDEBUG" - oe_runconf -} - -do_install () { - export DIST_ROOT=${D} - oe_runmake install - oe_runmake install-dev -} diff --git a/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.7.bb b/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.7.bb new file mode 100644 index 000000000..0ac991b23 --- /dev/null +++ b/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.7.bb @@ -0,0 +1,44 @@ +SUMMARY = "XFS Filesystem Dump Utility" +DESCRIPTION = "The xfsdump package contains xfsdump, xfsrestore and a \ + number of other utilities for administering XFS filesystems.\ + xfsdump examines files in a filesystem, determines which \ + need to be backed up, and copies those files to a \ + specified disk, tape or other storage medium." +HOMEPAGE = "http://oss.sgi.com/projects/xfs" +SECTION = "base" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://doc/COPYING;md5=15c832894d10ddd00dfcf57bee490ecc" +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://0001-Include-fcntl.h-for-O_EXCL.patch \ + file://0002-Replace-__uint32_t-with-uint32_t.patch \ + file://0003-replace-use-of-SIGCLD-with-SIGCHLD.patch \ + file://0004-include-limit.h-for-PATH_MAX.patch \ + file://0005-include-sys-types.h-for-u_int32_t-in-attr-attributes.patch \ + file://0001-xfsdump-Use-c99-defined-int64_t-instead-of-__int64_t.patch \ + " +SRC_URI[md5sum] = "c6e91f2ac8b76c796db2d236f5ca5947" +SRC_URI[sha256sum] = "99e6d4df257ebc6d29ca9e970ca20672c2ea03481ad949bc68f98de3e4d56dce" + +inherit autotools-brokensep + +PARALLEL_MAKE = "" +PACKAGECONFIG ??= "" +PACKAGECONFIG[gettext] = "--enable-gettext=yes,--enable-gettext=no,gettext" + +CFLAGS += "-D_FILE_OFFSET_BITS=64" + +EXTRA_OEMAKE += "'LIBTOOL=${HOST_SYS}-libtool' V=1" + +do_configure () { + export DEBUG="-DNDEBUG" + oe_runconf +} + +do_install () { + export DIST_ROOT=${D} + oe_runmake install + oe_runmake install-dev +} -- cgit v1.2.3-54-g00ecf