diff options
Diffstat (limited to 'meta-openembedded/meta-filesystems')
29 files changed, 292 insertions, 514 deletions
diff --git a/meta-openembedded/meta-filesystems/README b/meta-openembedded/meta-filesystems/README index 97d0e94bf..ac0035a98 100644 --- a/meta-openembedded/meta-filesystems/README +++ b/meta-openembedded/meta-filesystems/README @@ -10,30 +10,30 @@ Dependencies This layer depends on: URI: git://git.openembedded.org/bitbake - branch: master + branch: 1.40 URI: git://git.openembedded.org/openembedded-core layers: meta - branch: master + branch: thud URI: git://git.openembedded.org/meta-openembedded layers: meta-oe - branch: master + branch: thud Patches ======= Please submit any patches against the filesystems layer to the OpenEmbedded development mailing list (openembedded-devel@lists.openembedded.org) -with '[meta-filesystems]' in the subject. +with '[meta-filesystems][thud]' in the subject. -Layer maintainer: Armin Kuster <akuster808@gmail.com> +Thud maintainer: Armin Kuster <akuster808@gmail.com> When sending single patches, please use something like: git send-email -1 -M \ --to openembedded-devel@lists.openembedded.org \ - --subject-prefix=meta-filesystems][PATCH + --subject-prefix=meta-filesystems][thud][PATCH Table of Contents diff --git a/meta-openembedded/meta-filesystems/conf/layer.conf b/meta-openembedded/meta-filesystems/conf/layer.conf index dbcff42d4..002f09976 100644 --- a/meta-openembedded/meta-filesystems/conf/layer.conf +++ b/meta-openembedded/meta-filesystems/conf/layer.conf @@ -15,4 +15,4 @@ LAYERVERSION_filesystems-layer = "1" LAYERDEPENDS_filesystems-layer = "core openembedded-layer" -LAYERSERIES_COMPAT_filesystems-layer = "sumo" +LAYERSERIES_COMPAT_filesystems-layer = "thud" diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-include-sys-sysmacros.h-for-major-minor-definition.patch b/meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-include-sys-sysmacros.h-for-major-minor-definition.patch new file mode 100644 index 000000000..86bb0b53a --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-include-sys-sysmacros.h-for-major-minor-definition.patch @@ -0,0 +1,24 @@ +From 3b02acbb3d5bc93422a6821ce47568633ef4ae5e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 11 Aug 2018 15:09:24 -0700 +Subject: [PATCH] include sys/sysmacros.h for major/minor definition + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + mkfs.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mkfs.c b/mkfs.c +index e612cbd..b6aa63d 100644 +--- a/mkfs.c ++++ b/mkfs.c +@@ -21,6 +21,7 @@ + #include <sys/ioctl.h> + #include <sys/stat.h> + #include <sys/types.h> ++#include <sys/sysmacros.h> + #define __USE_UNIX98 + #include <unistd.h> + #include <zlib.h> diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb index 1b4d97d76..d9864ac3e 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb @@ -14,6 +14,7 @@ DEPENDS = "zlib" SRC_URI = "git://github.com/prasad-joshi/logfsprogs.git \ file://0001-Add-LDFLAGS-to-linker-cmdline.patch \ file://0001-btree-Avoid-conflicts-with-libc-namespace-about-setk.patch \ + file://0001-include-sys-sysmacros.h-for-major-minor-definition.patch \ " SRCREV = "45b72c81ce3c6fa17ca19bafc207ea93e76312f4" diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb index 9e77766e6..addb4d351 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb @@ -13,6 +13,9 @@ S = "${WORKDIR}/ntfs-3g_ntfsprogs-${PV}" SRC_URI[md5sum] = "d97474ae1954f772c6d2fa386a6f462c" SRC_URI[sha256sum] = "3e5a021d7b761261836dcb305370af299793eedbded731df3d6943802e1262d5" +UPSTREAM_CHECK_URI = "https://www.tuxera.com/community/open-source-ntfs-3g/" +UPSTREAM_CHECK_REGEX = "ntfs-3g_ntfsprogs-(?P<pver>\d+(\.\d+)+)\.tgz" + inherit autotools pkgconfig PACKAGECONFIG ??= "" diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/0001-include-sys-sysmacros.h-for-major.patch b/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/0001-include-sys-sysmacros.h-for-major.patch new file mode 100644 index 000000000..0a990ac68 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/0001-include-sys-sysmacros.h-for-major.patch @@ -0,0 +1,46 @@ +From dd1af7541f18399bcdcb129a8b6618c18ebd9d63 Mon Sep 17 00:00:00 2001 +From: Tomasz Torcz <tomek@pipebreaker.pl> +Date: Sat, 17 Mar 2018 12:56:04 +0100 +Subject: [PATCH] include <sys/sysmacros.h> for major() + + Linux glibc ceased to include it in sys/types.h: +https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 2 +- + module/owlib/src/include/ow.h | 6 +++++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 86751bf7..d625d3f0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -180,7 +180,7 @@ m4_include([src/scripts/m4/acx_pthread.m4]) + # Checks for header files. + AC_HEADER_DIRENT + AC_HEADER_STDC +-AC_CHECK_HEADERS([asm/types.h arpa/inet.h sys/ioctl.h sys/mkdev.h sys/socket.h sys/time.h sys/times.h sys/types.h sys/param.h sys/uio.h feature_tests.h fcntl.h netinet/in.h stdlib.h string.h strings.h sys/file.h syslog.h termios.h unistd.h limits.h stdint.h features.h getopt.h resolv.h semaphore.h]) ++AC_CHECK_HEADERS([asm/types.h arpa/inet.h sys/ioctl.h sys/mkdev.h sys/socket.h sys/sysmacros.h sys/time.h sys/times.h sys/types.h sys/param.h sys/uio.h feature_tests.h fcntl.h netinet/in.h stdlib.h string.h strings.h sys/file.h syslog.h termios.h unistd.h limits.h stdint.h features.h getopt.h resolv.h semaphore.h]) + AC_CHECK_HEADERS([linux/limits.h linux/types.h netdb.h dlfcn.h]) + AC_CHECK_HEADERS(sys/event.h sys/inotify.h) + +diff --git a/module/owlib/src/include/ow.h b/module/owlib/src/include/ow.h +index 9dbec5f3..0a310552 100644 +--- a/module/owlib/src/include/ow.h ++++ b/module/owlib/src/include/ow.h +@@ -188,8 +188,12 @@ + #include <netdb.h> /* for getaddrinfo */ + #endif /* HAVE_NETDB_H */ + ++#ifdef HAVE_SYS_SYSMACROS_H ++#include <sys/sysmacros.h> /* for major() */ ++#endif /* HAVE_SYS_SYSMACROS_H */ ++ + #ifdef HAVE_SYS_MKDEV_H +-#include <sys/mkdev.h> /* for major() */ ++#include <sys/mkdev.h> /* for major() on Solaris */ + #endif /* HAVE_SYS_MKDEV_H */ + + #include <stddef.h> // for offsetof() diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_2.9p1.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p2.bb index 21fd7e93e..50865cccd 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_2.9p1.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p2.bb @@ -4,18 +4,21 @@ HOMEPAGE = "http://www.owfs.org/" SECTION = "console/network" LICENSE = "GPLv2 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=a0bc427f423a41220ab79a0b392218bd \ - file://COPYING.LIB;md5=865c4bd642d9e04f43925ad7e929ae87" +LIC_FILES_CHKSUM = "file://COPYING;md5=12a64df1cc87275e940cab05ee75c37d \ + file://COPYING.LIB;md5=16ff3ffebed582e19ea7a4f48ec77b42" DEPENDS = "fuse virtual/libusb0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/owfs/owfs-${PV}.tar.gz \ +# v3.2p2 +SRCREV = "93c1f36d9ac481075287da331d5184f590f8c0fa" +SRC_URI = "git://github.com/owfs/owfs \ file://owhttpd \ - file://owserver " -SRC_URI[md5sum] = "56ba145be208002e58775a7203369851" -SRC_URI[sha256sum] = "9d22dbff72d235476688c02669f7171b23e21dffadf40bbdd3b8263908218424" + file://owserver \ + file://0001-include-sys-sysmacros.h-for-major.patch \ + " + +S = "${WORKDIR}/git" -inherit autotools-brokensep update-rc.d +inherit autotools-brokensep update-rc.d pkgconfig EXTRA_OECONF = " \ --with-fuseinclude=${STAGING_INCDIR} \ diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb index 67c926b2c..6095e27a7 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb @@ -5,7 +5,9 @@ SECTION = "base" HOMEPAGE = "http://www.yaffs.net" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://utils/mkyaffs2image.c;beginline=12;endline=14;md5=5f5464f9b3e981ca574e65b00e438561" +LIC_FILES_CHKSUM = "file://utils/mkyaffs2image.c;beginline=11;endline=13;md5=5f5464f9b3e981ca574e65b00e438561 \ + file://utils/mkyaffsimage.c;beginline=10;endline=12;md5=5f5464f9b3e981ca574e65b00e438561 \ + " PV = "0.0+git${SRCPV}" @@ -17,7 +19,10 @@ SRC_URI = "git://www.aleph1.co.uk/yaffs2;protocol=git;branch=master \ file://0001-define-loff_t-if-not-already-defined.patch \ " -SRCREV = "bc76682d93955cfb33051beb503ad9f8a5450578" +SRCREV = "3439fa4e60dd9799766b2c101f799ed9e565b632" + +UPSTREAM_CHECK_COMMITS = "1" + S = "${WORKDIR}/git" CFLAGS_append = " -I.. -DCONFIG_YAFFS_UTIL -DCONFIG_YAFFS_DEFINES_TYPES" diff --git a/meta-openembedded/meta-filesystems/recipes-support/fuse/files/CVE-2018-10906-1.patch b/meta-openembedded/meta-filesystems/recipes-support/fuse/files/CVE-2018-10906-1.patch deleted file mode 100644 index 83bef3022..000000000 --- a/meta-openembedded/meta-filesystems/recipes-support/fuse/files/CVE-2018-10906-1.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 28bdae3d113ef479c1660a581ef720cdc33bf466 Mon Sep 17 00:00:00 2001 -From: Jann Horn <jannh@google.com> -Date: Fri, 13 Jul 2018 15:15:36 -0700 -Subject: [PATCH] fusermount: don't feed "escaped commas" into mount options - -The old code permits the following behavior: - -$ _FUSE_COMMFD=10000 priv_strace -etrace=mount -s200 fusermount -o 'foobar=\,allow_other' mount -mount("/dev/fuse", ".", "fuse", MS_NOSUID|MS_NODEV, "foobar=\\,allow_other,fd=3,rootmode=40000,user_id=1000,group_id=1000") = -1 EINVAL (Invalid argument) - -However, backslashes do not have any special meaning for the kernel here. - -As it happens, you can't abuse this because there is no FUSE mount option -that takes a string value that can contain backslashes; but this is very -brittle. Don't interpret "escape characters" in places where they don't -work. - -CVE: CVE-2018-10906 -Upstream-Status: Backport [https://github.com/libfuse/libfuse/commit/28bdae3d113ef479c1660a581ef720cdc33bf466] - -Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> ---- - util/fusermount.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/util/fusermount.c b/util/fusermount.c -index 0e1d34d..143bd4a 100644 ---- a/util/fusermount.c -+++ b/util/fusermount.c -@@ -29,6 +29,7 @@ - #include <sys/socket.h> - #include <sys/utsname.h> - #include <sched.h> -+#include <stdbool.h> - - #define FUSE_COMMFD_ENV "_FUSE_COMMFD" - -@@ -754,8 +755,10 @@ static int do_mount(const char *mnt, char **typep, mode_t rootmode, - unsigned len; - const char *fsname_str = "fsname="; - const char *subtype_str = "subtype="; -+ bool escape_ok = begins_with(s, fsname_str) || -+ begins_with(s, subtype_str); - for (len = 0; s[len]; len++) { -- if (s[len] == '\\' && s[len + 1]) -+ if (escape_ok && s[len] == '\\' && s[len + 1]) - len++; - else if (s[len] == ',') - break; --- -2.13.3 - diff --git a/meta-openembedded/meta-filesystems/recipes-support/fuse/files/CVE-2018-10906-2.patch b/meta-openembedded/meta-filesystems/recipes-support/fuse/files/CVE-2018-10906-2.patch deleted file mode 100644 index 104aa171b..000000000 --- a/meta-openembedded/meta-filesystems/recipes-support/fuse/files/CVE-2018-10906-2.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 5018a0c016495155ee598b7e0167b43d5d902414 Mon Sep 17 00:00:00 2001 -From: Jann Horn <jannh@google.com> -Date: Sat, 14 Jul 2018 03:47:50 -0700 -Subject: [PATCH] fusermount: refuse unknown options - -Blacklists are notoriously fragile; especially if the kernel wishes to add -some security-critical mount option at a later date, all existing systems -with older versions of fusermount installed will suddenly have a security -problem. -Additionally, if the kernel's option parsing became a tiny bit laxer, the -blacklist could probably be bypassed. - -Whitelist known-harmless flags instead, even if it's slightly more -inconvenient. - -CVE: CVE-2018-10906 -Upstream-Status: Backport [https://github.com/libfuse/libfuse/commit/5018a0c016495155ee598b7e0167b43d5d902414] - -Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> ---- - util/fusermount.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/util/fusermount.c b/util/fusermount.c -index 4e0f51a..2792407 100644 ---- a/util/fusermount.c -+++ b/util/fusermount.c -@@ -819,10 +819,16 @@ static int do_mount(const char *mnt, char **typep, mode_t rootmode, - flags |= flag; - else - flags &= ~flag; -- } else { -+ } else if (opt_eq(s, len, "default_permissions") || -+ opt_eq(s, len, "allow_other") || -+ begins_with(s, "max_read=") || -+ begins_with(s, "blksize=")) { - memcpy(d, s, len); - d += len; - *d++ = ','; -+ } else { -+ fprintf(stderr, "%s: unknown option '%.*s'\n", progname, len, s); -+ exit(1); - } - } - } --- -2.13.3 - diff --git a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse_2.9.7.bb b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse_2.9.8.bb index 1eb9b7007..caa75c7f5 100644 --- a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse_2.9.7.bb +++ b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse_2.9.8.bb @@ -15,11 +15,12 @@ SRC_URI = "https://github.com/libfuse/libfuse/releases/download/${BP}/${BP}.tar. file://aarch64.patch \ file://0001-fuse-fix-the-return-value-of-help-option.patch \ file://fuse.conf \ - file://CVE-2018-10906-1.patch \ - file://CVE-2018-10906-2.patch \ " -SRC_URI[md5sum] = "9bd4ce8184745fd3d000ca2692adacdb" -SRC_URI[sha256sum] = "832432d1ad4f833c20e13b57cf40ce5277a9d33e483205fc63c78111b3358874" +SRC_URI[md5sum] = "f365e848a82504edb0b7a33df790ca78" +SRC_URI[sha256sum] = "5e84f81d8dd527ea74f39b6bc001c874c02bad6871d7a9b0c14efb57430eafe3" + +UPSTREAM_CHECK_URI = "https://github.com/libfuse/libfuse/releases" +UPSTREAM_CHECK_REGEX = "fuse\-(?P<pver>2(\.\d+)+).tar.gz" inherit autotools pkgconfig update-rc.d systemd @@ -30,7 +31,9 @@ SYSTEMD_SERVICE_${PN} = "" DEPENDS = "gettext-native" -PACKAGES =+ "fuse-utils-dbg fuse-utils libulockmgr libulockmgr-dev libulockmgr-dbg" +PACKAGES =+ "fuse-utils libulockmgr libulockmgr-dev" + +RPROVIDES_${PN}-dbg += "fuse-utils-dbg libulockmgr-dbg" RRECOMMENDS_${PN}_class-target = "kernel-module-fuse libulockmgr fuse-utils" @@ -39,13 +42,11 @@ FILES_${PN}-dev += "${libdir}/libfuse*.la" FILES_libulockmgr = "${libdir}/libulockmgr.so.*" FILES_libulockmgr-dev += "${libdir}/libulock*.la" -FILES_libulockmgr-dbg += "${libdir}/.debug/libulock*" # Forbid auto-renaming to libfuse-utils FILES_fuse-utils = "${bindir} ${base_sbindir}" -FILES_fuse-utils-dbg = "${bindir}/.debug ${base_sbindir}/.debug" DEBIAN_NOAUTONAME_fuse-utils = "1" -DEBIAN_NOAUTONAME_fuse-utils-dbg = "1" +DEBIAN_NOAUTONAME_${PN}-dbg = "1" do_configure_prepend() { # Make this explicit so overriding base_sbindir propagates properly. diff --git a/meta-openembedded/meta-filesystems/recipes-support/physfs/physfs_2.0.3.bb b/meta-openembedded/meta-filesystems/recipes-support/physfs/physfs_3.0.1.bb index dc2c10649..cc97dead5 100644 --- a/meta-openembedded/meta-filesystems/recipes-support/physfs/physfs_2.0.3.bb +++ b/meta-openembedded/meta-filesystems/recipes-support/physfs/physfs_3.0.1.bb @@ -1,7 +1,7 @@ SUMMARY = "PhysicsFS is a library to provide abstract access to various archives" HOMEAPAGE = "http://icculus.org/physfs" LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5d94e3eaaa10b00ca803ba35a3e87cde" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2668e2fb051c3e564198e146a9a2d9f0" DEPENDS = "readline zlib" inherit cmake @@ -9,5 +9,5 @@ inherit cmake PE = "1" SRC_URI = "http://icculus.org/${BPN}/downloads/${BP}.tar.bz2" -SRC_URI[md5sum] = "c2c727a8a8deb623b521b52d0080f613" -SRC_URI[sha256sum] = "ca862097c0fb451f2cacd286194d071289342c107b6fe69079c079883ff66b69" +SRC_URI[md5sum] = "359f102bcbd62accf84ef32f4863255d" +SRC_URI[sha256sum] = "b77b9f853168d9636a44f75fca372b363106f52d789d18a2f776397bf117f2f1" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/0001-libau-Define-STRIP-weakly.patch b/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/0001-libau-Define-STRIP-weakly.patch deleted file mode 100644 index 6732dc42e..000000000 --- a/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/0001-libau-Define-STRIP-weakly.patch +++ /dev/null @@ -1,37 +0,0 @@ -From daf04dc9ca1f2e4c65ec338ab439e0a792e1a8ac Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 5 Sep 2017 10:36:52 -0700 -Subject: [PATCH] libau: Define STRIP weakly - -STRIP can be set on environment to use cross version of strip utility -hardcoding to strip is not working in cross environment - -Upstream-Status: Submitted - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - libau/Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/libau/Makefile b/libau/Makefile -index 81520ac..c25eef2 100644 ---- a/libau/Makefile -+++ b/libau/Makefile -@@ -25,6 +25,7 @@ LibSoHdr = libau.h rdu.h - LibSoExport = $(addsuffix .exp, $(basename ${LibSoObj})) - LibSoExportErr = $(addsuffix .err, ${LibSoExport}) - LibSoVerScript = verscript -+STRIP ?= strip - - all: ${LibSo} - -@@ -77,7 +78,7 @@ ${LibSo}.${LibSoMajor}.${LibSoMinor}: ${LibSoObj} - ${CC} --shared -Wl,-soname,${LibSo}.${LibSoMajor} \ - -Wl,--version-script,${LibSoVerScript} \ - ${LDFLAGS} -o $@ $^ ${LDLIBS} -- strip -R EXP $@ -+ ${STRIP} -R EXP $@ - # readelf --syms --use-dynamic libau.so - - install_ulib: File = ${LibSo}.${LibSoMajor}.${LibSoMinor} diff --git a/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb b/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb index 2e855e313..6d71fc094 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb @@ -7,17 +7,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" DEPENDS = "coreutils-native aufs-util-native" DEPENDS_class-native = "" -SRCREV = "89afb1806c3d2eed8db2666ae254b77518ae3ceb" -SRC_URI = "git://git.code.sf.net/p/aufs/aufs-util;protocol=git;branch=aufs4.4 \ - https://raw.githubusercontent.com/sfjro/aufs4-linux/aufs4.4/include/uapi/linux/aufs_type.h;name=aufs_type \ +SRCREV = "8f35db59ef83078f87879ec2828e0bb45719e0ef" +SRC_URI = "git://git.code.sf.net/p/aufs/aufs-util;protocol=git;branch=aufs4.9 \ + https://raw.githubusercontent.com/sfjro/aufs4-linux/aufs4.9/include/uapi/linux/aufs_type.h;name=aufs_type \ file://aufs-util-don-t-strip-executables.patch \ file://aufs-util-add-tool-concept-to-Makefile-for-cross-com.patch \ - file://0001-libau-Define-STRIP-weakly.patch \ " -SRC_URI[aufs_type.md5sum] = "f7b4a255dcb55fe7b0967f5f59b44f19" -SRC_URI[aufs_type.sha256sum] = "85bc8e4c1a94a7d526c382e4b047b4256cab8c4a65fc0396291707ad9a327a18" +SRC_URI[aufs_type.md5sum] = "b37129ef0703de72a852db7e48bdedc6" +SRC_URI[aufs_type.sha256sum] = "7ff6566adb9c7a3b6862cdc85a690ab546f1d0bc81ddd595fd663c0a69031683" -PV = "4.4+git${SRCPV}" +UPSTREAM_CHECK_COMMITS = "1" + +PV = "4.9+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch b/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch new file mode 100644 index 000000000..0a3261b4e --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch @@ -0,0 +1,29 @@ +From 0fb9d6bc25e903f7831a38468845ea143fb5afd5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 11 Aug 2018 18:49:03 -0700 +Subject: [PATCH] f2fs-tools: Use srcdir prefix to denote include path + +This helps builds when builddir != srcdir + +Upstream-Status: Submitted [https://lkml.org/lkml/2018/8/12/1] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tools/sg_write_buffer/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/sg_write_buffer/Makefile.am b/tools/sg_write_buffer/Makefile.am +index 922c328..19c438d 100644 +--- a/tools/sg_write_buffer/Makefile.am ++++ b/tools/sg_write_buffer/Makefile.am +@@ -1,7 +1,7 @@ + ## Makefile.am + + if LINUX +-AM_CPPFLAGS = -I./include ++AM_CPPFLAGS = -I$(srcdir)/include + AM_CFLAGS = -Wall + sbin_PROGRAMS = sg_write_buffer + sg_write_buffer_SOURCES = sg_write_buffer.c \ +-- +2.18.0 + diff --git a/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-Fix-mkfs-out-of-tree-builds.patch b/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-Fix-mkfs-out-of-tree-builds.patch deleted file mode 100644 index 9e561cb11..000000000 --- a/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-Fix-mkfs-out-of-tree-builds.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0731eefd389e01419f78a115e1363ed0c28cfd3a Mon Sep 17 00:00:00 2001 -From: "Yong, Jonathan" <jonathan.yong@intel.com> -Date: Thu, 30 Mar 2017 08:03:37 +0000 -Subject: [PATCH] Fix mkfs out of tree builds - -Libraries are built in builddir, not srcdir, fix Makefile.am -accordingly. - -Signed-off-by: Yong, Jonathan <jonathan.yong@intel.com> -Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> - -The patch was imported from the f2fs-tools repo -(git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git) -commit ID 0731eefd389e01419f78a115e1363ed0c28cfd3a. - -Upstream-Status: Accepted, expected to be included in 1.9.0. - -Signed-off-by: Yong, Jonathan <jonathan.yong@intel.com> - ---- - mkfs/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mkfs/Makefile.am b/mkfs/Makefile.am -index 162a0cf..0ea8b49 100644 ---- a/mkfs/Makefile.am -+++ b/mkfs/Makefile.am -@@ -10,5 +10,5 @@ lib_LTLIBRARIES = libf2fs_format.la - libf2fs_format_la_SOURCES = f2fs_format_main.c f2fs_format.c f2fs_format_utils.c - libf2fs_format_la_CFLAGS = -DWITH_BLKDISCARD - libf2fs_format_la_CPPFLAGS = -I$(top_srcdir)/include --libf2fs_format_la_LDFLAGS = -luuid -L$(top_srcdir)/lib -lf2fs \ -+libf2fs_format_la_LDFLAGS = -luuid -L$(top_builddir)/lib -lf2fs \ - -version-info $(FMT_CURRENT):$(FMT_REVISION):$(FMT_AGE) --- -2.10.2 - diff --git a/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.8.0.bb b/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.11.0.bb index 691cb6ea0..2240049d4 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.8.0.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.11.0.bb @@ -7,10 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=362b4b2594cd362b874a97718faa51d3" # to provide libuuid DEPENDS = "util-linux" -SRCREV = "1e7aedf99b85d16f94d1d8ad2fcf846403bb2174" +# v1.11.0 +SRCREV = "b98fab3666e498c2e27ad9dcda6874c9b683f06b" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git \ - file://0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch \ - file://0002-Fix-mkfs-out-of-tree-builds.patch" + file://0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch \ + file://0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch \ + " S = "${WORKDIR}/git" inherit pkgconfig autotools diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0001-Include-fcntl.h-for-O_EXCL.patch b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0001-Include-fcntl.h-for-O_EXCL.patch deleted file mode 100644 index 660468d73..000000000 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0001-Include-fcntl.h-for-O_EXCL.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 8cf48da5f645dd7bbb1ccbeab5bb0964f40f17f7 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 13 Jul 2017 23:18:47 -0700 -Subject: [PATCH 1/5] Include fcntl.h for O_EXCL - -Fix -error: 'O_CREAT' undeclared (first use in this function) - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - invutil/invidx.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/invutil/invidx.c b/invutil/invidx.c -index 67efdf7..325a9a1 100644 ---- a/invutil/invidx.c -+++ b/invutil/invidx.c -@@ -27,6 +27,7 @@ - #include <sys/stat.h> - #include <string.h> - #include <uuid/uuid.h> -+#include <fcntl.h> - - #include "types.h" - #include "mlog.h" --- -2.13.2 - diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-Use-c99-defined-int64_t-instead-of-__int64_t.patch b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-Use-c99-defined-int64_t-instead-of-__int64_t.patch deleted file mode 100644 index 1fe1bde8b..000000000 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-Use-c99-defined-int64_t-instead-of-__int64_t.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f1e822d546e08cc195eaeb38ca172bd0c3800aa9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -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 <raj.khem@gmail.com> ---- -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-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0002-Replace-__uint32_t-with-uint32_t.patch b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0002-Replace-__uint32_t-with-uint32_t.patch deleted file mode 100644 index ed3e0a9e9..000000000 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0002-Replace-__uint32_t-with-uint32_t.patch +++ /dev/null @@ -1,122 +0,0 @@ -From f76d2142905f0e5bd830d5d576c235af1171c6ac Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 13 Jul 2017 23:23:31 -0700 -Subject: [PATCH 2/5] Replace __uint32_t with uint32_t - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - common/content_inode.h | 4 ++-- - doc/xfsdump.html | 8 ++++---- - inventory/inv_oref.h | 2 +- - inventory/inv_priv.h | 4 ++-- - inventory/inventory.h | 2 +- - 5 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/common/content_inode.h b/common/content_inode.h -index a69a9a0..6936e05 100644 ---- a/common/content_inode.h -+++ b/common/content_inode.h -@@ -191,10 +191,10 @@ typedef struct bstat bstat_t; - * and using two 16bit values to hold new 32bit projid was choosen - * to retain compatibility with "old" filesystems). - */ --static inline __uint32_t -+static inline uint32_t - bstat_projid(struct bstat *bs) - { -- return (__uint32_t)bs->bs_projid_hi << 16 | bs->bs_projid_lo; -+ return (uint32_t)bs->bs_projid_hi << 16 | bs->bs_projid_lo; - } - - -diff --git a/doc/xfsdump.html b/doc/xfsdump.html -index 9c6722e..f85128f 100644 ---- a/doc/xfsdump.html -+++ b/doc/xfsdump.html -@@ -1935,7 +1935,7 @@ The files are constructed like so: - <pre> - typedef struct invt_counter { - INVT_COUNTER_FIELDS -- __uint32_t ic_vernum;/* on disk version number for posterity */\ -+ uint32_t ic_vernum;/* on disk version number for posterity */\ - u_int ic_curnum;/* number of sessions/invindices recorded \ - so far */ \ - u_int ic_maxnum;/* maximum number of sessions/inv_indices \ -@@ -1975,7 +1975,7 @@ typedef struct invt_fstab { - <pre> - typedef struct invt_counter { - INVT_COUNTER_FIELDS -- __uint32_t ic_vernum;/* on disk version number for posterity */\ -+ uint32_t ic_vernum;/* on disk version number for posterity */\ - u_int ic_curnum;/* number of sessions/invindices recorded \ - so far */ \ - u_int ic_maxnum;/* maximum number of sessions/inv_indices \ -@@ -2012,7 +2012,7 @@ typedef struct invt_entry { - <pre> - typedef struct invt_sescounter { - INVT_COUNTER_FIELDS -- __uint32_t ic_vernum;/* on disk version number for posterity */\ -+ uint32_t ic_vernum;/* on disk version number for posterity */\ - u_int ic_curnum;/* number of sessions/invindices recorded \ - so far */ \ - u_int ic_maxnum;/* maximum number of sessions/inv_indices \ -@@ -2034,7 +2034,7 @@ typedef struct invt_seshdr { - off64_t sh_streams_off; /* offset to start of the set of - stream hdrs */ - time_t sh_time; /* time of the dump */ -- __uint32_t sh_flag; /* for misc flags */ -+ uint32_t sh_flag; /* for misc flags */ - u_char sh_level; /* dump level */ - u_char sh_pruned; /* pruned by invutil flag */ - char sh_padding[22]; -diff --git a/inventory/inv_oref.h b/inventory/inv_oref.h -index e16684d..38303a4 100644 ---- a/inventory/inv_oref.h -+++ b/inventory/inv_oref.h -@@ -46,7 +46,7 @@ - - - --typedef __uint32_t invt_objtype_t; -+typedef uint32_t invt_objtype_t; - - #define INVT_LOCKED 0x0001 - -diff --git a/inventory/inv_priv.h b/inventory/inv_priv.h -index 1690271..364ffbc 100644 ---- a/inventory/inv_priv.h -+++ b/inventory/inv_priv.h -@@ -120,7 +120,7 @@ typedef struct invt_seshdr { - off64_t sh_streams_off; /* offset to start of the set of - stream hdrs */ - time32_t sh_time; /* time of the dump */ -- __uint32_t sh_flag; /* for misc flags */ -+ uint32_t sh_flag; /* for misc flags */ - u_char sh_level; /* dump level */ - u_char sh_pruned; /* pruned by invutil flag */ - char sh_padding[22]; -@@ -184,7 +184,7 @@ typedef struct invt_entry { - - /* Cheap Inheritance, and an attempt to avoid a nested type */ - #define INVT_COUNTER_FIELDS \ -- __uint32_t ic_vernum;/* on disk version number for posterity */\ -+ uint32_t ic_vernum;/* on disk version number for posterity */\ - uint ic_curnum;/* number of sessions/invindices recorded \ - so far */ \ - uint ic_maxnum;/* maximum number of sessions/inv_indices \ -diff --git a/inventory/inventory.h b/inventory/inventory.h -index 134b9ba..c1d7403 100644 ---- a/inventory/inventory.h -+++ b/inventory/inventory.h -@@ -43,7 +43,7 @@ - /* length of labels, mntpts, etc */ - #define INV_STRLEN GLOBAL_HDR_STRING_SZ - --typedef __uint32_t inv_version_t; -+typedef uint32_t inv_version_t; - - /* This is the general inventory version. - */ --- -2.13.2 - diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0003-replace-use-of-SIGCLD-with-SIGCHLD.patch b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0003-replace-use-of-SIGCLD-with-SIGCHLD.patch deleted file mode 100644 index 31303d8fa..000000000 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0003-replace-use-of-SIGCLD-with-SIGCHLD.patch +++ /dev/null @@ -1,40 +0,0 @@ -From fcc0cf15a309947103a0695b8a1f4865b820eb5c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 13 Jul 2017 23:26:03 -0700 -Subject: [PATCH 3/5] replace use of SIGCLD with SIGCHLD - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - common/main.c | 2 +- - doc/xfsdump.html | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/common/main.c b/common/main.c -index 3848499..faa66ee 100644 ---- a/common/main.c -+++ b/common/main.c -@@ -2225,7 +2225,7 @@ static sig_printmap_t sig_printmap[ ] = { - {SIGTERM, "SIGTERM"}, - {SIGUSR1, "SIGUSR1"}, - {SIGUSR2, "SIGUSR2"}, -- {SIGCLD, "SIGCLD"}, -+ {SIGCHLD, "SIGCHLD"}, - {SIGPWR, "SIGPWR"}, - {SIGURG, "SIGURG"}, - {SIGPOLL, "SIGPOLL"}, -diff --git a/doc/xfsdump.html b/doc/xfsdump.html -index f85128f..d96f037 100644 ---- a/doc/xfsdump.html -+++ b/doc/xfsdump.html -@@ -334,7 +334,7 @@ the ring buffer. It ignores signals and does not terminate until it - receives a RING_OP_DIE message. It then exits 0. - <p> - The main process sleeps waiting for any of its children to die --(ie. waiting for a SIGCLD). All children that it cares about (stream -+(ie. waiting for a SIGCHLD). All children that it cares about (stream - managers and ring buffer slaves) are registered through the child - manager abstraction. When a child dies wait status and other info is - stored with its entry in the child manager. main() ignores the deaths --- -2.13.2 - diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0004-include-limit.h-for-PATH_MAX.patch b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0004-include-limit.h-for-PATH_MAX.patch deleted file mode 100644 index 62ea15b86..000000000 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0004-include-limit.h-for-PATH_MAX.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 98c7d96f0f2c6eddf60aa4a1a08d7d4467645930 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 13 Jul 2017 23:28:10 -0700 -Subject: [PATCH 4/5] include limit.h for PATH_MAX - -fixed -var.c:42:12: error: 'PATH_MAX' undeclared (first use in this function); did you mean 'RAND_MAX'? - char path[PATH_MAX];` - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - dump/var.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dump/var.c b/dump/var.c -index 645caab..8156d37 100644 ---- a/dump/var.c -+++ b/dump/var.c -@@ -16,6 +16,7 @@ - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -+#include <limits.h> - #include <unistd.h> - #include <stdlib.h> - #include <sys/stat.h> --- -2.13.2 - diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0005-include-sys-types.h-for-u_int32_t-in-attr-attributes.patch b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0005-include-sys-types.h-for-u_int32_t-in-attr-attributes.patch deleted file mode 100644 index fb6e467c9..000000000 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0005-include-sys-types.h-for-u_int32_t-in-attr-attributes.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d95f494de1aa8123c74170ffebaed8ea89649da2 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 13 Jul 2017 23:33:44 -0700 -Subject: [PATCH 5/5] include sys/types.h for u_int32_t in attr/attributes.h - -error: unknown type name 'u_int32_t' - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - restore/content.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/restore/content.c b/restore/content.c -index 7c4a81f..1d5de1b 100644 ---- a/restore/content.c -+++ b/restore/content.c -@@ -24,6 +24,7 @@ - #include <sys/param.h> - #include <sys/stat.h> - #include <sys/ioctl.h> -+#include <sys/types.h> - #include <attr/attributes.h> - #include <xfs/handle.h> - #include <time.h> --- -2.13.2 - diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.7.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb index 39f11890e..54ab30cbb 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.7.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb @@ -12,15 +12,9 @@ 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" +SRC_URI[md5sum] = "84d3bc287b4a2bb5d16b2320a47049a7" +SRC_URI[sha256sum] = "ed14e67ae5b273c2698e767b43a46f033d361e540fe13feaaf9b110ee0edc585" inherit autotools-brokensep diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-Check-for-MAP_SYNC-in-sys-mman.h.patch b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-Check-for-MAP_SYNC-in-sys-mman.h.patch new file mode 100644 index 000000000..75b227ac1 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-Check-for-MAP_SYNC-in-sys-mman.h.patch @@ -0,0 +1,52 @@ +From f41ef1f06d428c81fcdef73d896dfc7ceda1809c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 23 Aug 2018 04:59:39 +0000 +Subject: [PATCH] Check for MAP_SYNC in sys/mman.h + +Not all arches have wired MAP_SYNC e.g. mips +which have conflicts with definition, so checking +a generic file is going to mis-configure xfsprogs +for such arches. + +libc now has added the relevant macros to +sys/mman.h, and returns the right values for arches +where its implemented and nothing for others +unlike asm-generic/mman.h which only checks +for kernel headers and ignored arches + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + include/linux.h | 3 +-- + m4/package_libcdev.m4 | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/include/linux.h b/include/linux.h +index 1998941..7e5c9ab 100644 +--- a/include/linux.h ++++ b/include/linux.h +@@ -331,8 +331,7 @@ fsmap_advance( + #define MAP_SYNC 0 + #define MAP_SHARED_VALIDATE 0 + #else +-#include <asm-generic/mman.h> +-#include <asm-generic/mman-common.h> ++#include <sys/mman.h> + #endif /* HAVE_MAP_SYNC */ + + #endif /* __XFS_LINUX_H__ */ +diff --git a/m4/package_libcdev.m4 b/m4/package_libcdev.m4 +index 0a6b514..2b47d2f 100644 +--- a/m4/package_libcdev.m4 ++++ b/m4/package_libcdev.m4 +@@ -335,8 +335,7 @@ AC_DEFUN([AC_HAVE_STATFS_FLAGS], + AC_DEFUN([AC_HAVE_MAP_SYNC], + [ AC_MSG_CHECKING([for MAP_SYNC]) + AC_TRY_COMPILE([ +-#include <asm-generic/mman.h> +-#include <asm-generic/mman-common.h> ++#include <sys/mman.h> + ], [ + int flags = MAP_SYNC | MAP_SHARED_VALIDATE; + ], have_map_sync=yes diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-build-Check-for-sync_file_range-libc-function.patch b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-build-Check-for-sync_file_range-libc-function.patch index d8ff55531..231da806c 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-build-Check-for-sync_file_range-libc-function.patch +++ b/meta-openembedded/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 <raj.khem@gmail.com> 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 <raj.khem@gmail.com> ---- Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- 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-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0002-include-include-xfs-linux.h-after-sys-mman.h.patch b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0002-include-include-xfs-linux.h-after-sys-mman.h.patch new file mode 100644 index 000000000..f924cd1a1 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0002-include-include-xfs-linux.h-after-sys-mman.h.patch @@ -0,0 +1,33 @@ +From 11a42df394de3dc520e72a016296dcc6dea02a7a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 23 Aug 2018 05:33:57 +0000 +Subject: [PATCH] include include/xfs/linux.h after <sys/mman.h> + +This helps compiling with musl which goes ahead and undefines MAP_SYNC +for mips and other architectures where its not wired in kernel + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + io/mmap.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/io/mmap.c b/io/mmap.c +index dbfcca5..ca00df1 100644 +--- a/io/mmap.c ++++ b/io/mmap.c +@@ -4,10 +4,11 @@ + * All Rights Reserved. + */ + +-#include "command.h" +-#include "input.h" + #include <sys/mman.h> + #include <signal.h> ++ ++#include "command.h" ++#include "input.h" + #include "init.h" + #include "io.h" + diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/disable-xfs_scrub-build.patch b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/disable-xfs_scrub-build.patch new file mode 100644 index 000000000..c07b4b50b --- /dev/null +++ b/meta-openembedded/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-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.14.0.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.18.0.bb index 5d76afe00..0a1bacb93 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.14.0.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.18.0.bb @@ -3,14 +3,18 @@ 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" +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] = "2d50e3751cc98e6c9364bc3d2297b9fd" -SRC_URI[sha256sum] = "b1b710b268bc95d6f45eca06e1262c29eb38865a19cd4404e48ba446e043b7ec" +SRC_URI[md5sum] = "5f80b631b68df89a8b9283307e96d2e8" +SRC_URI[sha256sum] = "397dc96f51aeeff73d021d3418d3172377b2685f2740ca60525096c070aa3df1" inherit autotools-brokensep @@ -47,13 +51,14 @@ export tagname="CC" EXTRA_OEMAKE = "DIST_ROOT='${D}'" -do_configure_prepend () { +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() { |
