[openwrt/openwrt] gemini: apm821xx: Ignore return value of e2fsck

LEDE Commits lede-commits at lists.infradead.org
Sat Oct 5 18:50:37 PDT 2024


hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/ca325ee516e63ae138cbd5bbf20316139efe882f

commit ca325ee516e63ae138cbd5bbf20316139efe882f
Author: Hauke Mehrtens <hauke at hauke-m.de>
AuthorDate: Sat Oct 5 15:08:02 2024 +0200

    gemini: apm821xx: Ignore return value of e2fsck
    
    This fixes the build of the gemini and the apm821xx target.
    The e2fsck application returns an error code now and that makes the
    build fail. The tune2fs command adds an extra option and the e2fsck
    should later fix the file system. It is intentionally broken in this
    place.
    
    e2fsprogs was patched before to ignore this error.
    
    Fixes: 95e4664b5efc ("tools: e2fsprogs: drop e2fsck patch")
    Link: https://github.com/openwrt/openwrt/pull/16607
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
 target/linux/apm821xx/image/Makefile | 3 ++-
 target/linux/gemini/image/Makefile   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/target/linux/apm821xx/image/Makefile b/target/linux/apm821xx/image/Makefile
index 03799bcc10..1f09f8de75 100644
--- a/target/linux/apm821xx/image/Makefile
+++ b/target/linux/apm821xx/image/Makefile
@@ -17,7 +17,8 @@ define Build/boot-img
 
 	# convert it to revision 1 - needed for u-boot ext2load
 	$(STAGING_DIR_HOST)/bin/tune2fs -O filetype $@.boot
-	$(STAGING_DIR_HOST)/bin/e2fsck -pDf $@.boot > /dev/null
+	# Ignore errors because file system was intentionally broken with tune2fs
+	-$(STAGING_DIR_HOST)/bin/e2fsck -pDf $@.boot > /dev/null
 endef
 
 define Build/boot-script
diff --git a/target/linux/gemini/image/Makefile b/target/linux/gemini/image/Makefile
index 819291ef7f..a7988cf5fb 100644
--- a/target/linux/gemini/image/Makefile
+++ b/target/linux/gemini/image/Makefile
@@ -56,7 +56,8 @@ define Build/dns313-images
 
 	# The device firmware needs revision 1 of EXT2
 	$(STAGING_DIR_HOST)/bin/tune2fs -O filetype $@.tmp-boot
-	$(STAGING_DIR_HOST)/bin/e2fsck -pDf $@.tmp-boot > /dev/null
+	# Ignore errors because file system was intentionally broken with tune2fs
+	-$(STAGING_DIR_HOST)/bin/e2fsck -pDf $@.tmp-boot > /dev/null
 
 	./dns313_gen_hdd_img.sh $@ $@.tmp-boot $(IMAGE_ROOTFS) \
 		$(CONFIG_TARGET_KERNEL_PARTSIZE) \




More information about the lede-commits mailing list