ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-29 18:19:02 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

gemini: apm821xx: Ignore return value of e2fsck

Browse Source 
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: 95e4664b5e ("tools: e2fsprogs: drop e2fsck patch")
Link: https://github.com/openwrt/openwrt/pull/16607
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Hauke Mehrtens 2024-10-05 15:08:02 +02:00
parent 0852d814f0
commit ca325ee516
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
target/linux/apm821xx/image/Makefile
View File

@ -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 $@.boot $(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 endef
define Build/boot-script define Build/boot-script

3
target/linux/gemini/image/Makefile
View File

@ -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 $@.tmp-boot $(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) \ ./dns313_gen_hdd_img.sh $@ $@.tmp-boot $(IMAGE_ROOTFS) \
$(CONFIG_TARGET_KERNEL_PARTSIZE) \ $(CONFIG_TARGET_KERNEL_PARTSIZE) \