From: Daniel Golle Date: Sat, 19 Oct 2024 23:48:57 +0000 (+0100) Subject: mediatek: fix OpenWrt One ubinized image in IB X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e550c6d3817c11fcd74f01fb9a7a62c9f733d490;p=openwrt%2Fstaging%2Fblocktrron.git mediatek: fix OpenWrt One ubinized image in IB The ImageBuilder when using the profile for the OpenWrt One has been failing because the initramfs image included in the ubinized image could not be found. Fix that by using the staged initramfs instead when using the ImageBuilder. Fixes: 797904b3cb ("mediatek/filogic: add OpenWrt One support") Signed-off-by: Daniel Golle --- diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk index 83f1336444..ac535aeaa0 100644 --- a/target/linux/mediatek/image/filogic.mk +++ b/target/linux/mediatek/image/filogic.mk @@ -1090,7 +1090,9 @@ define Device/openwrt_one UBINIZE_OPTS := -E 5 BLOCKSIZE := 128k PAGESIZE := 2048 - UBINIZE_PARTS := fip=:$(STAGING_DIR_IMAGE)/mt7981_openwrt_one-snand-u-boot.fip recovery=:$(KDIR)/tmp/openwrt-mediatek-filogic-openwrt_one-initramfs.itb \ + UBINIZE_PARTS := fip=:$(STAGING_DIR_IMAGE)/mt7981_openwrt_one-snand-u-boot.fip \ + $(if $(IB),recovery=:$(STAGING_DIR_IMAGE)/mediatek-filogic-openwrt_one-initramfs.itb,\ + recovery=:$(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE)) \ $(if $(wildcard $(TOPDIR)/openwrt-mediatek-filogic-openwrt_one-calibration.itb), calibration=:$(TOPDIR)/openwrt-mediatek-filogic-openwrt_one-calibration.itb) endef TARGET_DEVICES += openwrt_one