From f5fd7ef8886faadc654b627e5e4b4484c6ca31d7 Mon Sep 17 00:00:00 2001 From: Eric Fahlgren Date: Sun, 19 Oct 2025 16:33:26 -0700 Subject: [PATCH] targetwide: imagebuilder: add explicit guards around initramfs rules Additional work building upon f6e0f57be0af Add more explict guards around the unsupported generation of the initramfs images and suppress requirement for certain others. Fixes: https://github.com/openwrt/openwrt/issues/20151 Fixes: https://github.com/openwrt/asu/issues/1499 Signed-off-by: Eric Fahlgren Link: https://github.com/openwrt/openwrt/pull/20460 Signed-off-by: Robert Marko --- target/linux/mediatek/image/filogic.mk | 4 ++-- target/linux/qualcommax/image/ipq807x.mk | 6 ++++++ target/linux/ramips/image/common-sercomm.mk | 2 ++ target/linux/ramips/image/mt7621.mk | 6 ++++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk index b9ed99055f7..4d13a1ab849 100644 --- a/target/linux/mediatek/image/filogic.mk +++ b/target/linux/mediatek/image/filogic.mk @@ -1040,11 +1040,11 @@ define Device/dlink_aquila-pro-ai-m30-a1 DEVICE_DTS_DIR := ../dts DEVICE_PACKAGES := kmod-leds-gca230718 kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware KERNEL_IN_UBI := 1 - IMAGES += recovery.bin IMAGE_SIZE := 51200k IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata ifeq ($(IB),) ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) + IMAGES += recovery.bin IMAGE/recovery.bin := append-image-stage initramfs-kernel.bin | sysupgrade-tar kernel=$$$$@ |\ pad-to $$(IMAGE_SIZE) | dlink-ai-recovery-header DLK6E6110001 \x6A\x28\xEE\x0B \x00\x00\x2C\x00 \x00\x00\x20\x03 \x61\x6E endif @@ -1059,11 +1059,11 @@ define Device/dlink_aquila-pro-ai-m60-a1 DEVICE_DTS := mt7986a-dlink-aquila-pro-ai-m60-a1 DEVICE_DTS_DIR := ../dts DEVICE_PACKAGES := kmod-leds-gca230718 kmod-mt7915e kmod-mt7986-firmware mt7986-wo-firmware - IMAGES += recovery.bin IMAGE_SIZE := 51200k IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata ifeq ($(IB),) ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) + IMAGES += recovery.bin IMAGE/recovery.bin := append-image-stage initramfs-kernel.bin | sysupgrade-tar kernel=$$$$@ |\ pad-to $$(IMAGE_SIZE) | dlink-ai-recovery-header DLK6E8202001 \x30\x6C\x19\x0C \x00\x00\x2C\x00 \x00\x00\x20\x03 \x82\x6E endif diff --git a/target/linux/qualcommax/image/ipq807x.mk b/target/linux/qualcommax/image/ipq807x.mk index 4074f86c6d2..1a356b02618 100644 --- a/target/linux/qualcommax/image/ipq807x.mk +++ b/target/linux/qualcommax/image/ipq807x.mk @@ -311,10 +311,12 @@ define Device/netgear_wax218 BLOCKSIZE := 128k PAGESIZE := 2048 SOC := ipq8072 +ifeq ($(IB),) ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) ARTIFACTS := web-ui-factory.fit ARTIFACT/web-ui-factory.fit := append-image initramfs-uImage.itb | \ ubinize-kernel | qsdk-ipq-factory-nand +endif endif DEVICE_PACKAGES := kmod-spi-gpio kmod-spi-bitbang kmod-gpio-nxp-74hc164 \ ipq-wifi-netgear_wax218 @@ -454,10 +456,12 @@ define Device/xiaomi_ax3600 SOC := ipq8071 KERNEL_SIZE := 36608k DEVICE_PACKAGES := ipq-wifi-xiaomi_ax3600 kmod-ath10k-ct-smallbuffers ath10k-firmware-qca9887-ct +ifeq ($(IB),) ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) ARTIFACTS := initramfs-factory.ubi ARTIFACT/initramfs-factory.ubi := append-image-stage initramfs-uImage.itb | ubinize-kernel endif +endif endef TARGET_DEVICES += xiaomi_ax3600 @@ -473,10 +477,12 @@ define Device/xiaomi_ax9000 KERNEL_SIZE := 57344k DEVICE_PACKAGES := ipq-wifi-xiaomi_ax9000 kmod-ath11k-pci ath11k-firmware-qcn9074 \ kmod-ath10k-ct ath10k-firmware-qca9887-ct +ifeq ($(IB),) ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) ARTIFACTS := initramfs-factory.ubi ARTIFACT/initramfs-factory.ubi := append-image-stage initramfs-uImage.itb | ubinize-kernel endif +endif endef TARGET_DEVICES += xiaomi_ax9000 diff --git a/target/linux/ramips/image/common-sercomm.mk b/target/linux/ramips/image/common-sercomm.mk index 09870109112..89c94c3197d 100644 --- a/target/linux/ramips/image/common-sercomm.mk +++ b/target/linux/ramips/image/common-sercomm.mk @@ -182,7 +182,9 @@ define Device/sercomm_cpj IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ sercomm-sysupgrade-cpj | pad-rootfs | check-size | \ append-metadata +ifeq ($(IB),) ARTIFACTS := initramfs-factory.img +endif DEVICE_PACKAGES := kmod-mt76x2 endef diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 45bb2ab1010..4a28b652ce6 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -1659,9 +1659,11 @@ define Device/iodata_wn-ax1167gr IMAGE_SIZE := 15552k DEVICE_VENDOR := I-O DATA DEVICE_MODEL := WN-AX1167GR +ifeq ($(IB),) ARTIFACTS := initramfs-factory.bin ARTIFACT/initramfs-factory.bin := append-image-stage initramfs-kernel.bin | \ check-size 7680k | senao-header -r 0x30a -p 0x1055 -t 4 +endif DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 -uboot-envtools endef TARGET_DEVICES += iodata_wn-ax1167gr @@ -1711,10 +1713,12 @@ define Device/iodata_wn-deax1800gr KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \ fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata +ifeq ($(IB),) ARTIFACTS := initramfs-factory.bin ARTIFACT/initramfs-factory.bin := append-image-stage initramfs-kernel.bin | \ check-size | xor-image -p 29944a25120984c2 -x | \ iodata-mstc-header2 WN-DEAX1800GR 00021003 +endif DEVICE_PACKAGES := kmod-mt7915-firmware endef TARGET_DEVICES += iodata_wn-deax1800gr @@ -1842,9 +1846,11 @@ define Device/iptime_ax2004m KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \ fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb +ifeq ($(IB),) ARTIFACTS := initramfs-factory.bin ARTIFACT/initramfs-factory.bin := append-image-stage initramfs-kernel.bin | \ check-size | iptime-crc32 ax2004m +endif DEVICE_VENDOR := ipTIME DEVICE_MODEL := AX2004M DEVICE_PACKAGES := kmod-mt7915-firmware kmod-usb3 -- 2.47.3