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: 95e4664 ("tools: e2fsprogs: drop e2fsck patch") Link: openwrt#16607 Signed-off-by: Hauke Mehrtens <[email protected]>
rmandrad · Oct 6, 2024 · ca325ee · ca325ee
1 parent 0852d81
commit ca325ee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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) \