summaryrefslogtreecommitdiffstats
path: root/meta-filesystems/recipes-filesystems
diff options
context:
space:
mode:
Diffstat (limited to 'meta-filesystems/recipes-filesystems')
-rw-r--r--meta-filesystems/recipes-filesystems/burnia/libburn/0001-Bug-fix-Faulty-signal-handler-prototype-spoiled-comp.patch27
-rw-r--r--meta-filesystems/recipes-filesystems/burnia/libburn_1.5.6.bb4
-rw-r--r--meta-filesystems/recipes-filesystems/httpfs2-fuse/httpfs2_0.1.5.bb2
-rw-r--r--meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.4.bb2
-rw-r--r--meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb1
-rw-r--r--meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-unistr.c-Fix-use-after-free-in-ntfs_uppercase_mbs.patch42
-rw-r--r--meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb3
-rw-r--r--meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb1
-rw-r--r--meta-filesystems/recipes-filesystems/simple-mtpfs/simple-mtpfs_0.4.0.bb1
-rw-r--r--meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb3
-rw-r--r--meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/run-ptest10
-rw-r--r--meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.3.bb6
-rw-r--r--meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_3.4.bb1
-rw-r--r--meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-Makefile-add-LDFLAGS.patch (renamed from meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/makefile-add-ldflags.patch)15
-rw-r--r--meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0002-define-loff_t-if-not-already-defined.patch (renamed from meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-define-loff_t-if-not-already-defined.patch)20
-rw-r--r--meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0003-yaffs_guts.h-define-YTIME_T-if-not-already-defined.patch (renamed from meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-yaffs_guts.h-define-YTIME_T-if-not-already-defined.patch)16
-rw-r--r--meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0004-utils-Makefile-fix-symbolic-links.patch34
-rw-r--r--meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb13
-rw-r--r--meta-filesystems/recipes-filesystems/zfs/zfs_2.2.5.bb (renamed from meta-filesystems/recipes-filesystems/zfs/zfs_2.2.2.bb)21
19 files changed, 176 insertions, 46 deletions
diff --git a/meta-filesystems/recipes-filesystems/burnia/libburn/0001-Bug-fix-Faulty-signal-handler-prototype-spoiled-comp.patch b/meta-filesystems/recipes-filesystems/burnia/libburn/0001-Bug-fix-Faulty-signal-handler-prototype-spoiled-comp.patch
new file mode 100644
index 0000000000..6061352cb7
--- /dev/null
+++ b/meta-filesystems/recipes-filesystems/burnia/libburn/0001-Bug-fix-Faulty-signal-handler-prototype-spoiled-comp.patch
@@ -0,0 +1,27 @@
1From d537f9dd35282df834a311ead5f113af67d223b3 Mon Sep 17 00:00:00 2001
2From: Thomas Schmitt <scdbackup@gmx.net>
3Date: Tue, 26 Nov 2024 23:02:03 +0100
4Subject: [PATCH] Bug fix: Faulty signal handler prototype spoiled compilation
5 under C23
6
7Upstream-Status: Backport [https://dev.lovelyhq.com/libburnia/libburn/commit/d537f9dd35282df834a311ead5f113af67d223b3]
8---
9 test/poll.c | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/test/poll.c b/test/poll.c
13index 660f384..cd5ff90 100644
14--- a/test/poll.c
15+++ b/test/poll.c
16@@ -14,7 +14,7 @@ static struct burn_drive_info *drives;
17 static unsigned int n_drives;
18 int NEXT;
19
20-static void catch_int ()
21+static void catch_int (int signum)
22 {
23 NEXT = 1;
24 }
25--
262.34.1
27
diff --git a/meta-filesystems/recipes-filesystems/burnia/libburn_1.5.6.bb b/meta-filesystems/recipes-filesystems/burnia/libburn_1.5.6.bb
index e0f6664ab3..e84a60a543 100644
--- a/meta-filesystems/recipes-filesystems/burnia/libburn_1.5.6.bb
+++ b/meta-filesystems/recipes-filesystems/burnia/libburn_1.5.6.bb
@@ -5,7 +5,9 @@ LICENSE = "GPL-2.0-or-later"
5LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 \ 5LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 \
6 file://COPYRIGHT;md5=a91b9b862895b64e68e5b321873c9111" 6 file://COPYRIGHT;md5=a91b9b862895b64e68e5b321873c9111"
7 7
8SRC_URI = "http://files.libburnia-project.org/releases/${BP}.tar.gz" 8SRC_URI = "http://files.libburnia-project.org/releases/${BP}.tar.gz \
9 file://0001-Bug-fix-Faulty-signal-handler-prototype-spoiled-comp.patch"
10
9SRC_URI[sha256sum] = "7295491b4be5eeac5e7a3fb2067e236e2955ffdc6bbd45f546466edee321644b" 11SRC_URI[sha256sum] = "7295491b4be5eeac5e7a3fb2067e236e2955ffdc6bbd45f546466edee321644b"
10 12
11inherit autotools pkgconfig lib_package 13inherit autotools pkgconfig lib_package
diff --git a/meta-filesystems/recipes-filesystems/httpfs2-fuse/httpfs2_0.1.5.bb b/meta-filesystems/recipes-filesystems/httpfs2-fuse/httpfs2_0.1.5.bb
index 5dc3ea6632..2370633551 100644
--- a/meta-filesystems/recipes-filesystems/httpfs2-fuse/httpfs2_0.1.5.bb
+++ b/meta-filesystems/recipes-filesystems/httpfs2-fuse/httpfs2_0.1.5.bb
@@ -11,7 +11,7 @@ RDEPENDS:${PN} += "fuse"
11SRC_URI += "${SOURCEFORGE_MIRROR}/project/httpfs/httpfs2/httpfs2-${PV}.tar.gz" 11SRC_URI += "${SOURCEFORGE_MIRROR}/project/httpfs/httpfs2/httpfs2-${PV}.tar.gz"
12SRC_URI[sha256sum] = "01cb4bb38deb344f540da6f1464dc7edbdeb51213ad810b8c9c282c1e17e0fc1" 12SRC_URI[sha256sum] = "01cb4bb38deb344f540da6f1464dc7edbdeb51213ad810b8c9c282c1e17e0fc1"
13 13
14S = "${WORKDIR}/httpfs2-${PV}" 14S = "${UNPACKDIR}/httpfs2-${PV}"
15 15
16do_compile() { 16do_compile() {
17 oe_runmake -C ${S} httpfs2 17 oe_runmake -C ${S} httpfs2
diff --git a/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.4.bb b/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.4.bb
index c9702eb93e..5fbeab53d8 100644
--- a/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.4.bb
+++ b/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.4.bb
@@ -1,7 +1,7 @@
1SUMMARY = "A fuse filesystem to access the contents of an iPhone or iPod Touch" 1SUMMARY = "A fuse filesystem to access the contents of an iPhone or iPod Touch"
2LICENSE = "LGPL-2.1-only" 2LICENSE = "LGPL-2.1-only"
3LIC_FILES_CHKSUM = "file://COPYING;md5=6ab17b41640564434dda85c06b7124f7" 3LIC_FILES_CHKSUM = "file://COPYING;md5=6ab17b41640564434dda85c06b7124f7"
4HOMEPAGE ="http://www.libimobiledevice.org/" 4HOMEPAGE = "http://www.libimobiledevice.org/"
5 5
6DEPENDS = "fuse libimobiledevice" 6DEPENDS = "fuse libimobiledevice"
7 7
diff --git a/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb
index 7d0a83609e..06051d8013 100644
--- a/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb
+++ b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb
@@ -18,7 +18,6 @@ SRC_URI = "git://github.com/prasad-joshi/logfsprogs.git;branch=master;protocol=h
18 " 18 "
19SRCREV = "45b72c81ce3c6fa17ca19bafc207ea93e76312f4" 19SRCREV = "45b72c81ce3c6fa17ca19bafc207ea93e76312f4"
20 20
21S = "${WORKDIR}/git"
22 21
23EXTRA_OEMAKE = "CC="${CC}" LD="${LD}" AR="${AR}"" 22EXTRA_OEMAKE = "CC="${CC}" LD="${LD}" AR="${AR}""
24 23
diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-unistr.c-Fix-use-after-free-in-ntfs_uppercase_mbs.patch b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-unistr.c-Fix-use-after-free-in-ntfs_uppercase_mbs.patch
new file mode 100644
index 0000000000..3160f56880
--- /dev/null
+++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-unistr.c-Fix-use-after-free-in-ntfs_uppercase_mbs.patch
@@ -0,0 +1,42 @@
1From 7b6210c5be46e5120b42c09f910e8f104bf3edf1 Mon Sep 17 00:00:00 2001
2From: Erik Larsson <erik@tuxera.com>
3Date: Tue, 13 Jun 2023 17:47:15 +0300
4Subject: [PATCH] unistr.c: Fix use-after-free in 'ntfs_uppercase_mbs'.
5
6If 'utf8_to_unicode' throws an error due to an invalid UTF-8 sequence,
7then 'n' will be less than 0 and the loop will terminate without storing
8anything in '*t'. After the loop the uppercase string's allocation is
9freed, however after it is freed it is unconditionally accessed through
10'*t', which points into the freed allocation, for the purpose of NULL-
11terminating the string. This leads to a use-after-free.
12Fixed by only NULL-terminating the string when no error has been thrown.
13
14Thanks for Jeffrey Bencteux for reporting this issue:
15https://github.com/tuxera/ntfs-3g/issues/84
16
17Upstream-Status: Backport [https://github.com/tuxera/ntfs-3g/commit/75dcdc2cf37478fad6c0e3427403d198b554951d]
18CVE: CVE-2023-52890
19Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
20
21---
22 libntfs-3g/unistr.c | 3 ++-
23 1 file changed, 2 insertions(+), 1 deletion(-)
24
25diff --git a/libntfs-3g/unistr.c b/libntfs-3g/unistr.c
26index 5854b3b..db8ddf4 100644
27--- a/libntfs-3g/unistr.c
28+++ b/libntfs-3g/unistr.c
29@@ -1189,8 +1189,9 @@ char *ntfs_uppercase_mbs(const char *low,
30 free(upp);
31 upp = (char*)NULL;
32 errno = EILSEQ;
33+ } else {
34+ *t = 0;
35 }
36- *t = 0;
37 }
38 return (upp);
39 }
40--
412.34.1
42
diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb
index 37a8106bb0..4c7fff8ea9 100644
--- a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb
+++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb
@@ -8,8 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
8 8
9SRC_URI = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${PV}.tgz \ 9SRC_URI = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${PV}.tgz \
10 file://0001-libntfs-3g-Makefile.am-fix-install-failed-while-host.patch \ 10 file://0001-libntfs-3g-Makefile.am-fix-install-failed-while-host.patch \
11 file://0001-unistr.c-Fix-use-after-free-in-ntfs_uppercase_mbs.patch \
11" 12"
12S = "${WORKDIR}/ntfs-3g_ntfsprogs-${PV}" 13S = "${UNPACKDIR}/ntfs-3g_ntfsprogs-${PV}"
13SRC_URI[sha256sum] = "f20e36ee68074b845e3629e6bced4706ad053804cbaf062fbae60738f854170c" 14SRC_URI[sha256sum] = "f20e36ee68074b845e3629e6bced4706ad053804cbaf062fbae60738f854170c"
14 15
15UPSTREAM_CHECK_URI = "https://www.tuxera.com/community/open-source-ntfs-3g/" 16UPSTREAM_CHECK_URI = "https://www.tuxera.com/community/open-source-ntfs-3g/"
diff --git a/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb b/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb
index 7768a734d6..890c8aecc0 100644
--- a/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb
+++ b/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb
@@ -17,7 +17,6 @@ SRC_URI = "git://github.com/owfs/owfs;branch=master;protocol=https \
17 file://owserver \ 17 file://owserver \
18 " 18 "
19 19
20S = "${WORKDIR}/git"
21 20
22inherit autotools-brokensep update-rc.d pkgconfig systemd 21inherit autotools-brokensep update-rc.d pkgconfig systemd
23 22
diff --git a/meta-filesystems/recipes-filesystems/simple-mtpfs/simple-mtpfs_0.4.0.bb b/meta-filesystems/recipes-filesystems/simple-mtpfs/simple-mtpfs_0.4.0.bb
index b8399265cd..05a1004b65 100644
--- a/meta-filesystems/recipes-filesystems/simple-mtpfs/simple-mtpfs_0.4.0.bb
+++ b/meta-filesystems/recipes-filesystems/simple-mtpfs/simple-mtpfs_0.4.0.bb
@@ -11,4 +11,3 @@ inherit autotools pkgconfig
11SRC_URI = "git://github.com/phatina/simple-mtpfs.git;protocol=https;branch=master" 11SRC_URI = "git://github.com/phatina/simple-mtpfs.git;protocol=https;branch=master"
12SRCREV = "19e7bb9b608b0c0dce2ee6f56fac75901bc69529" 12SRCREV = "19e7bb9b608b0c0dce2ee6f56fac75901bc69529"
13 13
14S = "${WORKDIR}/git"
diff --git a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb
index 2d9eab1dd5..97c7ad396e 100644
--- a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb
+++ b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "SMBNetFS is a Linux/FreeBSD filesystem that allow you to use \
6 6
7LICENSE = "GPL-2.0-only" 7LICENSE = "GPL-2.0-only"
8LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" 8LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
9HOMEPAGE ="http://sourceforge.net/projects/smbnetfs" 9HOMEPAGE = "http://sourceforge.net/projects/smbnetfs"
10 10
11DEPENDS = "fuse samba" 11DEPENDS = "fuse samba"
12DEPENDS:append:libc-musl = " libexecinfo" 12DEPENDS:append:libc-musl = " libexecinfo"
@@ -27,6 +27,5 @@ SRC_URI = "git://smbnetfs.git.sourceforge.net/gitroot/smbnetfs/smbnetfs;branch=m
27PACKAGECONFIG ??= "" 27PACKAGECONFIG ??= ""
28PACKAGECONFIG[libsecret] = "--with-libsecret=yes,--with-libsecret=no,libsecret" 28PACKAGECONFIG[libsecret] = "--with-libsecret=yes,--with-libsecret=no,libsecret"
29 29
30S = "${WORKDIR}/git"
31 30
32LDFLAGS:append:libc-musl = " -lexecinfo" 31LDFLAGS:append:libc-musl = " -lexecinfo"
diff --git a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/run-ptest b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/run-ptest
index b63c4de0d9..5aab54d5b5 100644
--- a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/run-ptest
+++ b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/run-ptest
@@ -1,3 +1,11 @@
1#!/bin/sh 1#!/bin/sh
2mkdir -p ~/.ssh
3cat > ~/.ssh/config << EOF
4Host *
5 CheckHostIP no
6 StrictHostKeyChecking no
7 UserKnownHostsFile=/dev/null
8EOF
9pytest --automake
2 10
3pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' 11rm -rf ~/.ssh/config
diff --git a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.3.bb b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.3.bb
index 5a926dac0c..c3a00566ab 100644
--- a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.3.bb
+++ b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.3.bb
@@ -10,16 +10,17 @@ SRC_URI = "git://github.com/libfuse/sshfs;branch=master;protocol=https \
10 file://a1d58ae1be99571a88b8439b027abe6349b74658.patch \ 10 file://a1d58ae1be99571a88b8439b027abe6349b74658.patch \
11" 11"
12SRCREV = "c91eb9a9a992f1a36c49a8e6f1146e45b5e1c8e7" 12SRCREV = "c91eb9a9a992f1a36c49a8e6f1146e45b5e1c8e7"
13S = "${WORKDIR}/git"
14 13
15inherit meson pkgconfig ptest 14inherit meson pkgconfig ptest
16 15
17SRC_URI += " \ 16SRC_URI += " \
18 file://run-ptest \ 17 file://run-ptest \
19" 18"
20 19#python3-compile for filecmp module
21RDEPENDS:${PN}-ptest += " \ 20RDEPENDS:${PN}-ptest += " \
21 python3-compile \
22 python3-pytest \ 22 python3-pytest \
23 python3-unittest-automake-output \
23 bash \ 24 bash \
24 fuse \ 25 fuse \
25" 26"
@@ -27,4 +28,5 @@ RDEPENDS:${PN}-ptest += " \
27do_install_ptest() { 28do_install_ptest() {
28 install -d ${D}${PTEST_PATH}/test 29 install -d ${D}${PTEST_PATH}/test
29 cp -rf ${S}/test/* ${D}${PTEST_PATH}/test/ 30 cp -rf ${S}/test/* ${D}${PTEST_PATH}/test/
31 ln -sf ${bindir}/sshfs ${D}${PTEST_PATH}/sshfs
30} 32}
diff --git a/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_3.4.bb b/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_3.4.bb
index e8fda05365..fc474e3238 100644
--- a/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_3.4.bb
+++ b/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_3.4.bb
@@ -14,6 +14,5 @@ SRCREV = "773f1853b043eeb64b7459f903a2c65bd096f9d9"
14DEPENDS = "fuse3" 14DEPENDS = "fuse3"
15RDEPENDS:${PN} = "bash" 15RDEPENDS:${PN} = "bash"
16 16
17S = "${WORKDIR}/git"
18 17
19inherit cmake pkgconfig 18inherit cmake pkgconfig
diff --git a/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/makefile-add-ldflags.patch b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-Makefile-add-LDFLAGS.patch
index bb21899eb3..ac38115952 100644
--- a/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/makefile-add-ldflags.patch
+++ b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-Makefile-add-LDFLAGS.patch
@@ -1,12 +1,20 @@
1From 8393f9d64b4cead722ee1a7674da1c41b33cfdcc Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Fri, 20 Jun 2025 15:08:19 +0800
4Subject: [PATCH] Makefile: add LDFLAGS
5
1Upstream-Status: Pending 6Upstream-Status: Pending
2 7
3Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 8Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
9---
10 utils/Makefile | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
4 12
5diff --git a/utils/Makefile b/utils/Makefile 13diff --git a/utils/Makefile b/utils/Makefile
6index 710ebbf..6259893 100644 14index a00fa13..13e91f7 100644
7--- a/utils/Makefile 15--- a/utils/Makefile
8+++ b/utils/Makefile 16+++ b/utils/Makefile
9@@ -57,10 +57,10 @@ $(COMMONOBJS) $(MKYAFFSIMAGEOBJS) $(MKYAFFS2IMAGEOBJS) : %.o: %.c 17@@ -56,10 +56,10 @@ $(COMMONOBJS) $(MKYAFFSIMAGEOBJS) $(MKYAFFS2IMAGEOBJS) : %.o: %.c
10 $(CC) -c $(CFLAGS) $< -o $@ 18 $(CC) -c $(CFLAGS) $< -o $@
11 19
12 mkyaffsimage: $(MKYAFFSIMAGEOBJS) $(COMMONOBJS) 20 mkyaffsimage: $(MKYAFFSIMAGEOBJS) $(COMMONOBJS)
@@ -19,3 +27,6 @@ index 710ebbf..6259893 100644
19 27
20 28
21 clean: 29 clean:
30--
312.34.1
32
diff --git a/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-define-loff_t-if-not-already-defined.patch b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0002-define-loff_t-if-not-already-defined.patch
index 6cedc3cb4e..24d1eaa596 100644
--- a/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-define-loff_t-if-not-already-defined.patch
+++ b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0002-define-loff_t-if-not-already-defined.patch
@@ -1,22 +1,22 @@
1From 848717da4a28d33f8aa8f889377e61e6b1b8ae67 Mon Sep 17 00:00:00 2001 1From 72f923440fef3b875e5570094e4cf398a201521f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 13 Jul 2017 18:29:52 -0700 3Date: Thu, 13 Jul 2017 18:29:52 -0700
4Subject: [PATCH] define loff_t if not already defined 4Subject: [PATCH] define loff_t if not already defined
5 5
6Helps to build with musl 6Helps to build with musl
7 7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10Upstream-Status: Pending 8Upstream-Status: Pending
11 9
12 yaffs_guts.h | 4 ++++ 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 core/yaffs_guts.h | 4 ++++
13 1 file changed, 4 insertions(+) 13 1 file changed, 4 insertions(+)
14 14
15diff --git a/yaffs_guts.h b/yaffs_guts.h 15diff --git a/core/yaffs_guts.h b/core/yaffs_guts.h
16index 6bcf12d..4af17ce 100644 16index 74ded0b..4bd2646 100644
17--- a/yaffs_guts.h 17--- a/core/yaffs_guts.h
18+++ b/yaffs_guts.h 18+++ b/core/yaffs_guts.h
19@@ -18,6 +18,10 @@ 19@@ -17,6 +17,10 @@
20 20
21 #include "yportenv.h" 21 #include "yportenv.h"
22 22
@@ -28,5 +28,5 @@ index 6bcf12d..4af17ce 100644
28 #define YAFFS_FAIL 0 28 #define YAFFS_FAIL 0
29 29
30-- 30--
312.13.2 312.34.1
32 32
diff --git a/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-yaffs_guts.h-define-YTIME_T-if-not-already-defined.patch b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0003-yaffs_guts.h-define-YTIME_T-if-not-already-defined.patch
index 98c27d2654..5b67ceddff 100644
--- a/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-yaffs_guts.h-define-YTIME_T-if-not-already-defined.patch
+++ b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0003-yaffs_guts.h-define-YTIME_T-if-not-already-defined.patch
@@ -1,4 +1,4 @@
1From 05cc2b958090f96d6fa128da43aa69669625e529 Mon Sep 17 00:00:00 2001 1From 75fe0fbe254f63fe58d22f2d6090e9a8b3a6fe41 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com> 2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Tue, 5 Mar 2024 12:03:23 +0000 3Date: Tue, 5 Mar 2024 12:03:23 +0000
4Subject: [PATCH] yaffs_guts.h: define YTIME_T if not already defined 4Subject: [PATCH] yaffs_guts.h: define YTIME_T if not already defined
@@ -11,14 +11,14 @@ Upstream-Status: Pending
11 11
12Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 12Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
13--- 13---
14 yaffs_guts.h | 4 ++++ 14 core/yaffs_guts.h | 4 ++++
15 1 file changed, 4 insertions(+) 15 1 file changed, 4 insertions(+)
16 16
17diff --git a/yaffs_guts.h b/yaffs_guts.h 17diff --git a/core/yaffs_guts.h b/core/yaffs_guts.h
18index 74ded0b..598271b 100644 18index 4bd2646..507bf16 100644
19--- a/yaffs_guts.h 19--- a/core/yaffs_guts.h
20+++ b/yaffs_guts.h 20+++ b/core/yaffs_guts.h
21@@ -487,6 +487,10 @@ struct yaffs_obj { 21@@ -491,6 +491,10 @@ struct yaffs_obj {
22 22
23 YCHAR short_name[YAFFS_SHORT_NAME_LENGTH + 1]; 23 YCHAR short_name[YAFFS_SHORT_NAME_LENGTH + 1];
24 24
@@ -30,5 +30,5 @@ index 74ded0b..598271b 100644
30 //these are always 64 bits 30 //these are always 64 bits
31 u32 win_ctime[2]; 31 u32 win_ctime[2];
32-- 32--
332.35.5 332.34.1
34 34
diff --git a/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0004-utils-Makefile-fix-symbolic-links.patch b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0004-utils-Makefile-fix-symbolic-links.patch
new file mode 100644
index 0000000000..987652afce
--- /dev/null
+++ b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0004-utils-Makefile-fix-symbolic-links.patch
@@ -0,0 +1,34 @@
1From 8349d121e3595ac4d935169150984260f8b697b9 Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Fri, 20 Jun 2025 15:20:05 +0800
4Subject: [PATCH] utils/Makefile: fix symbolic links
5
6Create correct symlinks to fix the following error:
7
8mkyaffsimage.c:29:10: fatal error: yaffs_ecc.h: No such file or directory
9 29 | #include "yaffs_ecc.h"
10 | ^~~~~~~~~~~~~
11
12Upstream-Status: Submitted [https://github.com/Aleph-One-Ltd/yaffs2/pull/13]
13
14Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
15---
16 utils/Makefile | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/utils/Makefile b/utils/Makefile
20index a00fa13..22c2fdb 100644
21--- a/utils/Makefile
22+++ b/utils/Makefile
23@@ -45,7 +45,7 @@ ALL_LINKS = $(BASE_LINKS) $(DIRECT_LINKS)
24 all: mkyaffsimage mkyaffs2image
25
26 $(BASE_LINKS):
27- ln -s ../$@ $@
28+ ln -s ../core/$@ $@
29
30 $(DIRECT_LINKS):
31 ln -s ../direct/$@ $@
32--
332.34.1
34
diff --git a/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb
index ca5e3302b3..d30309a95a 100644
--- a/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb
+++ b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb
@@ -14,18 +14,17 @@ PV = "20221209"
14 14
15DEPENDS = "mtd-utils" 15DEPENDS = "mtd-utils"
16 16
17# Source is the HEAD of master branch at the time of writing this recipe 17SRC_URI = "git://github.com/Aleph-One-Ltd/yaffs2;protocol=https;branch=master \
18SRC_URI = "git://www.aleph1.co.uk/yaffs2;protocol=git;branch=master \ 18 file://0001-Makefile-add-LDFLAGS.patch \
19 file://makefile-add-ldflags.patch \ 19 file://0002-define-loff_t-if-not-already-defined.patch \
20 file://0001-define-loff_t-if-not-already-defined.patch \ 20 file://0003-yaffs_guts.h-define-YTIME_T-if-not-already-defined.patch \
21 file://0001-yaffs_guts.h-define-YTIME_T-if-not-already-defined.patch \ 21 file://0004-utils-Makefile-fix-symbolic-links.patch \
22 " 22 "
23 23
24SRCREV = "613a901a229e8a701c18f003dd0aee18453e0670" 24SRCREV = "68030683543cccb4d942e3fedbcad1dc267e261c"
25 25
26UPSTREAM_CHECK_COMMITS = "1" 26UPSTREAM_CHECK_COMMITS = "1"
27 27
28S = "${WORKDIR}/git"
29 28
30CFLAGS:append = " -I.. -DCONFIG_YAFFS_UTIL -DCONFIG_YAFFS_DEFINES_TYPES" 29CFLAGS:append = " -I.. -DCONFIG_YAFFS_UTIL -DCONFIG_YAFFS_DEFINES_TYPES"
31EXTRA_OEMAKE = "-e MAKEFLAGS=" 30EXTRA_OEMAKE = "-e MAKEFLAGS="
diff --git a/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.2.bb b/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.5.bb
index d3ea6797e7..cf56cca84c 100644
--- a/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.2.bb
+++ b/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.5.bb
@@ -2,16 +2,15 @@ SUMMARY = "OpenZFS on Linux and FreeBSD"
2DESCRIPTION = "OpenZFS on Linux and FreeBSD" 2DESCRIPTION = "OpenZFS on Linux and FreeBSD"
3LICENSE = "CDDL-1.0" 3LICENSE = "CDDL-1.0"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=7087caaf1dc8a2856585619f4a787faa" 4LIC_FILES_CHKSUM = "file://LICENSE;md5=7087caaf1dc8a2856585619f4a787faa"
5HOMEPAGE ="https://github.com/openzfs/zfs" 5HOMEPAGE = "https://github.com/openzfs/zfs"
6 6
7SRCREV = "494aaaed89cb9fe9f2da3b6c6f465a4bc9f6a7e1" 7SRCREV = "33174af15112ed5c53299da2d28e763b0163f428"
8SRC_URI = "git://github.com/openzfs/zfs;protocol=https;branch=zfs-2.2-release \ 8SRC_URI = "git://github.com/openzfs/zfs;protocol=https;branch=zfs-2.2-release \
9 file://0001-Define-strndupa-if-it-does-not-exist.patch \ 9 file://0001-Define-strndupa-if-it-does-not-exist.patch \
10 file://aaf28a4630af60496c9d33db1d06a7d7d8983422.patch \ 10 file://aaf28a4630af60496c9d33db1d06a7d7d8983422.patch \
11 file://0001-fs-tests-cmd-readmmap-Replace-uint_t-with-uint32_t.patch \ 11 file://0001-fs-tests-cmd-readmmap-Replace-uint_t-with-uint32_t.patch \
12" 12"
13 13
14S = "${WORKDIR}/git"
15 14
16# Using both 'module' and 'autotools' classes seems a bit odd, they both 15# Using both 'module' and 'autotools' classes seems a bit odd, they both
17# define a do_compile function. 16# define a do_compile function.
@@ -20,9 +19,11 @@ inherit module-base pkgconfig autotools bash-completion
20 19
21DEPENDS = "virtual/kernel zlib util-linux libtirpc openssl curl" 20DEPENDS = "virtual/kernel zlib util-linux libtirpc openssl curl"
22 21
23PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd sysvinit', d)}" 22PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd sysvinit', d)} \
23 ${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \
24 "
24 25
25PACKAGECONFIG[pam] = "--enable-pam --with-pamconfigsdir=${datadir}/pam-configs --with-pammoduledir=${libdir}/security, --disable-pam" 26PACKAGECONFIG[pam] = "--enable-pam --with-pamconfigsdir=${datadir}/pam-configs --with-pammoduledir=${base_libdir}/security, --disable-pam"
26PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd," 27PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,"
27PACKAGECONFIG[sysvinit] = "--enable-sysvinit,--disable-sysvinit," 28PACKAGECONFIG[sysvinit] = "--enable-sysvinit,--disable-sysvinit,"
28 29
@@ -35,9 +36,15 @@ EXTRA_OECONF:append = " \
35 --with-systemdgeneratordir=${nonarch_base_libdir}/systemd/system-generators \ 36 --with-systemdgeneratordir=${nonarch_base_libdir}/systemd/system-generators \
36 --with-systemdpresetdir=${nonarch_base_libdir}/systemd/system-preset \ 37 --with-systemdpresetdir=${nonarch_base_libdir}/systemd/system-preset \
37 --with-systemdmodulesloaddir=${sysconfdir}/module-load.d \ 38 --with-systemdmodulesloaddir=${sysconfdir}/module-load.d \
38 --without-dracutdir \ 39 --without-dracutdir --enable-linux-builtin \
39" 40"
40 41
42# Reproducibility: Force target distribution ("vendor") to Debian to match
43# default values for things like: NFS server service name, bash completion
44# path, configuration files, ...
45# The Debian values do match the OpenEmbedded ones.
46EXTRA_OECONF:append = " --with-vendor=debian"
47
41EXTRA_OEMAKE:append = " \ 48EXTRA_OEMAKE:append = " \
42 INSTALL_MOD_PATH=${D}${root_prefix} \ 49 INSTALL_MOD_PATH=${D}${root_prefix} \
43" 50"
@@ -63,6 +70,8 @@ FILES:${PN} += "\
63 ${bindir} \ 70 ${bindir} \
64 ${libexecdir}/${BPN} \ 71 ${libexecdir}/${BPN} \
65 ${libdir} \ 72 ${libdir} \
73 ${datadir}/pam-configs \
74 ${base_libdir}/security \
66" 75"
67 76
68FILES:${PN}-dev += "\ 77FILES:${PN}-dev += "\
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-02 02:32:21 +0000