diff options
Diffstat (limited to 'external/meta-openembedded/meta-filesystems')
39 files changed, 490 insertions, 371 deletions
diff --git a/external/meta-openembedded/meta-filesystems/README b/external/meta-openembedded/meta-filesystems/README index ac0035a9..4731d216 100644 --- a/external/meta-openembedded/meta-filesystems/README +++ b/external/meta-openembedded/meta-filesystems/README @@ -9,31 +9,28 @@ Dependencies This layer depends on: - URI: git://git.openembedded.org/bitbake - branch: 1.40 - URI: git://git.openembedded.org/openembedded-core layers: meta - branch: thud + branch: dunfell URI: git://git.openembedded.org/meta-openembedded layers: meta-oe - branch: thud + branch: dunfell Patches ======= Please submit any patches against the filesystems layer to the OpenEmbedded development mailing list (openembedded-devel@lists.openembedded.org) -with '[meta-filesystems][thud]' in the subject. +with '[meta-filesystems][dunfell]' in the subject. -Thud maintainer: Armin Kuster <akuster808@gmail.com> +dunfell 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][thud][PATCH + --subject-prefix=meta-filesystems][dunfell][PATCH Table of Contents diff --git a/external/meta-openembedded/meta-filesystems/conf/layer.conf b/external/meta-openembedded/meta-filesystems/conf/layer.conf index 002f0997..be1635de 100644 --- a/external/meta-openembedded/meta-filesystems/conf/layer.conf +++ b/external/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 = "thud" +LAYERSERIES_COMPAT_filesystems-layer = "thud warrior zeus dunfell" diff --git a/external/meta-openembedded/meta-filesystems/recipes-filesystems/fuse-exfat/fuse-exfat_1.2.3.bb b/external/meta-openembedded/meta-filesystems/recipes-filesystems/fuse-exfat/fuse-exfat_1.3.0.bb index 99bf2bed..be2415f6 100644 --- a/external/meta-openembedded/meta-filesystems/recipes-filesystems/fuse-exfat/fuse-exfat_1.2.3.bb +++ b/external/meta-openembedded/meta-filesystems/recipes-filesystems/fuse-exfat/fuse-exfat_1.3.0.bb @@ -3,19 +3,20 @@ DESCRIPTION = "fuse-exfat is a read and write driver implementing the \ extended file allocation table as a filesystem in userspace. A mounthelper \ is provided under the name mount.exfat-fuse. \ " -HOMEPAGE = "http://code.google.com/p/exfat/" +HOMEPAGE = "https://github.com/relan/exfat" SECTION = "universe/otherosfs" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "${DEBIAN_MIRROR}/main/f/fuse-exfat/fuse-exfat_${PV}.orig.tar.gz \ -" +SRC_URI = "https://github.com/relan/exfat/releases/download/v${PV}/${BP}.tar.gz" + +UPSTREAM_CHECK_URI = "https://github.com/relan/exfat/releases" + DEPENDS = "fuse virtual/libc" RRECOMMENDS_${PN} = "util-linux-mount" inherit autotools pkgconfig -SRC_URI[md5sum] = "fca71e6598f79d037a3c7c969cb5710c" -SRC_URI[sha256sum] = "f2e06eba5a21c621aac1d6da21b12a5a324fdd1e20f9c8acd357dd463c2355d9" +SRC_URI[md5sum] = "846b8c36bfa4684719f9e08e9d3a6bff" +SRC_URI[sha256sum] = "07652136064da5e4d32df5555f88c138ffa4835a23b88a5bae2015f21006e0d3" -S = "${WORKDIR}/${PN}-${PV}" EXTRA_OECONF += "sbindir=${base_sbindir}" diff --git a/external/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-base.bb b/external/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-base.bb new file mode 100644 index 00000000..c89b1e13 --- /dev/null +++ b/external/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-base.bb @@ -0,0 +1,7 @@ +SUMMARY = "meta-filesystems build test image" + +IMAGE_INSTALL = "packagegroup-core-boot" + +LICENSE = "MIT" + +inherit core-image diff --git a/external/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image.bb b/external/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image.bb new file mode 100644 index 00000000..ca21d2a0 --- /dev/null +++ b/external/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image.bb @@ -0,0 +1,3 @@ +require meta-filesystems-image-base.bb + +IMAGE_INSTALL += "packagegroup-meta-filesystems" diff --git a/external/meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb b/external/meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb index addb4d35..6f5cb6ce 100644 --- a/external/meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb +++ b/external/meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb @@ -34,10 +34,18 @@ FILES_ntfsprogs = "${base_sbindir}/* ${bindir}/* ${sbindir}/*" FILES_libntfs-3g = "${libdir}/*${SOLIBS}" do_install_append() { - # Standard mount will execute the program /sbin/mount.TYPE - # when called. Add the symbolic to let mount could find ntfs. - ln -sf mount.ntfs-3g ${D}/${base_sbindir}/mount.ntfs + # Standard mount will execute the program /sbin/mount.TYPE when called. + # Add a symbolic link to let mount find ntfs. + ln -sf mount.ntfs-3g ${D}${base_sbindir}/mount.ntfs rmdir ${D}${libdir}/ntfs-3g + + # Handle when usrmerge is in effect. Some files are installed to /sbin + # regardless of the value of ${base_sbindir}. + if [ "${base_sbindir}" != /sbin ] && [ -d ${D}/sbin ]; then + mkdir -p ${D}${base_sbindir} + mv ${D}/sbin/* ${D}${base_sbindir} + rmdir ${D}/sbin + fi } # Satisfy the -dev runtime dependency diff --git a/external/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Add-build-rule-for-README.patch b/external/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Add-build-rule-for-README.patch new file mode 100644 index 00000000..e4d52a80 --- /dev/null +++ b/external/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Add-build-rule-for-README.patch @@ -0,0 +1,25 @@ +From dfeadd4eb43e829aafb0d10f611fa22ae81bfca4 Mon Sep 17 00:00:00 2001 +From: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> +Date: Sun, 20 Oct 2019 17:00:45 +0900 +Subject: [PATCH] Add build rule for README. + +fix do_configure error: +Makefile.am: required file `./README' not found + +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> +--- + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile.am b/Makefile.am +index e0c4ad6..0449321 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -35,3 +35,4 @@ rpmcvs: preparerpm + @LN_S@ -f `pwd`/@PACKAGE@-@VERSION@.tar.gz ${RPMDIR}/SOURCES/@PACKAGE@-@VERSION@_cvs_`date +"%Y%m%d"`.tar.gz + cd ${RPMDIR}/SPECS && @RPMBUILD@ -ba @PACKAGE@.spec --define 'cvs 1' + ++README: README.md +-- +2.7.4 + diff --git a/external/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/0001-include-sys-sysmacros.h-for-major.patch b/external/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/0001-include-sys-sysmacros.h-for-major.patch deleted file mode 100644 index 0a990ac6..00000000 --- a/external/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/0001-include-sys-sysmacros.h-for-major.patch +++ /dev/null @@ -1,46 +0,0 @@ -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/external/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p2.bb b/external/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb index 50865ccc..41408444 100644 --- a/external/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p2.bb +++ b/external/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb @@ -4,21 +4,21 @@ HOMEPAGE = "http://www.owfs.org/" SECTION = "console/network" LICENSE = "GPLv2 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=12a64df1cc87275e940cab05ee75c37d \ - file://COPYING.LIB;md5=16ff3ffebed582e19ea7a4f48ec77b42" +LIC_FILES_CHKSUM = "file://COPYING;md5=628b867016631792781a8735a04760e5 \ + file://COPYING.LIB;md5=9021b7435efdd9fb22beef8291134099" DEPENDS = "fuse virtual/libusb0" -# v3.2p2 -SRCREV = "93c1f36d9ac481075287da331d5184f590f8c0fa" +# v3.2p3 +SRCREV = "3744375dfaa350e31c9b360eb1e1a517bbeb5c47" SRC_URI = "git://github.com/owfs/owfs \ + file://0001-Add-build-rule-for-README.patch \ file://owhttpd \ file://owserver \ - file://0001-include-sys-sysmacros.h-for-major.patch \ " S = "${WORKDIR}/git" -inherit autotools-brokensep update-rc.d pkgconfig +inherit autotools-brokensep update-rc.d pkgconfig systemd EXTRA_OECONF = " \ --with-fuseinclude=${STAGING_INCDIR} \ @@ -52,9 +52,12 @@ DESCRIPTION_libownet = "easy C-language 1-wire interface to the owserver protoco DESCRIPTION_owmon = "Monitor for owserver settings and statistics" DESCRIPTION_owtap = "Packet sniffer for the owserver protocol" -FILES_owftpd = "${bindir}/owftpd" -FILES_owhttpd = "${bindir}/owhttpd ${sysconfdir}/init.d/owhttpd" -FILES_owserver = "${bindir}/owserver ${sysconfdir}/init.d/owserver" +FILES_owftpd = "${bindir}/owftpd ${systemd_system_unitdir}/owftpd.service" +FILES_owhttpd = "${bindir}/owhttpd ${sysconfdir}/init.d/owhttpd \ + ${systemd_system_unitdir}/owhttpd.service" +FILES_owserver = "${bindir}/owserver ${sysconfdir}/init.d/owserver \ + ${systemd_system_unitdir}/owserver.service \ + ${systemd_system_unitdir}/owserver.socket" FILES_owshell = "${bindir}/owread ${bindir}/owwrite \ ${bindir}/owdir ${bindir}/owpresent \ ${bindir}/owget ${bindir}/owside" @@ -63,9 +66,15 @@ FILES_owtap = "${bindir}/owtap" FILES_libowcapi = "${libdir}/libowcapi-*" FILES_libow = "${libdir}/libow-*" FILES_libownet = "${libdir}/libownet-*" +FILES_${PN} += "${systemd_system_unitdir}/owfs.service" INITSCRIPT_PACKAGES = "owhttpd owserver" INITSCRIPT_NAME_owserver = "owserver" INITSCRIPT_NAME_owhttpd = "owhttpd" INITSCRIPT_PARAMS_owserver = "defaults 20" INITSCRIPT_PARAMS_owhttpd = "defaults 21" + +SYSTEMD_SERVICE_${PN} = "owfs.service" +SYSTEMD_SERVICE_${PN}-owftpd = "owftpd.service" +SYSTEMD_SERVICE_${PN}-owhttpd = "owhttpd.service" +SYSTEMD_SERVICE_${PN}-owserver = "owserver.service owserver.socket" diff --git a/external/meta-openembedded/meta-filesystems/recipes-filesystems/packageconfigs/packagegroup-meta-filesystems.bb b/external/meta-openembedded/meta-filesystems/recipes-filesystems/packageconfigs/packagegroup-meta-filesystems.bb new file mode 100644 index 00000000..86b1c9b3 --- /dev/null +++ b/external/meta-openembedded/meta-filesystems/recipes-filesystems/packageconfigs/packagegroup-meta-filesystems.bb @@ -0,0 +1,35 @@ +SUMMARY = "Meta-filesystem packagegroups" + +inherit packagegroup + +PROVIDES = "${PACKAGES}" +PACKAGES = ' \ + packagegroup-meta-filesystems \ + packagegroup-meta-filesystems-support \ + packagegroup-meta-filesystems-utls \ +' + +RDEPENDS_packagegroup-meta-filesystems = "\ + packagegroup-meta-filesystems \ + packagegroup-meta-filesystems-support \ + packagegroup-meta-filesystems-utls \ +" + +RDEPENDS_packagegroup-meta-filesystems = "\ + ntfs-3g-ntfsprogs ifuse sshfs-fuse \ + logfsprogs owfs simple-mtpfs \ + unionfs-fuse fuse-exfat yaffs2-utils \ + ${@bb.utils.contains("DISTRO_FEATURES", "pam", "smbnetfs", "", d)} \ + " + +RDEPENDS_packagegroup-meta-filesystems-support = "\ + physfs fuse \ + " + +RDEPENDS_packagegroup-meta-filesystems-utils = "\ + xorriso aufs-util xfsprogs \ + f2fs-tools exfat-utils udevil \ + xfsdump \ + " + +EXCLUDE_FROM_WORLD = "1" diff --git a/external/meta-openembedded/meta-filesystems/recipes-filesystems/simple-mtpfs/simple-mtpfs_git.bb b/external/meta-openembedded/meta-filesystems/recipes-filesystems/simple-mtpfs/simple-mtpfs_git.bb index f85977fd..595b3490 100644 --- a/external/meta-openembedded/meta-filesystems/recipes-filesystems/simple-mtpfs/simple-mtpfs_git.bb +++ b/external/meta-openembedded/meta-filesystems/recipes-filesystems/simple-mtpfs/simple-mtpfs_git.bb @@ -7,7 +7,8 @@ DEPENDS = "fuse libmtp" inherit autotools pkgconfig +# 0.3.0 SRC_URI = "git://github.com/phatina/simple-mtpfs.git;protocol=https;branch=master" -SRCREV = "a7ab64c7e4d7aca155cbc7ce9412aaf68ef6e404" +SRCREV = "c9a691fc52fafaa55d26ac629856153c0514015a" S = "${WORKDIR}/git" diff --git a/external/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch b/external/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch index 55275669..f22b389b 100644 --- a/external/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch +++ b/external/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch @@ -1,9 +1,7 @@ -Index: git/configure.in -=================================================================== ---- git.orig/configure.ac 2014-06-18 16:06:16.040721349 +0000 -+++ git/configure.ac 2014-07-18 07:49:17.085552256 +0000 +--- a/configure.ac ++++ b/configure.ac @@ -1,5 +1,5 @@ - AC_INIT([SMBNetFS],[0.6.1]) + AC_INIT([SMBNetFS],[0.6.2]) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([foreign]) AC_CONFIG_HEADERS([src/config.h]) diff --git a/external/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb b/external/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb index c72936c0..d94603b4 100644 --- a/external/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb +++ b/external/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb @@ -11,15 +11,14 @@ HOMEPAGE ="http://sourceforge.net/projects/smbnetfs" DEPENDS = "fuse samba" DEPENDS_append_libc-musl = " libexecinfo" +inherit autotools pkgconfig features_check + # samba depends on libpam -inherit distro_features_check REQUIRED_DISTRO_FEATURES = "pam" -inherit autotools gitpkgv pkgconfig - -PKGV = "${GITPKGVTAG}" +PV = "0.6.1+git${SRCPV}" -SRCREV = "bc6b94b015fdaf7c4dab56ccb996eecea8bc4373" +SRCREV = "a117eec8de7ed7249871da73dcc350283ce72069" SRC_URI = "git://smbnetfs.git.sourceforge.net/gitroot/smbnetfs/smbnetfs;branch=master \ file://configure.patch \ diff --git a/external/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/files/0001-Makefile-fix-path-for-sshfs.1.patch b/external/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/files/0001-Makefile-fix-path-for-sshfs.1.patch deleted file mode 100644 index c434a03f..00000000 --- a/external/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/files/0001-Makefile-fix-path-for-sshfs.1.patch +++ /dev/null @@ -1,32 +0,0 @@ -From e3cd445a4ee44a16faa646d7b642d02eea62b1f8 Mon Sep 17 00:00:00 2001 -From: Zoltan Kuscsik <zoltan.kuscsik@linaro.org> -Date: Fri, 1 Jul 2016 09:30:31 +0200 -Subject: [PATCH] Makefile: fix path for sshfs.1 - -Fix source path when build directory differs -from the source dir. - -Upstream-Status: Accepted - -https://github.com/libfuse/sshfs/pull/24 - ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index f003bae..3d8f9cb 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -24,7 +24,7 @@ sshfs.1: sshfs.1.in - $(AM_V_GEN)sed \ - -e 's,__IDMAP_DEFAULT__,$(IDMAP_DEFAULT),g' \ - -e 's,__UNMOUNT_COMMAND__,$(UNMOUNT_COMMAND),g' \ -- <sshfs.1.in >sshfs.1.tmp || exit 1; \ -+ <$(srcdir)/sshfs.1.in >sshfs.1.tmp || exit 1; \ - mv sshfs.1.tmp sshfs.1 - - if SSH_NODELAY_SO --- -1.9.1 - diff --git a/external/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.8.bb b/external/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.8.bb deleted file mode 100644 index 64ccdace..00000000 --- a/external/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.8.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "This is a filesystem client based on the SSH File Transfer Protocol using FUSE" -AUTHOR = "Miklos Szeredi <miklos@szeredi.hu>" -HOMEPAGE = "http://fuse.sourceforge.net/sshfs.html" -SECTION = "console/network" -LICENSE = "GPLv2" -DEPENDS = "glib-2.0 fuse" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI = "git://github.com/libfuse/sshfs;tag=b2fa7593586b141298e6159f40f521d2b0f4f894 \ - file://0001-Makefile-fix-path-for-sshfs.1.patch" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -FILES_${PN} += "${libdir}/sshnodelay.so" diff --git a/external/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.0.bb b/external/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.0.bb new file mode 100644 index 00000000..bf9c34dc --- /dev/null +++ b/external/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.0.bb @@ -0,0 +1,13 @@ +SUMMARY = "This is a filesystem client based on the SSH File Transfer Protocol using FUSE" +AUTHOR = "Miklos Szeredi <miklos@szeredi.hu>" +HOMEPAGE = "https://github.com/libfuse/sshfs" +SECTION = "console/network" +LICENSE = "GPLv2" +DEPENDS = "glib-2.0 fuse3" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://github.com/libfuse/sshfs" +SRCREV = "a7e1038203c856cc7e052d439d1da49fe131339f" +S = "${WORKDIR}/git" + +inherit meson diff --git a/external/meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/files/0001-unionfs-Define-IOCPARM_LEN-if-undefined.patch b/external/meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/files/0001-unionfs-Define-IOCPARM_LEN-if-undefined.patch deleted file mode 100644 index 8f991cd3..00000000 --- a/external/meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/files/0001-unionfs-Define-IOCPARM_LEN-if-undefined.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 10411fa8658621822ae394160daffaced4a4cd7f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 13 Jul 2017 23:07:29 -0700 -Subject: [PATCH] unionfs: Define IOCPARM_LEN if undefined - -musl does not have sysctl.h which defines this -for glibc - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/unionfs.c | 8 -------- - src/unionfs.h | 15 +++++++++++++++ - 2 files changed, 15 insertions(+), 8 deletions(-) - -diff --git a/src/unionfs.c b/src/unionfs.c -index a34d34e..51684a7 100644 ---- a/src/unionfs.c -+++ b/src/unionfs.c -@@ -21,14 +21,6 @@ - #include "opts.h" - #include "usyslog.h" - --#ifndef _IOC_SIZE --#ifdef IOCPARM_LEN --#define _IOC_SIZE(x) IOCPARM_LEN(x) --#else --#error "No mechanism for determining ioctl length found." --#endif --#endif -- - static struct fuse_opt unionfs_opts[] = { - FUSE_OPT_KEY("chroot=%s,", KEY_CHROOT), - FUSE_OPT_KEY("cow", KEY_COW), -diff --git a/src/unionfs.h b/src/unionfs.h -index 8f5e0bf..b02de5a 100644 ---- a/src/unionfs.h -+++ b/src/unionfs.h -@@ -17,6 +17,21 @@ - #define FUSE_META_FILE ".fuse_hidden" - #define FUSE_META_LENGTH 12 - -+#ifndef IOCPARM_MASK -+#define IOCPARM_MASK 0x1FFF -+#endif -+#ifndef IOCPARM_LEN -+#define IOCPARM_LEN(a) (((a) >> 16) & IOCPARM_MASK) -+#endif -+ -+#ifndef _IOC_SIZE -+#ifdef IOCPARM_LEN -+#define _IOC_SIZE(x) IOCPARM_LEN(x) -+#else -+#error "No mechanism for determining ioctl length found." -+#endif -+#endif -+ - // file access protection mask - #define S_PROT_MASK (S_ISUID| S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO) - --- -2.13.2 - diff --git a/external/meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_2.0.bb b/external/meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_2.1.bb index 6bedf16b..3dd5c82e 100644 --- a/external/meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_2.0.bb +++ b/external/meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_2.1.bb @@ -8,9 +8,8 @@ LIC_FILES_CHKSUM = "file://src/unionfs.c;beginline=3;endline=8;md5=30fa8de70fd8a SRC_URI = "git://github.com/rpodgorny/${BPN}.git;branch=master \ file://0001-support-cross-compiling.patch \ - file://0001-unionfs-Define-IOCPARM_LEN-if-undefined.patch \ " -SRCREV = "c8d23a9a75f1a62988593671839e8a168a79f3e5" +SRCREV = "8d732962423c3ca5be1f14b7ec139ff464e10a51" DEPENDS = "fuse" diff --git a/external/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb b/external/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb index 6095e27a..7ecae4c1 100644 --- a/external/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb +++ b/external/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb @@ -19,7 +19,7 @@ SRC_URI = "git://www.aleph1.co.uk/yaffs2;protocol=git;branch=master \ file://0001-define-loff_t-if-not-already-defined.patch \ " -SRCREV = "3439fa4e60dd9799766b2c101f799ed9e565b632" +SRCREV = "b4ce1bb1b46accb1619dc07164ef6945feded9db" UPSTREAM_CHECK_COMMITS = "1" @@ -43,3 +43,9 @@ do_install() { } BBCLASSEXTEND = "native" + +# Fixed make clean error: +#make -C /lib/modules/4.4.0-112-generic/build M=<snip> +#make: *** /lib/modules/4.4.0-112-generic/build: No such file or directory. Stop. +#make: *** [clean] Error 2 +CLEANBROKEN = "1" diff --git a/external/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.9.2.bb b/external/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.9.2.bb new file mode 100644 index 00000000..24b17fc9 --- /dev/null +++ b/external/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.9.2.bb @@ -0,0 +1,47 @@ +SUMMARY = "Implementation of a fully functional filesystem in a userspace program" +DESCRIPTION = "FUSE (Filesystem in Userspace) is a simple interface for userspace \ + programs to export a virtual filesystem to the Linux kernel. FUSE \ + also aims to provide a secure method for non privileged users to \ + create and mount their own filesystem implementations. \ + " +HOMEPAGE = "https://github.com/libfuse/libfuse" +SECTION = "libs" +LICENSE = "GPLv2 & LGPLv2" +LIC_FILES_CHKSUM = "file://GPL2.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LGPL2.txt;md5=4fbd65380cdd255951079008b364516c \ + file://LICENSE;md5=a55c12a2d7d742ecb41ca9ae0a6ddc66" + +SRC_URI = "https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.xz \ +" +SRC_URI[sha256sum] = "6999b6d48e7c0a79628fa901f6e66def3513cab4ffdd8097821e7dc3cdeae08a" + +S = "${WORKDIR}/fuse-${PV}" + +UPSTREAM_CHECK_URI = "https://github.com/libfuse/libfuse/releases" +UPSTREAM_CHECK_REGEX = "fuse\-(?P<pver>3(\.\d+)+).tar.xz" + +inherit meson pkgconfig + +DEPENDS = "udev" + +PACKAGES =+ "fuse3-utils" + +RPROVIDES_${PN}-dbg += "fuse3-utils-dbg" + +RRECOMMENDS_${PN}_class-target = "kernel-module-fuse fuse3-utils" + +FILES_${PN} += "${libdir}/libfuse3.so.*" +FILES_${PN}-dev += "${libdir}/libfuse3*.la" + +EXTRA_OEMESON += " \ + -Dexamples=false \ +" + +# Forbid auto-renaming to libfuse3-utils +FILES_fuse3-utils = "${bindir} ${base_sbindir}" +DEBIAN_NOAUTONAME_fuse3-utils = "1" +DEBIAN_NOAUTONAME_${PN}-dbg = "1" + +do_install_append() { + rm -rf ${D}${base_prefix}/dev +} diff --git a/external/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse_2.9.8.bb b/external/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb index caa75c7f..95e87069 100644 --- a/external/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse_2.9.8.bb +++ b/external/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb @@ -16,8 +16,8 @@ SRC_URI = "https://github.com/libfuse/libfuse/releases/download/${BP}/${BP}.tar. file://0001-fuse-fix-the-return-value-of-help-option.patch \ file://fuse.conf \ " -SRC_URI[md5sum] = "f365e848a82504edb0b7a33df790ca78" -SRC_URI[sha256sum] = "5e84f81d8dd527ea74f39b6bc001c874c02bad6871d7a9b0c14efb57430eafe3" +SRC_URI[md5sum] = "8000410aadc9231fd48495f7642f3312" +SRC_URI[sha256sum] = "d0e69d5d608cc22ff4843791ad097f554dd32540ddc9bed7638cc6fea7c1b4b5" UPSTREAM_CHECK_URI = "https://github.com/libfuse/libfuse/releases" UPSTREAM_CHECK_REGEX = "fuse\-(?P<pver>2(\.\d+)+).tar.gz" @@ -54,7 +54,7 @@ do_configure_prepend() { } do_install_append() { - rm -rf ${D}${base_prefix}/dev + rm -rf ${D}/dev # systemd class remove the sysv_initddir only if systemd_system_unitdir # contains anything, but it's not needed if sysvinit is not in DISTRO_FEATURES @@ -69,4 +69,10 @@ do_install_append() { fi } +do_install_append_class-nativesdk() { + install -d ${D}${sysconfdir} + mv ${D}/etc/* ${D}${sysconfdir}/ + rmdir ${D}/etc +} + BBCLASSEXTEND = "native nativesdk" diff --git a/external/meta-openembedded/meta-filesystems/recipes-support/physfs/physfs_3.0.1.bb b/external/meta-openembedded/meta-filesystems/recipes-support/physfs/physfs_3.0.1.bb deleted file mode 100644 index cc97dead..00000000 --- a/external/meta-openembedded/meta-filesystems/recipes-support/physfs/physfs_3.0.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -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=2668e2fb051c3e564198e146a9a2d9f0" -DEPENDS = "readline zlib" - -inherit cmake - -PE = "1" - -SRC_URI = "http://icculus.org/${BPN}/downloads/${BP}.tar.bz2" -SRC_URI[md5sum] = "359f102bcbd62accf84ef32f4863255d" -SRC_URI[sha256sum] = "b77b9f853168d9636a44f75fca372b363106f52d789d18a2f776397bf117f2f1" diff --git a/external/meta-openembedded/meta-filesystems/recipes-support/physfs/physfs_3.0.2.bb b/external/meta-openembedded/meta-filesystems/recipes-support/physfs/physfs_3.0.2.bb new file mode 100644 index 00000000..a0033fab --- /dev/null +++ b/external/meta-openembedded/meta-filesystems/recipes-support/physfs/physfs_3.0.2.bb @@ -0,0 +1,15 @@ +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=96801882d1120239dcafbf888e821a6e" +DEPENDS = "readline zlib" + +inherit cmake + +PE = "1" + +SRC_URI = "http://icculus.org/${BPN}/downloads/${BP}.tar.bz2" +SRC_URI[md5sum] = "dc751294aaf59d1359bbe34e693d1d87" +SRC_URI[sha256sum] = "304df76206d633df5360e738b138c94e82ccf086e50ba84f456d3f8432f9f863" + +EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" diff --git a/external/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb b/external/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb index 6d71fc09..b4819d8f 100644 --- a/external/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb +++ b/external/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb @@ -61,6 +61,6 @@ do_install_class-native () { done } -RRECOMMENDS_${PN} += "kernel-module-aufs" +RRECOMMENDS_${PN}_class-target += "kernel-module-aufs" BBCLASSEXTEND = "native" diff --git a/external/meta-openembedded/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.2.3.bb b/external/meta-openembedded/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb index 440f3361..7f804a70 100644 --- a/external/meta-openembedded/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.2.3.bb +++ b/external/meta-openembedded/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb @@ -7,16 +7,18 @@ contains \ - exfatlabel to label a exFAT filesystem \ - mkexfatfs / mkfs.exfat to create a exFAT filesystem. \ " -HOMEPAGE = "http://code.google.com/p/exfat/" +HOMEPAGE = "https://github.com/relan/exfat" SECTION = "universe/otherosfs" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://github.com/relan/exfat/releases/download/v${PV}/${BP}.tar.gz" +UPSTREAM_CHECK_URI = "https://github.com/relan/exfat/releases" + DEPENDS = "virtual/libc" inherit pkgconfig autotools -SRC_URI[md5sum] = "f4e564450aa8159e26dde2869563d242" -SRC_URI[sha256sum] = "80d3b3f21242d60d36a38a4ddb05cb7cc3a7d4eef5793e8314814937b938fcea" +SRC_URI[md5sum] = "f8928571b152455e828ca0bd42af8b73" +SRC_URI[sha256sum] = "dfebd07a7b907e2d603d3a9626e6440bd43ec6c4e8c07ccfc57ce9502b724835" diff --git a/external/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch b/external/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch deleted file mode 100644 index cf844bf8..00000000 --- a/external/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3b3c6e6376babcd9a0b0db312b0e1e3bb3ab833e Mon Sep 17 00:00:00 2001 -From: Sven Ebenfeld <sven.ebenfeld@vaillant.de> -Date: Wed, 26 Nov 2014 10:36:44 +0100 -Subject: [PATCH] Remove AC_CHECK_FILE for cross compilation - ---- - configure.ac | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0111e72..8c286d4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,14 +20,9 @@ AC_DEFINE([F2FS_MINOR_VERSION], m4_bpatsubst(f2fs_tools_version, - [\([0-9]*\).\([0-9]*\)\(\w\|\W\)*], [\2]), - [Minor version for f2fs-tools]) - --AC_CHECK_FILE(.git, -- AC_DEFINE([F2FS_TOOLS_DATE], -- "m4_bpatsubst(f2fs_tools_gitdate, -- [\([0-9-]*\)\(\w\|\W\)*], [\1])", -- [f2fs-tools date based on Git commits]), - AC_DEFINE([F2FS_TOOLS_DATE], - "f2fs_tools_date", -- [f2fs-tools date based on Source releases])) -+ [f2fs-tools date based on Source releases]) - - AC_CONFIG_SRCDIR([config.h.in]) - AC_CONFIG_HEADER([config.h]) --- -1.8.1.rc3 - diff --git a/external/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.11.0.bb b/external/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.13.0.bb index 2240049d..98bd478f 100644 --- a/external/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.11.0.bb +++ b/external/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.13.0.bb @@ -1,5 +1,5 @@ SUMMARY = "Tools for Flash-Friendly File System (F2FS)" -HOMEPAGE = "http://sourceforge.net/projects/f2fs-tools/" +HOMEPAGE = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=362b4b2594cd362b874a97718faa51d3" @@ -7,10 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=362b4b2594cd362b874a97718faa51d3" # to provide libuuid DEPENDS = "util-linux" -# v1.11.0 -SRCREV = "b98fab3666e498c2e27ad9dcda6874c9b683f06b" +# v1.13.0 +SRCREV = "284f77f0075a16a2ad1f3b0fb89b7f64a1bc755d" 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://0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch \ " S = "${WORKDIR}/git" diff --git a/external/meta-openembedded/meta-filesystems/recipes-utils/fatcat/fatcat/0001-Use-unistd.h-not-argp.h-for-all-POSIX-systems.patch b/external/meta-openembedded/meta-filesystems/recipes-utils/fatcat/fatcat/0001-Use-unistd.h-not-argp.h-for-all-POSIX-systems.patch new file mode 100644 index 00000000..fd8e22ab --- /dev/null +++ b/external/meta-openembedded/meta-filesystems/recipes-utils/fatcat/fatcat/0001-Use-unistd.h-not-argp.h-for-all-POSIX-systems.patch @@ -0,0 +1,37 @@ +From 14ef83291096e019ebc48040cf63530a2574a26d Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alex.kiernan@gmail.com> +Date: Sun, 19 Jan 2020 16:03:21 +0000 +Subject: [PATCH] Use unistd.h not argp.h for all POSIX systems + +getopt(3) is found in unistd.h on all POSIX systems and we make no use +of any of the GNU specific argp extensions. Include unistd.h directly to +allow building with musl on linux, whilst retaining compatibility with +glibc and other unices. + +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +Upstream-status: Pending +--- + src/fatcat.cpp | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/src/fatcat.cpp b/src/fatcat.cpp +index ce23ca07bb99..b4427e465bde 100644 +--- a/src/fatcat.cpp ++++ b/src/fatcat.cpp +@@ -1,14 +1,10 @@ + #include <stdlib.h> +-#include<string.h> +-#ifdef __APPLE__ +-#include <unistd.h> +-#else ++#include <string.h> + #ifdef __WIN__ + #include <ctype.h> + #include "xgetopt/xgetopt.h" + #else +-#include <argp.h> +-#endif ++#include <unistd.h> + #endif + + #include <stdio.h> diff --git a/external/meta-openembedded/meta-filesystems/recipes-utils/fatcat/fatcat_1.1.0.bb b/external/meta-openembedded/meta-filesystems/recipes-utils/fatcat/fatcat_1.1.0.bb new file mode 100644 index 00000000..c7267173 --- /dev/null +++ b/external/meta-openembedded/meta-filesystems/recipes-utils/fatcat/fatcat_1.1.0.bb @@ -0,0 +1,18 @@ +SUMMARY = "FAT filesystems explore, extract, repair, and forensic tool" +DESCRIPTION = "This tool is designed to manipulate FAT filesystems, in order to \ +explore, extract, repair, recover and forensic them. It currently supports \ +FAT12, FAT16 and FAT32." +HOMEPAGE = "https://github.com/Gregwar/fatcat" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=57fbbfebd0dd1d6ff21b8cecb552a03f" + +SRC_URI = "git://github.com/Gregwar/fatcat.git \ + file://0001-Use-unistd.h-not-argp.h-for-all-POSIX-systems.patch \ + " + +SRCREV = "b923172d97c578297964c062e3a92799e2a9eca4" + +S = "${WORKDIR}/git" + +inherit cmake diff --git a/external/meta-openembedded/meta-filesystems/recipes-utils/fatresize/fatresize_1.0.2.bb b/external/meta-openembedded/meta-filesystems/recipes-utils/fatresize/fatresize_1.0.2.bb new file mode 100644 index 00000000..88d495b6 --- /dev/null +++ b/external/meta-openembedded/meta-filesystems/recipes-utils/fatresize/fatresize_1.0.2.bb @@ -0,0 +1,15 @@ +SUMMARY = "Resize FAT partitions using libparted" +SECTION = "console/tools" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRC_URI = "git://salsa.debian.org/parted-team/fatresize.git;protocol=https" +SRCREV = "3f80afc76ad82d4a1b852a6c8dea24cd9f5e7a24" + +PV = "1.0.2-11" + +S = "${WORKDIR}/git" + +DEPENDS = "parted" + +inherit autotools pkgconfig diff --git a/external/meta-openembedded/meta-filesystems/recipes-utils/ufs-utils/ufs-utils/0001-Replace-u_intXX_t-with-kernel-typedefs.patch b/external/meta-openembedded/meta-filesystems/recipes-utils/ufs-utils/ufs-utils/0001-Replace-u_intXX_t-with-kernel-typedefs.patch new file mode 100644 index 00000000..e69a3cf1 --- /dev/null +++ b/external/meta-openembedded/meta-filesystems/recipes-utils/ufs-utils/ufs-utils/0001-Replace-u_intXX_t-with-kernel-typedefs.patch @@ -0,0 +1,54 @@ +From 6cf6f5b9c39dfd0d46f2069c3baeab92ae980367 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 15 Dec 2019 00:58:13 -0800 +Subject: [PATCH] Replace u_intXX_t with kernel typedefs + +u_intXX_t requires including sys/types.h which might not work in kernel +code, if this header is used in a kernel module + +Fixes +| In file included from ufs.c:16: +| In file included from ./ufs.h:9: +| ./scsi_bsg_util.h:131:2: error: unknown type name 'u_int16_t'; did you mean 'uint16_t'? +| u_int16_t result; +| ^~~~~~~~~ + +Upstream-Status: Submitted [https://github.com/westerndigitalcorporation/ufs-utils/pull/23] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + scsi_bsg_util.h | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/scsi_bsg_util.h b/scsi_bsg_util.h +index 3f8a482..497c3ae 100644 +--- a/scsi_bsg_util.h ++++ b/scsi_bsg_util.h +@@ -121,15 +121,15 @@ struct ufs_bsg_reply { + #endif /* SCSI_BSG_UFS_H.*/ + + struct rpmb_frame { +- u_int8_t stuff[196]; +- u_int8_t key_mac[32]; +- u_int8_t data[256]; +- u_int8_t nonce[16]; +- u_int32_t write_counter; +- u_int16_t addr; +- u_int16_t block_count; +- u_int16_t result; +- u_int16_t req_resp; ++ __u8 stuff[196]; ++ __u8 key_mac[32]; ++ __u8 data[256]; ++ __u8 nonce[16]; ++ __u32 write_counter; ++ __u16 addr; ++ __u16 block_count; ++ __u16 result; ++ __u16 req_resp; + }; + + #define BSG_REPLY_SZ (sizeof(struct ufs_bsg_reply)) +-- +2.24.1 + diff --git a/external/meta-openembedded/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_git.bb b/external/meta-openembedded/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_git.bb new file mode 100644 index 00000000..23583650 --- /dev/null +++ b/external/meta-openembedded/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_git.bb @@ -0,0 +1,34 @@ +SUMMARY = "Tool to access UFS (Universal Flash Storage) devices" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +PV = "1.6+git${SRCPV}" + +BRANCH ?= "dev" + +SRCREV = "a3cf93b66f4606a46354cf884d24aa966661f848" + +SRC_URI = "git://github.com/westerndigitalcorporation/ufs-utils.git;protocol=git;branch=${BRANCH} \ + file://0001-Replace-u_intXX_t-with-kernel-typedefs.patch \ +" + +UPSTREAM_CHECK_COMMITS = "1" + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}" CFLAGS="${CFLAGS}"" + +CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__ -D_GNU_SOURCE" + +do_configure() { + sed -i -e "s|-static$||g" ${S}/Makefile +} + +do_install() { + install -D -m 755 ${S}/ufs-utils ${D}${bindir}/ufs-utils +} + +PROVIDES += "ufs-tool" + +RPROVIDES_${PN} += "ufs-tool" + diff --git a/external/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch b/external/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch new file mode 100644 index 00000000..bfb25e87 --- /dev/null +++ b/external/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch @@ -0,0 +1,52 @@ +From fea8c4634469784c16211e2597411c18c72dfa4a Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Thu, 5 Mar 2020 14:36:14 +0800 +Subject: [PATCH] xfsdump: support usrmerge + +Upstream-Status: Inappropriate [oe-specific] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + dump/Makefile | 6 +----- + restore/Makefile | 6 +----- + 2 files changed, 2 insertions(+), 10 deletions(-) + +diff --git a/dump/Makefile b/dump/Makefile +index 66f00d3..cc2d973 100644 +--- a/dump/Makefile ++++ b/dump/Makefile +@@ -97,12 +97,8 @@ default: depend $(LTCOMMAND) + include $(BUILDRULES) + + install: default +- $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR) +- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR) + $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) +- # skip symlink when /sbin is alread symlinked to /usr/sbin, like on Fedora +- test $(PKG_ROOT_SBIN_DIR) -ef $(PKG_SBIN_DIR) || \ +- $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND) ++ $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) + install-dev: + + .dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON) +diff --git a/restore/Makefile b/restore/Makefile +index ac3f8c8..3c46394 100644 +--- a/restore/Makefile ++++ b/restore/Makefile +@@ -111,12 +111,8 @@ default: depend $(LTCOMMAND) + include $(BUILDRULES) + + install: default +- $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR) +- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR) + $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) +- # skip symlink when /sbin is alread symlinked to /usr/sbin, like on Fedora +- test $(PKG_ROOT_SBIN_DIR) -ef $(PKG_SBIN_DIR) || \ +- $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND) ++ $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) + install-dev: + + .dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON) +-- +2.7.4 + diff --git a/external/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb b/external/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.9.bb index 54ab30cb..3e18fba7 100644 --- a/external/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb +++ b/external/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.9.bb @@ -12,9 +12,10 @@ DEPENDS = "xfsprogs attr" SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsdump/${BP}.tar.xz \ file://remove-install-as-user.patch \ + ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-xfsdump-support-usrmerge.patch','',d)} \ " -SRC_URI[md5sum] = "84d3bc287b4a2bb5d16b2320a47049a7" -SRC_URI[sha256sum] = "ed14e67ae5b273c2698e767b43a46f033d361e540fe13feaaf9b110ee0edc585" +SRC_URI[md5sum] = "086f7582875b14c17522867ffe3e202b" +SRC_URI[sha256sum] = "55aeede6232ddce6c9e79e2af88d6f808534df1552eb2bfaf7fb85b92add6dd1" inherit autotools-brokensep diff --git a/external/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-build-Check-for-sync_file_range-libc-function.patch b/external/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-build-Check-for-sync_file_range-libc-function.patch deleted file mode 100644 index 231da806..00000000 --- a/external/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-build-Check-for-sync_file_range-libc-function.patch +++ /dev/null @@ -1,79 +0,0 @@ -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() - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - include/builddefs.in | 1 + - io/Makefile | 5 ++++- - io/io.h | 2 +- - io/sync_file_range.c | 3 +++ - 4 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/include/builddefs.in b/include/builddefs.in -index b895949..a388c83 100644 ---- a/include/builddefs.in -+++ b/include/builddefs.in -@@ -95,6 +95,7 @@ HAVE_FIEMAP = @have_fiemap@ - HAVE_PREADV = @have_preadv@ - HAVE_PWRITEV2 = @have_pwritev2@ - HAVE_COPY_FILE_RANGE = @have_copy_file_range@ -+HAVE_NR_COPY_FILE_RANGE = @have_nr_copy_file_range@ - HAVE_SYNC_FILE_RANGE = @have_sync_file_range@ - HAVE_SYNCFS = @have_syncfs@ - HAVE_READDIR = @have_readdir@ -diff --git a/io/Makefile b/io/Makefile -index 00ede48..dd001b0 100644 ---- a/io/Makefile -+++ b/io/Makefile -@@ -60,10 +60,13 @@ CFILES += inject.c resblks.c - LCFLAGS += -DHAVE_INJECT -DHAVE_RESBLKS - endif - --ifeq ($(HAVE_COPY_FILE_RANGE),yes) -+ifeq ($(HAVE_NR_COPY_FILE_RANGE),yes) - CFILES += copy_file_range.c -+LCFLAGS += -DHAVE_NR_COPY_FILE_RANGE -+ifeq ($(HAVE_COPY_FILE_RANGE),yes) - LCFLAGS += -DHAVE_COPY_FILE_RANGE - endif -+endif - - ifeq ($(HAVE_SYNC_FILE_RANGE),yes) - CFILES += sync_file_range.c -diff --git a/io/io.h b/io/io.h -index e1f3d95..fe2e6a2 100644 ---- a/io/io.h -+++ b/io/io.h -@@ -151,7 +151,7 @@ extern void fiemap_init(void); - #define fiemap_init() do { } while (0) - #endif - --#ifdef HAVE_COPY_FILE_RANGE -+#if defined(HAVE_NR_COPY_FILE_RANGE) && !defined(HAVE_COPY_FILE_RANGE) - extern void copy_range_init(void); - #else - #define copy_range_init() do { } while (0) -diff --git a/io/sync_file_range.c b/io/sync_file_range.c -index 30bbc93..6c49d73 100644 ---- a/io/sync_file_range.c -+++ b/io/sync_file_range.c -@@ -4,6 +4,7 @@ - * All Rights Reserved. - */ - -+#ifndef HAVE_COPY_FILE_RANGE - #include "command.h" - #include "input.h" - #include "init.h" -@@ -92,3 +93,5 @@ sync_range_init(void) - - add_command(&sync_range_cmd); - } -+ -+#endif diff --git a/external/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-support-usrmerge.patch b/external/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-support-usrmerge.patch new file mode 100644 index 00000000..84f4f88e --- /dev/null +++ b/external/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-support-usrmerge.patch @@ -0,0 +1,40 @@ +From e81633a276dd6a9f919e5e5c15481ac50a8e485d Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Fri, 30 Aug 2019 14:59:06 +0800 +Subject: [PATCH] support usrmerge + +Upstream-Status: Inappropriate [oe-specific] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + configure.ac | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4b7e4c8..f1afbd6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -110,8 +110,7 @@ AC_ARG_ENABLE(libicu, + # If the user specified a libdir ending in lib64 do not append another + # 64 to the library names. + # +-base_libdir=`basename "$libdir"` +-case $base_libdir in ++case `basename "$libdir"` in + lib64) + enable_lib64=no + esac +@@ -125,8 +124,8 @@ esac + # + case $exec_prefix:$prefix in + NONE:NONE | NONE:/usr | /usr:*) +- root_sbindir='/sbin' +- root_libdir="/${base_libdir}" ++ root_sbindir="${base_sbindir}" ++ root_libdir="${base_libdir}" + ;; + *) + root_sbindir="${sbindir}" +-- +2.7.4 + diff --git a/external/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/disable-xfs_scrub-build.patch b/external/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/disable-xfs_scrub-build.patch deleted file mode 100644 index c07b4b50..00000000 --- a/external/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/disable-xfs_scrub-build.patch +++ /dev/null @@ -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 - diff --git a/external/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.18.0.bb b/external/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.1.bb index 0a1bacb9..433ce477 100644 --- a/external/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.18.0.bb +++ b/external/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.1.bb @@ -8,13 +8,12 @@ LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=74274e8a218423e49eefdea80bc55038 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 \ + file://0001-support-usrmerge.patch \ " -SRC_URI[md5sum] = "5f80b631b68df89a8b9283307e96d2e8" -SRC_URI[sha256sum] = "397dc96f51aeeff73d021d3418d3172377b2685f2740ca60525096c070aa3df1" +SRC_URI[md5sum] = "5ca3f79e76e3fb984a03d1b42a2e60ba" +SRC_URI[sha256sum] = "7b500e148cebd08f99e37cf744c7843817b37e7be2a32c4dc57d6ea16e3019ae" inherit autotools-brokensep @@ -31,10 +30,12 @@ FILES_${PN}-repair = "${base_sbindir}/xfs_repair" FILES_libhandle = "${base_libdir}/libhandle${SOLIBS}" EXTRA_OECONF = "--enable-gettext=no \ + --enable-scrub=no \ INSTALL_USER=root \ INSTALL_GROUP=root \ ac_cv_header_aio_h=yes \ ac_cv_lib_rt_lio_listio=yes \ + OPTIMIZER='${SELECTED_OPTIMIZATION}' \ " DISABLE_STATIC = "" @@ -58,6 +59,8 @@ do_configure () { rm -f ${B}/include/builddefs ${B}/include/platform_defs.h ${B}/configure # Recreate configure script. oe_runmake configure + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} oe_runconf } @@ -65,4 +68,9 @@ do_install_append() { oe_runmake 'DESTDIR=${D}' install-dev rm ${D}${libdir}/*.la rmdir --ignore-fail-on-non-empty ${D}${libdir} + + if [ ${libdir} != ${base_libdir} ];then + ln -sf -r ${D}${libdir}/libhandle.a ${D}${base_libdir}/libhandle.a + ln -sf -r ${D}${base_libdir}/libhandle.so ${D}${libdir}/libhandle.so + fi } diff --git a/external/meta-openembedded/meta-filesystems/recipes-utils/xorriso/xorriso_1.4.0.bb b/external/meta-openembedded/meta-filesystems/recipes-utils/xorriso/xorriso_1.5.3.bb index b26709e9..30224c20 100644 --- a/external/meta-openembedded/meta-filesystems/recipes-utils/xorriso/xorriso_1.4.0.bb +++ b/external/meta-openembedded/meta-filesystems/recipes-utils/xorriso/xorriso_1.5.3.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "http://www.gnu.org/software/${BPN}/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "ec79fd2736b8da76e7a870e27cadf6fa" -SRC_URI[sha256sum] = "0bd1e085015b28c24f57697d6def2fe84517967dc417554c0c3ccf1685ed0e56" +SRC_URI[md5sum] = "d6b16763a2ca23eec718cfac1761b40f" +SRC_URI[sha256sum] = "97a9c9831fa1b053f781f74a17b79327e7402c6163f5c7973453ba881616aeb4" PACKAGECONFIG ??= "acl attr zlib bzip2 readline" PACKAGECONFIG[acl] = "--enable-libacl,--disable-libacl,acl," @@ -17,7 +17,7 @@ PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib," PACKAGECONFIG[bzip2] = "--enable-libbz2,--disable-libbz2,bzip2," PACKAGECONFIG[readline] = "--enable-libreadline,--disable-libreadline,readline," -inherit autotools-brokensep pkgconfig distro_features_check +inherit autotools-brokensep pkgconfig features_check do_configure_prepend () { touch NEWS |