diff options
-rw-r--r-- | meta-filesystems/recipes-utils/xfsprogs/files/disable-xfs_scrub-build.patch | 30 | ||||
-rw-r--r-- | meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.17.0.bb (renamed from meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.14.0.bb) | 5 |
2 files changed, 33 insertions, 2 deletions
diff --git a/meta-filesystems/recipes-utils/xfsprogs/files/disable-xfs_scrub-build.patch b/meta-filesystems/recipes-utils/xfsprogs/files/disable-xfs_scrub-build.patch new file mode 100644 index 0000000000..c07b4b50b5 --- /dev/null +++ b/meta-filesystems/recipes-utils/xfsprogs/files/disable-xfs_scrub-build.patch @@ -0,0 +1,30 @@ +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 + diff --git a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.14.0.bb b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.17.0.bb index 5d76afe000..06f774d875 100644 --- a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.14.0.bb +++ b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.17.0.bb @@ -8,9 +8,10 @@ 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 \ " -SRC_URI[md5sum] = "2d50e3751cc98e6c9364bc3d2297b9fd" -SRC_URI[sha256sum] = "b1b710b268bc95d6f45eca06e1262c29eb38865a19cd4404e48ba446e043b7ec" +SRC_URI[md5sum] = "b935b693dfac0264e232c3c4e52d5569" +SRC_URI[sha256sum] = "f53f5169cb98cfca471ddea30092738c427ba284c5356e01b45dd1ae3b297e0d" inherit autotools-brokensep |