maple/istoreos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

targetwide: imagebuilder: add explicit guards around initramfs rules

Browse Source 
Additional work building upon f6e0f57be0

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 <ericfahlgren@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/20460
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Eric Fahlgren 2025-10-19 16:33:26 -07:00 committed by Robert Marko
parent d924a0cff8
commit f5fd7ef888
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/mediatek/image/filogic.mk
View File

@ -1040,11 +1040,11 @@ define Device/dlink_aquila-pro-ai-m30-a1
DEVICE_DTS_DIR := ../dts DEVICE_DTS_DIR := ../dts
DEVICE_PACKAGES := kmod-leds-gca230718 kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware DEVICE_PACKAGES := kmod-leds-gca230718 kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware
KERNEL_IN_UBI := 1 KERNEL_IN_UBI := 1
IMAGES += recovery.bin
IMAGE_SIZE := 51200k IMAGE_SIZE := 51200k
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
ifeq ($(IB),) ifeq ($(IB),)
ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
IMAGES += recovery.bin
IMAGE/recovery.bin := append-image-stage initramfs-kernel.bin | sysupgrade-tar kernel=$$$$@ |\ 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 pad-to $$(IMAGE_SIZE) | dlink-ai-recovery-header DLK6E6110001 \x6A\x28\xEE\x0B \x00\x00\x2C\x00 \x00\x00\x20\x03 \x61\x6E
endif endif
@ -1059,11 +1059,11 @@ define Device/dlink_aquila-pro-ai-m60-a1
DEVICE_DTS := mt7986a-dlink-aquila-pro-ai-m60-a1 DEVICE_DTS := mt7986a-dlink-aquila-pro-ai-m60-a1
DEVICE_DTS_DIR := ../dts DEVICE_DTS_DIR := ../dts
DEVICE_PACKAGES := kmod-leds-gca230718 kmod-mt7915e kmod-mt7986-firmware mt7986-wo-firmware DEVICE_PACKAGES := kmod-leds-gca230718 kmod-mt7915e kmod-mt7986-firmware mt7986-wo-firmware
IMAGES += recovery.bin
IMAGE_SIZE := 51200k IMAGE_SIZE := 51200k
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
ifeq ($(IB),) ifeq ($(IB),)
ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
IMAGES += recovery.bin
IMAGE/recovery.bin := append-image-stage initramfs-kernel.bin | sysupgrade-tar kernel=$$$$@ |\ 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 pad-to $$(IMAGE_SIZE) | dlink-ai-recovery-header DLK6E8202001 \x30\x6C\x19\x0C \x00\x00\x2C\x00 \x00\x00\x20\x03 \x82\x6E
endif endif

6
target/linux/qualcommax/image/ipq807x.mk
View File

@ -311,10 +311,12 @@ define Device/netgear_wax218
BLOCKSIZE := 128k BLOCKSIZE := 128k
PAGESIZE := 2048 PAGESIZE := 2048
SOC := ipq8072 SOC := ipq8072
ifeq ($(IB),)
ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
ARTIFACTS := web-ui-factory.fit ARTIFACTS := web-ui-factory.fit
ARTIFACT/web-ui-factory.fit := append-image initramfs-uImage.itb | \ ARTIFACT/web-ui-factory.fit := append-image initramfs-uImage.itb | \
ubinize-kernel | qsdk-ipq-factory-nand ubinize-kernel | qsdk-ipq-factory-nand
endif
endif endif
DEVICE_PACKAGES := kmod-spi-gpio kmod-spi-bitbang kmod-gpio-nxp-74hc164 \ DEVICE_PACKAGES := kmod-spi-gpio kmod-spi-bitbang kmod-gpio-nxp-74hc164 \
ipq-wifi-netgear_wax218 ipq-wifi-netgear_wax218
@ -454,10 +456,12 @@ define Device/xiaomi_ax3600
SOC := ipq8071 SOC := ipq8071
KERNEL_SIZE := 36608k KERNEL_SIZE := 36608k
DEVICE_PACKAGES := ipq-wifi-xiaomi_ax3600 kmod-ath10k-ct-smallbuffers ath10k-firmware-qca9887-ct DEVICE_PACKAGES := ipq-wifi-xiaomi_ax3600 kmod-ath10k-ct-smallbuffers ath10k-firmware-qca9887-ct
ifeq ($(IB),)
ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
ARTIFACTS := initramfs-factory.ubi ARTIFACTS := initramfs-factory.ubi
ARTIFACT/initramfs-factory.ubi := append-image-stage initramfs-uImage.itb | ubinize-kernel ARTIFACT/initramfs-factory.ubi := append-image-stage initramfs-uImage.itb | ubinize-kernel
endif endif
endif
endef endef
TARGET_DEVICES += xiaomi_ax3600 TARGET_DEVICES += xiaomi_ax3600
@ -473,10 +477,12 @@ define Device/xiaomi_ax9000
KERNEL_SIZE := 57344k KERNEL_SIZE := 57344k
DEVICE_PACKAGES := ipq-wifi-xiaomi_ax9000 kmod-ath11k-pci ath11k-firmware-qcn9074 \ DEVICE_PACKAGES := ipq-wifi-xiaomi_ax9000 kmod-ath11k-pci ath11k-firmware-qcn9074 \
kmod-ath10k-ct ath10k-firmware-qca9887-ct kmod-ath10k-ct ath10k-firmware-qca9887-ct
ifeq ($(IB),)
ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
ARTIFACTS := initramfs-factory.ubi ARTIFACTS := initramfs-factory.ubi
ARTIFACT/initramfs-factory.ubi := append-image-stage initramfs-uImage.itb | ubinize-kernel ARTIFACT/initramfs-factory.ubi := append-image-stage initramfs-uImage.itb | ubinize-kernel
endif endif
endif
endef endef
TARGET_DEVICES += xiaomi_ax9000 TARGET_DEVICES += xiaomi_ax9000

2
target/linux/ramips/image/common-sercomm.mk
View File

@ -182,7 +182,9 @@ define Device/sercomm_cpj
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
sercomm-sysupgrade-cpj | pad-rootfs | check-size | \ sercomm-sysupgrade-cpj | pad-rootfs | check-size | \
append-metadata append-metadata
ifeq ($(IB),)
ARTIFACTS := initramfs-factory.img ARTIFACTS := initramfs-factory.img
endif
DEVICE_PACKAGES := kmod-mt76x2 DEVICE_PACKAGES := kmod-mt76x2
endef endef

6
target/linux/ramips/image/mt7621.mk
View File

@ -1659,9 +1659,11 @@ define Device/iodata_wn-ax1167gr
IMAGE_SIZE := 15552k IMAGE_SIZE := 15552k
DEVICE_VENDOR := I-O DATA DEVICE_VENDOR := I-O DATA
DEVICE_MODEL := WN-AX1167GR DEVICE_MODEL := WN-AX1167GR
ifeq ($(IB),)
ARTIFACTS := initramfs-factory.bin ARTIFACTS := initramfs-factory.bin
ARTIFACT/initramfs-factory.bin := append-image-stage initramfs-kernel.bin | \ ARTIFACT/initramfs-factory.bin := append-image-stage initramfs-kernel.bin | \
check-size 7680k | senao-header -r 0x30a -p 0x1055 -t 4 check-size 7680k | senao-header -r 0x30a -p 0x1055 -t 4
endif
DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 -uboot-envtools DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 -uboot-envtools
endef endef
TARGET_DEVICES += iodata_wn-ax1167gr TARGET_DEVICES += iodata_wn-ax1167gr
@ -1711,10 +1713,12 @@ define Device/iodata_wn-deax1800gr
KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \ KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \
fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
ifeq ($(IB),)
ARTIFACTS := initramfs-factory.bin ARTIFACTS := initramfs-factory.bin
ARTIFACT/initramfs-factory.bin := append-image-stage initramfs-kernel.bin | \ ARTIFACT/initramfs-factory.bin := append-image-stage initramfs-kernel.bin | \
check-size | xor-image -p 29944a25120984c2 -x | \ check-size | xor-image -p 29944a25120984c2 -x | \
iodata-mstc-header2 WN-DEAX1800GR 00021003 iodata-mstc-header2 WN-DEAX1800GR 00021003
endif
DEVICE_PACKAGES := kmod-mt7915-firmware DEVICE_PACKAGES := kmod-mt7915-firmware
endef endef
TARGET_DEVICES += iodata_wn-deax1800gr TARGET_DEVICES += iodata_wn-deax1800gr
@ -1842,9 +1846,11 @@ define Device/iptime_ax2004m
KERNEL_LOADADDR := 0x82000000 KERNEL_LOADADDR := 0x82000000
KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \ KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \
fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb
ifeq ($(IB),)
ARTIFACTS := initramfs-factory.bin ARTIFACTS := initramfs-factory.bin
ARTIFACT/initramfs-factory.bin := append-image-stage initramfs-kernel.bin | \ ARTIFACT/initramfs-factory.bin := append-image-stage initramfs-kernel.bin | \
check-size | iptime-crc32 ax2004m check-size | iptime-crc32 ax2004m
endif
DEVICE_VENDOR := ipTIME DEVICE_VENDOR := ipTIME
DEVICE_MODEL := AX2004M DEVICE_MODEL := AX2004M
DEVICE_PACKAGES := kmod-mt7915-firmware kmod-usb3 DEVICE_PACKAGES := kmod-mt7915-firmware kmod-usb3