From f96b327a467b285ceca73825215654e6874c885c Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Fri, 7 Sep 2018 09:03:35 +0800 Subject: xfsprogs: upgrade 4.17 -> 4.18 License-Update: Removed doc/COPYING and up-to-date license files in LICENSE/. This does not change the license of any of the code. Rebase patches: 0001-build-Check-for-sync_file_range-libc-function.patch 0002-include-include-xfs-linux.h-after-sys-mman.h.patch Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- ...d-Check-for-sync_file_range-libc-function.patch | 29 +++++---- ...lude-include-xfs-linux.h-after-sys-mman.h.patch | 8 +-- .../recipes-utils/xfsprogs/xfsprogs_4.17.0.bb | 67 --------------------- .../recipes-utils/xfsprogs/xfsprogs_4.18.0.bb | 68 ++++++++++++++++++++++ 4 files changed, 85 insertions(+), 87 deletions(-) delete mode 100644 meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.17.0.bb create mode 100644 meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.18.0.bb (limited to 'meta-filesystems/recipes-utils') diff --git a/meta-filesystems/recipes-utils/xfsprogs/files/0001-build-Check-for-sync_file_range-libc-function.patch b/meta-filesystems/recipes-utils/xfsprogs/files/0001-build-Check-for-sync_file_range-libc-function.patch index d8ff555319..231da806c4 100644 --- a/meta-filesystems/recipes-utils/xfsprogs/files/0001-build-Check-for-sync_file_range-libc-function.patch +++ b/meta-filesystems/recipes-utils/xfsprogs/files/0001-build-Check-for-sync_file_range-libc-function.patch @@ -1,14 +1,14 @@ -From ae7172194d3fbb563ff8bbe7c02d34f1bd0e5ec9 Mon Sep 17 00:00:00 2001 +From f8a22f16c03e51d3c779b12f37d362faaa0ecf31 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 31 Jan 2018 21:28:53 -0800 Subject: [PATCH] build: Check for sync_file_range libc function glibc 2.27 now has sync_file_range() -Signed-off-by: Khem Raj ---- Upstream-Status: Pending +Signed-off-by: Khem Raj +--- include/builddefs.in | 1 + io/Makefile | 5 ++++- io/io.h | 2 +- @@ -16,10 +16,10 @@ Upstream-Status: Pending 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/builddefs.in b/include/builddefs.in -index 92d5076..504225a 100644 +index b895949..a388c83 100644 --- a/include/builddefs.in +++ b/include/builddefs.in -@@ -105,6 +105,7 @@ HAVE_FIEMAP = @have_fiemap@ +@@ -95,6 +95,7 @@ HAVE_FIEMAP = @have_fiemap@ HAVE_PREADV = @have_preadv@ HAVE_PWRITEV2 = @have_pwritev2@ HAVE_COPY_FILE_RANGE = @have_copy_file_range@ @@ -28,10 +28,10 @@ index 92d5076..504225a 100644 HAVE_SYNCFS = @have_syncfs@ HAVE_READDIR = @have_readdir@ diff --git a/io/Makefile b/io/Makefile -index 6725936..1876e95 100644 +index 00ede48..dd001b0 100644 --- a/io/Makefile +++ b/io/Makefile -@@ -59,10 +59,13 @@ CFILES += inject.c resblks.c +@@ -60,10 +60,13 @@ CFILES += inject.c resblks.c LCFLAGS += -DHAVE_INJECT -DHAVE_RESBLKS endif @@ -47,10 +47,10 @@ index 6725936..1876e95 100644 ifeq ($(HAVE_SYNC_FILE_RANGE),yes) CFILES += sync_file_range.c diff --git a/io/io.h b/io/io.h -index 3862985..79ddc7b 100644 +index e1f3d95..fe2e6a2 100644 --- a/io/io.h +++ b/io/io.h -@@ -158,7 +158,7 @@ extern void fiemap_init(void); +@@ -151,7 +151,7 @@ extern void fiemap_init(void); #define fiemap_init() do { } while (0) #endif @@ -60,23 +60,20 @@ index 3862985..79ddc7b 100644 #else #define copy_range_init() do { } while (0) diff --git a/io/sync_file_range.c b/io/sync_file_range.c -index 7e4f3e6..aafea01 100644 +index 30bbc93..6c49d73 100644 --- a/io/sync_file_range.c +++ b/io/sync_file_range.c -@@ -16,6 +16,7 @@ - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +@@ -4,6 +4,7 @@ + * All Rights Reserved. */ +#ifndef HAVE_COPY_FILE_RANGE #include "command.h" #include "input.h" #include "init.h" -@@ -104,3 +105,5 @@ sync_range_init(void) +@@ -92,3 +93,5 @@ sync_range_init(void) add_command(&sync_range_cmd); } + +#endif --- -2.16.1 - diff --git a/meta-filesystems/recipes-utils/xfsprogs/files/0002-include-include-xfs-linux.h-after-sys-mman.h.patch b/meta-filesystems/recipes-utils/xfsprogs/files/0002-include-include-xfs-linux.h-after-sys-mman.h.patch index 89447fd92e..f924cd1a16 100644 --- a/meta-filesystems/recipes-utils/xfsprogs/files/0002-include-include-xfs-linux.h-after-sys-mman.h.patch +++ b/meta-filesystems/recipes-utils/xfsprogs/files/0002-include-include-xfs-linux.h-after-sys-mman.h.patch @@ -1,4 +1,4 @@ -From 18298d7c028cd5fbd2c68fa428dc2384344aeb91 Mon Sep 17 00:00:00 2001 +From 11a42df394de3dc520e72a016296dcc6dea02a7a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 23 Aug 2018 05:33:57 +0000 Subject: [PATCH] include include/xfs/linux.h after @@ -14,11 +14,11 @@ Signed-off-by: Khem Raj 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/io/mmap.c b/io/mmap.c -index 106be49..34fadf4 100644 +index dbfcca5..ca00df1 100644 --- a/io/mmap.c +++ b/io/mmap.c -@@ -16,10 +16,11 @@ - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +@@ -4,10 +4,11 @@ + * All Rights Reserved. */ -#include "command.h" diff --git a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.17.0.bb b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.17.0.bb deleted file mode 100644 index ee571ce863..0000000000 --- a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.17.0.bb +++ /dev/null @@ -1,67 +0,0 @@ -SUMMARY = "XFS Filesystem Utilities" -HOMEPAGE = "http://oss.sgi.com/projects/xfs" -SECTION = "base" -LICENSE = "GPLv2 & LGPLv2.1" -LICENSE_libhandle = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://doc/COPYING;md5=102f7fec3d53c7c8f0b7baf9bf9d76a8" -DEPENDS = "util-linux util-linux-native" -SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \ - file://remove_flags_from_build_flags.patch \ - file://0001-build-Check-for-sync_file_range-libc-function.patch \ - file://disable-xfs_scrub-build.patch \ - file://0001-Check-for-MAP_SYNC-in-sys-mman.h.patch \ - file://0002-include-include-xfs-linux.h-after-sys-mman.h.patch \ - " -SRC_URI[md5sum] = "b935b693dfac0264e232c3c4e52d5569" -SRC_URI[sha256sum] = "f53f5169cb98cfca471ddea30092738c427ba284c5356e01b45dd1ae3b297e0d" - -inherit autotools-brokensep - -PACKAGES =+ "${PN}-fsck ${PN}-mkfs ${PN}-repair libhandle" - -DEPENDS += "util-linux" - -RDEPENDS_${PN} = "${PN}-fsck ${PN}-mkfs ${PN}-repair" - -FILES_${PN}-fsck = "${base_sbindir}/fsck.xfs" -FILES_${PN}-mkfs = "${base_sbindir}/mkfs.xfs" -FILES_${PN}-repair = "${base_sbindir}/xfs_repair" - -FILES_libhandle = "${base_libdir}/libhandle${SOLIBS}" - -EXTRA_OECONF = "--enable-gettext=no \ - INSTALL_USER=root \ - INSTALL_GROUP=root \ - ac_cv_header_aio_h=yes \ - ac_cv_lib_rt_lio_listio=yes \ -" - -DISABLE_STATIC = "" -EXTRA_AUTORECONF += "-I ${S}/m4 --exclude=autoheader" - -PACKAGECONFIG ??= "readline blkid" - -PACKAGECONFIG[readline] = "--enable-readline=yes,--enable-readline=no,readline" -PACKAGECONFIG[blkid] = "--enable-blkid=yes,--enable-blkid=no,util-linux" - -export DEBUG="-DNDEBUG" -export BUILD_VERBOSE="1" -export tagname="CC" - -EXTRA_OEMAKE = "DIST_ROOT='${D}'" - -do_configure () { - export BUILD_CC="${BUILD_CC} ${BUILD_CFLAGS}" - # Prevent Makefile from calling configure without arguments, - # when do_configure gets called for a second time. - rm -f ${B}/include/builddefs ${B}/include/platform_defs.h ${B}/configure - # Recreate configure script. - oe_runmake configure - oe_runconf -} - -do_install_append() { - oe_runmake 'DESTDIR=${D}' install-dev - rm ${D}${libdir}/*.la - rmdir --ignore-fail-on-non-empty ${D}${libdir} -} diff --git a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.18.0.bb b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.18.0.bb new file mode 100644 index 0000000000..0a1bacb935 --- /dev/null +++ b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.18.0.bb @@ -0,0 +1,68 @@ +SUMMARY = "XFS Filesystem Utilities" +HOMEPAGE = "http://oss.sgi.com/projects/xfs" +SECTION = "base" +LICENSE = "GPLv2 & LGPLv2.1" +LICENSE_libhandle = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=74274e8a218423e49eefdea80bc55038 \ + file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd" +DEPENDS = "util-linux util-linux-native" +SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \ + file://remove_flags_from_build_flags.patch \ + file://0001-build-Check-for-sync_file_range-libc-function.patch \ + file://disable-xfs_scrub-build.patch \ + file://0001-Check-for-MAP_SYNC-in-sys-mman.h.patch \ + file://0002-include-include-xfs-linux.h-after-sys-mman.h.patch \ + " +SRC_URI[md5sum] = "5f80b631b68df89a8b9283307e96d2e8" +SRC_URI[sha256sum] = "397dc96f51aeeff73d021d3418d3172377b2685f2740ca60525096c070aa3df1" + +inherit autotools-brokensep + +PACKAGES =+ "${PN}-fsck ${PN}-mkfs ${PN}-repair libhandle" + +DEPENDS += "util-linux" + +RDEPENDS_${PN} = "${PN}-fsck ${PN}-mkfs ${PN}-repair" + +FILES_${PN}-fsck = "${base_sbindir}/fsck.xfs" +FILES_${PN}-mkfs = "${base_sbindir}/mkfs.xfs" +FILES_${PN}-repair = "${base_sbindir}/xfs_repair" + +FILES_libhandle = "${base_libdir}/libhandle${SOLIBS}" + +EXTRA_OECONF = "--enable-gettext=no \ + INSTALL_USER=root \ + INSTALL_GROUP=root \ + ac_cv_header_aio_h=yes \ + ac_cv_lib_rt_lio_listio=yes \ +" + +DISABLE_STATIC = "" +EXTRA_AUTORECONF += "-I ${S}/m4 --exclude=autoheader" + +PACKAGECONFIG ??= "readline blkid" + +PACKAGECONFIG[readline] = "--enable-readline=yes,--enable-readline=no,readline" +PACKAGECONFIG[blkid] = "--enable-blkid=yes,--enable-blkid=no,util-linux" + +export DEBUG="-DNDEBUG" +export BUILD_VERBOSE="1" +export tagname="CC" + +EXTRA_OEMAKE = "DIST_ROOT='${D}'" + +do_configure () { + export BUILD_CC="${BUILD_CC} ${BUILD_CFLAGS}" + # Prevent Makefile from calling configure without arguments, + # when do_configure gets called for a second time. + rm -f ${B}/include/builddefs ${B}/include/platform_defs.h ${B}/configure + # Recreate configure script. + oe_runmake configure + oe_runconf +} + +do_install_append() { + oe_runmake 'DESTDIR=${D}' install-dev + rm ${D}${libdir}/*.la + rmdir --ignore-fail-on-non-empty ${D}${libdir} +} -- cgit 1.2.3-korg