diff options
| author | Hauke Mehrtens | 2024-10-05 13:08:02 +0000 |
|---|---|---|
| committer | Hauke Mehrtens | 2024-10-06 01:46:45 +0000 |
| commit | ca325ee516e63ae138cbd5bbf20316139efe882f (patch) | |
| tree | 7b36075db08d1b090e363cba40abcbe31501b4bb | |
| parent | 0852d814f0157f780e9309369cf2996fd86b951b (diff) | |
| download | openwrt-ca325ee516e63ae138cbd5bbf20316139efe882f.tar.gz | |
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@hauke-m.de>
| -rw-r--r-- | target/linux/apm821xx/image/Makefile | 3 | ||||
| -rw-r--r-- | 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) \ |