MIRRORS/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2025-12-18 08:15:56 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

xfsprogs: upgrade 4.18.0 -> 5.0.0

Browse Source 
Rebase 0001-build-Check-for-sync_file_range-libc-function.patch.
Remove disable-xfs_scrub-build.patch as the xfs_scrub build is
config-optional now. Add option '--enable-scrub=no' to EXTRA_OECONF to
disable build the experimental xfs_scrub utility.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Yi Zhao 2019-06-14 09:26:18 +08:00 committed by Khem Raj
parent 465fb7940c
commit 9e58f66e35
3 changed files with 11 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
meta-filesystems/recipes-utils/xfsprogs/files/0001-build-Check-for-sync_file_range-libc-function.patch
View File

@ -1,4 +1,4 @@
From f8a22f16c03e51d3c779b12f37d362faaa0ecf31 Mon Sep 17 00:00:00 2001 From 1a4c9ebbb8731f2e3631d77b7eeaf3c373141d88 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com> From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 31 Jan 2018 21:28:53 -0800 Date: Wed, 31 Jan 2018 21:28:53 -0800
Subject: [PATCH] build: Check for sync_file_range libc function Subject: [PATCH] build: Check for sync_file_range libc function
@ -16,10 +16,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
4 files changed, 9 insertions(+), 2 deletions(-) 4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/include/builddefs.in b/include/builddefs.in diff --git a/include/builddefs.in b/include/builddefs.in
index b895949..a388c83 100644 index d38dc7e..706eca6 100644
--- a/include/builddefs.in --- a/include/builddefs.in
+++ b/include/builddefs.in +++ b/include/builddefs.in
@@ -95,6 +95,7 @@ HAVE_FIEMAP = @have_fiemap@ @@ -94,6 +94,7 @@ HAVE_FIEMAP = @have_fiemap@
HAVE_PREADV = @have_preadv@ HAVE_PREADV = @have_preadv@
HAVE_PWRITEV2 = @have_pwritev2@ HAVE_PWRITEV2 = @have_pwritev2@
HAVE_COPY_FILE_RANGE = @have_copy_file_range@ HAVE_COPY_FILE_RANGE = @have_copy_file_range@
@ -28,11 +28,11 @@ index b895949..a388c83 100644
HAVE_SYNCFS = @have_syncfs@ HAVE_SYNCFS = @have_syncfs@
HAVE_READDIR = @have_readdir@ HAVE_READDIR = @have_readdir@
diff --git a/io/Makefile b/io/Makefile diff --git a/io/Makefile b/io/Makefile
index 00ede48..dd001b0 100644 index 484e2b5..2751dcb 100644
--- a/io/Makefile --- a/io/Makefile
+++ b/io/Makefile +++ b/io/Makefile
@@ -60,10 +60,13 @@ CFILES += inject.c resblks.c @@ -53,10 +53,13 @@ else
LCFLAGS += -DHAVE_INJECT -DHAVE_RESBLKS LSRCFILES += fiemap.c
endif endif
-ifeq ($(HAVE_COPY_FILE_RANGE),yes) -ifeq ($(HAVE_COPY_FILE_RANGE),yes)
@ -47,10 +47,10 @@ index 00ede48..dd001b0 100644
ifeq ($(HAVE_SYNC_FILE_RANGE),yes) ifeq ($(HAVE_SYNC_FILE_RANGE),yes)
CFILES += sync_file_range.c CFILES += sync_file_range.c
diff --git a/io/io.h b/io/io.h diff --git a/io/io.h b/io/io.h
index e1f3d95..fe2e6a2 100644 index 6469179..678b3d7 100644
--- a/io/io.h --- a/io/io.h
+++ b/io/io.h +++ b/io/io.h
@@ -151,7 +151,7 @@ extern void fiemap_init(void); @@ -146,7 +146,7 @@ extern void fiemap_init(void);
#define fiemap_init() do { } while (0) #define fiemap_init() do { } while (0)
#endif #endif

30
meta-filesystems/recipes-utils/xfsprogs/files/disable-xfs_scrub-build.patch
View File

@ -1,30 +0,0 @@
From 2bd40e5ed4df0b0a42beff8806b1ec5daa372c48 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Thu, 19 Jul 2018 16:49:41 +0800
Subject: [PATCH] Disable xfs_scrub build
Disable xfs_scrub build since it is experimental.
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 7ddfa31..cd60319 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ LIBFROG_SUBDIR = libfrog
DLIB_SUBDIRS = libxlog libxcmd libhandle
LIB_SUBDIRS = libxfs $(DLIB_SUBDIRS)
TOOL_SUBDIRS = copy db estimate fsck growfs io logprint mkfs quota \
- mdrestore repair rtcp m4 man doc debian spaceman scrub
+ mdrestore repair rtcp m4 man doc debian spaceman
ifneq ("$(PKG_PLATFORM)","darwin")
TOOL_SUBDIRS += fsr
--
2.7.4

6
meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.18.0.bb → meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.0.0.bb
View File

@ -9,12 +9,11 @@ DEPENDS = "util-linux util-linux-native"
SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \ SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \
file://remove_flags_from_build_flags.patch \ file://remove_flags_from_build_flags.patch \
file://0001-build-Check-for-sync_file_range-libc-function.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://0001-Check-for-MAP_SYNC-in-sys-mman.h.patch \
file://0002-include-include-xfs-linux.h-after-sys-mman.h.patch \ file://0002-include-include-xfs-linux.h-after-sys-mman.h.patch \
" "
SRC_URI[md5sum] = "5f80b631b68df89a8b9283307e96d2e8" SRC_URI[md5sum] = "b6acc4aa93a952595fc8f2e7447be6f2"
SRC_URI[sha256sum] = "397dc96f51aeeff73d021d3418d3172377b2685f2740ca60525096c070aa3df1" SRC_URI[sha256sum] = "fcc2e6478aed55408a341567c0459f514e575296d8827d9004cae8aa0367dc4a"
inherit autotools-brokensep inherit autotools-brokensep
@ -31,6 +30,7 @@ FILES_${PN}-repair = "${base_sbindir}/xfs_repair"
FILES_libhandle = "${base_libdir}/libhandle${SOLIBS}" FILES_libhandle = "${base_libdir}/libhandle${SOLIBS}"
EXTRA_OECONF = "--enable-gettext=no \ EXTRA_OECONF = "--enable-gettext=no \
--enable-scrub=no \
INSTALL_USER=root \ INSTALL_USER=root \
INSTALL_GROUP=root \ INSTALL_GROUP=root \
ac_cv_header_aio_h=yes \ ac_cv_header_aio_h=yes \