similarity index 53%
rename from meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/makefile-add-ldflags.patch
rename to meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-Makefile-add-LDFLAGS.patch
@@ -1,12 +1,20 @@
+From 8393f9d64b4cead722ee1a7674da1c41b33cfdcc Mon Sep 17 00:00:00 2001
+From: Yi Zhao <yi.zhao@windriver.com>
+Date: Fri, 20 Jun 2025 15:08:19 +0800
+Subject: [PATCH] Makefile: add LDFLAGS
+
Upstream-Status: Pending
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ utils/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/utils/Makefile b/utils/Makefile
-index 710ebbf..6259893 100644
+index a00fa13..13e91f7 100644
--- a/utils/Makefile
+++ b/utils/Makefile
-@@ -57,10 +57,10 @@ $(COMMONOBJS) $(MKYAFFSIMAGEOBJS) $(MKYAFFS2IMAGEOBJS) : %.o: %.c
+@@ -56,10 +56,10 @@ $(COMMONOBJS) $(MKYAFFSIMAGEOBJS) $(MKYAFFS2IMAGEOBJS) : %.o: %.c
$(CC) -c $(CFLAGS) $< -o $@
mkyaffsimage: $(MKYAFFSIMAGEOBJS) $(COMMONOBJS)
@@ -19,3 +27,6 @@ index 710ebbf..6259893 100644
clean:
+--
+2.34.1
+
similarity index 61%
rename from meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-define-loff_t-if-not-already-defined.patch
rename to meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0002-define-loff_t-if-not-already-defined.patch
@@ -1,22 +1,22 @@
-From 848717da4a28d33f8aa8f889377e61e6b1b8ae67 Mon Sep 17 00:00:00 2001
+From 72f923440fef3b875e5570094e4cf398a201521f Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 13 Jul 2017 18:29:52 -0700
Subject: [PATCH] define loff_t if not already defined
Helps to build with musl
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
Upstream-Status: Pending
- yaffs_guts.h | 4 ++++
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ core/yaffs_guts.h | 4 ++++
1 file changed, 4 insertions(+)
-diff --git a/yaffs_guts.h b/yaffs_guts.h
-index 6bcf12d..4af17ce 100644
---- a/yaffs_guts.h
-+++ b/yaffs_guts.h
-@@ -18,6 +18,10 @@
+diff --git a/core/yaffs_guts.h b/core/yaffs_guts.h
+index 74ded0b..4bd2646 100644
+--- a/core/yaffs_guts.h
++++ b/core/yaffs_guts.h
+@@ -17,6 +17,10 @@
#include "yportenv.h"
@@ -28,5 +28,5 @@ index 6bcf12d..4af17ce 100644
#define YAFFS_FAIL 0
--
-2.13.2
+2.34.1
similarity index 67%
rename from meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-yaffs_guts.h-define-YTIME_T-if-not-already-defined.patch
rename to meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0003-yaffs_guts.h-define-YTIME_T-if-not-already-defined.patch
@@ -1,4 +1,4 @@
-From 05cc2b958090f96d6fa128da43aa69669625e529 Mon Sep 17 00:00:00 2001
+From 75fe0fbe254f63fe58d22f2d6090e9a8b3a6fe41 Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Tue, 5 Mar 2024 12:03:23 +0000
Subject: [PATCH] yaffs_guts.h: define YTIME_T if not already defined
@@ -11,14 +11,14 @@ Upstream-Status: Pending
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
- yaffs_guts.h | 4 ++++
+ core/yaffs_guts.h | 4 ++++
1 file changed, 4 insertions(+)
-diff --git a/yaffs_guts.h b/yaffs_guts.h
-index 74ded0b..598271b 100644
---- a/yaffs_guts.h
-+++ b/yaffs_guts.h
-@@ -487,6 +487,10 @@ struct yaffs_obj {
+diff --git a/core/yaffs_guts.h b/core/yaffs_guts.h
+index 4bd2646..507bf16 100644
+--- a/core/yaffs_guts.h
++++ b/core/yaffs_guts.h
+@@ -491,6 +491,10 @@ struct yaffs_obj {
YCHAR short_name[YAFFS_SHORT_NAME_LENGTH + 1];
@@ -30,5 +30,5 @@ index 74ded0b..598271b 100644
//these are always 64 bits
u32 win_ctime[2];
--
-2.35.5
+2.34.1
new file mode 100644
@@ -0,0 +1,35 @@
+From 8349d121e3595ac4d935169150984260f8b697b9 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <yi.zhao@windriver.com>
+Date: Fri, 20 Jun 2025 15:20:05 +0800
+Subject: [PATCH] utils/Makefile: fix symbolic links
+
+Create correct symlinks to fix the following error:
+
+mkyaffsimage.c:29:10: fatal error: yaffs_ecc.h: No such file or directory
+ 29 | #include "yaffs_ecc.h"
+ | ^~~~~~~~~~~~~
+
+Upstream-Status: Submitted
+[https://github.com/Aleph-One-Ltd/yaffs2/pull/13]
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ utils/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/Makefile b/utils/Makefile
+index a00fa13..22c2fdb 100644
+--- a/utils/Makefile
++++ b/utils/Makefile
+@@ -45,7 +45,7 @@ ALL_LINKS = $(BASE_LINKS) $(DIRECT_LINKS)
+ all: mkyaffsimage mkyaffs2image
+
+ $(BASE_LINKS):
+- ln -s ../$@ $@
++ ln -s ../core/$@ $@
+
+ $(DIRECT_LINKS):
+ ln -s ../direct/$@ $@
+--
+2.34.1
+
@@ -15,12 +15,13 @@ PV = "20221209"
DEPENDS = "mtd-utils"
SRC_URI = "git://github.com/Aleph-One-Ltd/yaffs2;protocol=https;branch=master \
- file://makefile-add-ldflags.patch \
- file://0001-define-loff_t-if-not-already-defined.patch \
- file://0001-yaffs_guts.h-define-YTIME_T-if-not-already-defined.patch \
+ file://0001-Makefile-add-LDFLAGS.patch \
+ file://0002-define-loff_t-if-not-already-defined.patch \
+ file://0003-yaffs_guts.h-define-YTIME_T-if-not-already-defined.patch \
+ file://0004-utils-Makefile-fix-symbolic-links.patch \
"
-SRCREV = "613a901a229e8a701c18f003dd0aee18453e0670"
+SRCREV = "68030683543cccb4d942e3fedbcad1dc267e261c"
UPSTREAM_CHECK_COMMITS = "1"
* Refresh patches. * Add a patch to fix build error. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- ....patch => 0001-Makefile-add-LDFLAGS.patch} | 15 ++++++-- ...efine-loff_t-if-not-already-defined.patch} | 20 +++++------ ...fine-YTIME_T-if-not-already-defined.patch} | 16 ++++----- ...04-utils-Makefile-fix-symbolic-links.patch | 35 +++++++++++++++++++ .../yaffs2/yaffs2-utils_git.bb | 9 ++--- 5 files changed, 71 insertions(+), 24 deletions(-) rename meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/{makefile-add-ldflags.patch => 0001-Makefile-add-LDFLAGS.patch} (53%) rename meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/{0001-define-loff_t-if-not-already-defined.patch => 0002-define-loff_t-if-not-already-defined.patch} (61%) rename meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/{0001-yaffs_guts.h-define-YTIME_T-if-not-already-defined.patch => 0003-yaffs_guts.h-define-YTIME_T-if-not-already-defined.patch} (67%) create mode 100644 meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0004-utils-Makefile-fix-symbolic-links.patch