فهرست منبع

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 <[email protected]>
Hauke Mehrtens 1 سال پیش
والد
کامیت
ca325ee516
2فایلهای تغییر یافته به همراه4 افزوده شده و 2 حذف شده
  1. 2 1
      target/linux/apm821xx/image/Makefile
  2. 2 1
      target/linux/gemini/image/Makefile

+ 2 - 1
target/linux/apm821xx/image/Makefile

@@ -17,7 +17,8 @@ define Build/boot-img
 
 
 	# convert it to revision 1 - needed for u-boot ext2load
 	# convert it to revision 1 - needed for u-boot ext2load
 	$(STAGING_DIR_HOST)/bin/tune2fs -O filetype [email protected]
 	$(STAGING_DIR_HOST)/bin/tune2fs -O filetype [email protected]
-	$(STAGING_DIR_HOST)/bin/e2fsck -pDf [email protected] > /dev/null
+	# Ignore errors because file system was intentionally broken with tune2fs
+	-$(STAGING_DIR_HOST)/bin/e2fsck -pDf [email protected] > /dev/null
 endef
 endef
 
 
 define Build/boot-script
 define Build/boot-script

+ 2 - 1
target/linux/gemini/image/Makefile

@@ -56,7 +56,8 @@ define Build/dns313-images
 
 
 	# The device firmware needs revision 1 of EXT2
 	# The device firmware needs revision 1 of EXT2
 	$(STAGING_DIR_HOST)/bin/tune2fs -O filetype [email protected]
 	$(STAGING_DIR_HOST)/bin/tune2fs -O filetype [email protected]
-	$(STAGING_DIR_HOST)/bin/e2fsck -pDf [email protected] > /dev/null
+	# Ignore errors because file system was intentionally broken with tune2fs
+	-$(STAGING_DIR_HOST)/bin/e2fsck -pDf [email protected] > /dev/null
 
 
 	./dns313_gen_hdd_img.sh $@ [email protected] $(IMAGE_ROOTFS) \
 	./dns313_gen_hdd_img.sh $@ [email protected] $(IMAGE_ROOTFS) \
 		$(CONFIG_TARGET_KERNEL_PARTSIZE) \
 		$(CONFIG_TARGET_KERNEL_PARTSIZE) \