mirror
/
openwrt
mirror of https://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Releases Activity

treewide: call check-size before append-metadata 

sysupgrade metadata is not flashed to the device, so check-size
should be called _before_ adding metadata to the image.

While at it, do some obvious wrapping improvements.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Acked-by: Paul Spooren <mail@aparcar.org>
This commit is contained in:
Adrian Schmutzler 2021-06-20 18:54:36 +02:00
parent 918908fe76
commit cce8d16bf1
23 changed files with 64 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/ath79/image/Makefile
View File

@ -81,7 +81,7 @@ define Device/Default
COMPILE := COMPILE :=
IMAGES := sysupgrade.bin IMAGES := sysupgrade.bin
IMAGE/sysupgrade.bin = append-kernel | pad-to $$$$(BLOCKSIZE) | \ IMAGE/sysupgrade.bin = append-kernel | pad-to $$$$(BLOCKSIZE) | \
append-rootfs | pad-rootfs | append-metadata | check-size append-rootfs | pad-rootfs | check-size | append-metadata
endef endef
include $(SUBTARGET).mk include $(SUBTARGET).mk

2
target/linux/ath79/image/common-mikrotik.mk
View File

@ -9,7 +9,7 @@ define Device/mikrotik_nor
$(Device/mikrotik) $(Device/mikrotik)
IMAGE/sysupgrade.bin := append-kernel | kernel2minor -s 1024 -e | \ IMAGE/sysupgrade.bin := append-kernel | kernel2minor -s 1024 -e | \
pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | \ pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | \
append-metadata | check-size check-size | append-metadata
endef endef
define Device/mikrotik_nand define Device/mikrotik_nand

10
target/linux/ath79/image/common-netgear.mk
View File

@ -32,10 +32,8 @@ define Device/netgear_generic
KERNEL := kernel-bin | append-dtb | lzma -d20 | uImage lzma KERNEL := kernel-bin | append-dtb | lzma -d20 | uImage lzma
KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma -d20 | uImage lzma KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma -d20 | uImage lzma
IMAGES += factory.img IMAGES += factory.img
IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | \ IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | \
append-rootfs | pad-rootfs netgear-squashfs | append-rootfs | pad-rootfs
IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | \ IMAGE/sysupgrade.bin := $$(IMAGE/default) | check-size | append-metadata
check-size IMAGE/factory.img := $$(IMAGE/default) | netgear-dni | check-size
IMAGE/factory.img := $$(IMAGE/default) | netgear-dni | \
check-size
endef endef

5
target/linux/ath79/image/common-tp-link.mk
View File

@ -22,8 +22,7 @@ define Device/tplink-v2
TPLINK_HVERSION := 3 TPLINK_HVERSION := 3
KERNEL := kernel-bin | append-dtb | lzma KERNEL := kernel-bin | append-dtb | lzma
KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | tplink-v2-header KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | tplink-v2-header
IMAGE/sysupgrade.bin := tplink-v2-image -s | append-metadata | \ IMAGE/sysupgrade.bin := tplink-v2-image -s | check-size | append-metadata
check-size
endef endef
define Device/tplink-nolzma define Device/tplink-nolzma
@ -74,7 +73,7 @@ define Device/tplink-safeloader
KERNEL := kernel-bin | append-dtb | lzma | tplink-v1-header -O KERNEL := kernel-bin | append-dtb | lzma | tplink-v1-header -O
KERNEL_INITRAMFS := $$(KERNEL) KERNEL_INITRAMFS := $$(KERNEL)
IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | \ IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | \
append-metadata | check-size check-size | append-metadata
IMAGE/factory.bin := append-rootfs | tplink-safeloader factory IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
endef endef

2
target/linux/ath79/image/generic-tp-link.mk
View File

@ -692,7 +692,7 @@ define Device/tplink_tl-wr2543-v1
DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
TPLINK_HWID := 0x25430001 TPLINK_HWID := 0x25430001
IMAGE/sysupgrade.bin := tplink-v1-image sysupgrade -v 3.13.99 | \ IMAGE/sysupgrade.bin := tplink-v1-image sysupgrade -v 3.13.99 | \
append-metadata | check-size check-size | append-metadata
IMAGE/factory.bin := tplink-v1-image factory -v 3.13.99 IMAGE/factory.bin := tplink-v1-image factory -v 3.13.99
SUPPORTED_DEVICES += tl-wr2543n SUPPORTED_DEVICES += tl-wr2543n
endef endef

4
target/linux/ath79/image/generic-ubnt.mk
View File

@ -128,7 +128,7 @@ define Device/ubnt-unifi-jffs2
KERNEL := kernel-bin | append-dtb | lzma | uImage lzma | jffs2 kernel0 KERNEL := kernel-bin | append-dtb | lzma | uImage lzma | jffs2 kernel0
IMAGES := sysupgrade.bin factory.bin IMAGES := sysupgrade.bin factory.bin
IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-rootfs |\ IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-rootfs |\
pad-rootfs | append-metadata | check-size pad-rootfs | check-size | append-metadata
IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | mkubntimage2 IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | mkubntimage2
endef endef
@ -373,7 +373,7 @@ define Device/ubnt_routerstation_common
IMAGE/factory.bin := append-rootfs | pad-rootfs | mkubntimage | \ IMAGE/factory.bin := append-rootfs | pad-rootfs | mkubntimage | \
check-size check-size
IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | combined-image | \ IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | combined-image | \
append-metadata | check-size check-size | append-metadata
KERNEL := kernel-bin | append-dtb | lzma | pad-to $$(BLOCKSIZE) KERNEL := kernel-bin | append-dtb | lzma | pad-to $$(BLOCKSIZE)
KERNEL_INITRAMFS := kernel-bin | append-dtb KERNEL_INITRAMFS := kernel-bin | append-dtb
endef endef

36
target/linux/ath79/image/generic.mk
View File

@ -172,7 +172,7 @@ define Device/seama
# - 36 bytes of META data (4-bytes aligned) # - 36 bytes of META data (4-bytes aligned)
IMAGE/default := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-rootfs IMAGE/default := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-rootfs
IMAGE/sysupgrade.bin := $$(IMAGE/default) | seama | pad-rootfs | \ IMAGE/sysupgrade.bin := $$(IMAGE/default) | seama | pad-rootfs | \
append-metadata | check-size check-size | append-metadata
IMAGE/factory.bin := $$(IMAGE/default) | pad-rootfs -x 64 | seama | \ IMAGE/factory.bin := $$(IMAGE/default) | pad-rootfs -x 64 | seama | \
seama-seal | check-size seama-seal | check-size
SEAMA_SIGNATURE := SEAMA_SIGNATURE :=
@ -336,7 +336,7 @@ define Device/avm
KERNEL_INITRAMFS := $$(KERNEL) KERNEL_INITRAMFS := $$(KERNEL)
IMAGE/sysupgrade.bin := append-kernel | pad-to 64k | \ IMAGE/sysupgrade.bin := append-kernel | pad-to 64k | \
append-squashfs-fakeroot-be | pad-to 256 | append-rootfs | pad-rootfs | \ append-squashfs-fakeroot-be | pad-to 256 | append-rootfs | pad-rootfs | \
append-metadata | check-size check-size | append-metadata
DEVICE_PACKAGES := fritz-tffs DEVICE_PACKAGES := fritz-tffs
endef endef
@ -777,7 +777,7 @@ define Device/dlink_dap-2xxx
IMAGE/factory.img := append-kernel | pad-offset 6144k 160 | \ IMAGE/factory.img := append-kernel | pad-offset 6144k 160 | \
append-rootfs | wrgg-pad-rootfs | mkwrggimg | check-size append-rootfs | wrgg-pad-rootfs | mkwrggimg | check-size
IMAGE/sysupgrade.bin := append-kernel | mkwrggimg | \ IMAGE/sysupgrade.bin := append-kernel | mkwrggimg | \
pad-to $$$$(BLOCKSIZE) | append-rootfs | append-metadata | check-size pad-to $$$$(BLOCKSIZE) | append-rootfs | check-size | append-metadata
KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma
KERNEL_INITRAMFS := $$(KERNEL) | mkwrggimg KERNEL_INITRAMFS := $$(KERNEL) | mkwrggimg
endef endef
@ -829,7 +829,7 @@ define Device/dlink_dap-2695-a1
IMAGE/factory.img := $$(IMAGE/default) | append-rootfs | wrgg-pad-rootfs | \ IMAGE/factory.img := $$(IMAGE/default) | append-rootfs | wrgg-pad-rootfs | \
mkwrggimg | check-size mkwrggimg | check-size
IMAGE/sysupgrade.bin := $$(IMAGE/default) | mkwrggimg | append-rootfs | \ IMAGE/sysupgrade.bin := $$(IMAGE/default) | mkwrggimg | append-rootfs | \
wrgg-pad-rootfs | append-metadata | check-size wrgg-pad-rootfs | check-size | append-metadata
KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma
KERNEL_INITRAMFS := $$(KERNEL) | mkwrggimg KERNEL_INITRAMFS := $$(KERNEL) | mkwrggimg
DAP_SIGNATURE := wapac02_dkbs_dap2695 DAP_SIGNATURE := wapac02_dkbs_dap2695
@ -891,7 +891,7 @@ define Device/dlink_dir-825-b1
DEVICE_VARIANT := B1 DEVICE_VARIANT := B1
IMAGE_SIZE := 6208k IMAGE_SIZE := 6208k
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | \ IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | \
append-metadata | check-size check-size | append-metadata
DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \ DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \
kmod-leds-reset kmod-owl-loader kmod-leds-reset kmod-owl-loader
SUPPORTED_DEVICES += dir-825-b1 SUPPORTED_DEVICES += dir-825-b1
@ -912,8 +912,7 @@ define Device/dlink_dir-825-c1
pad-rootfs pad-rootfs
IMAGE/factory.bin := $$(IMAGE/default) | pad-offset $$$$(IMAGE_SIZE) 26 | \ IMAGE/factory.bin := $$(IMAGE/default) | pad-offset $$$$(IMAGE_SIZE) 26 | \
append-string 00DB120AR9344-RT-101214-00 | check-size append-string 00DB120AR9344-RT-101214-00 | check-size
IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | \ IMAGE/sysupgrade.bin := $$(IMAGE/default) | check-size | append-metadata
check-size
endef endef
TARGET_DEVICES += dlink_dir-825-c1 TARGET_DEVICES += dlink_dir-825-c1
@ -930,8 +929,7 @@ define Device/dlink_dir-835-a1
pad-rootfs pad-rootfs
IMAGE/factory.bin := $$(IMAGE/default) | pad-offset $$$$(IMAGE_SIZE) 26 | \ IMAGE/factory.bin := $$(IMAGE/default) | pad-offset $$$$(IMAGE_SIZE) 26 | \
append-string 00DB120AR9344-RT-101214-00 | check-size append-string 00DB120AR9344-RT-101214-00 | check-size
IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | \ IMAGE/sysupgrade.bin := $$(IMAGE/default) | check-size | append-metadata
check-size
endef endef
TARGET_DEVICES += dlink_dir-835-a1 TARGET_DEVICES += dlink_dir-835-a1
@ -950,7 +948,7 @@ define Device/dlink_dir-842-c
IMAGE/default := append-kernel | uImage lzma | \ IMAGE/default := append-kernel | uImage lzma | \
pad-offset $$$$(BLOCKSIZE) 64 | append-rootfs pad-offset $$$$(BLOCKSIZE) 64 | append-rootfs
IMAGE/sysupgrade.bin := $$(IMAGE/default) | seama | pad-rootfs | \ IMAGE/sysupgrade.bin := $$(IMAGE/default) | seama | pad-rootfs | \
append-metadata | check-size check-size | append-metadata
IMAGE/factory.bin := $$(IMAGE/default) | pad-rootfs -x 64 | seama | \ IMAGE/factory.bin := $$(IMAGE/default) | pad-rootfs -x 64 | seama | \
seama-seal | check-size seama-seal | check-size
IMAGE_SIZE := 15680k IMAGE_SIZE := 15680k
@ -1363,7 +1361,7 @@ define Device/jjplus_ja76pf2
IMAGE/kernel.bin := append-kernel IMAGE/kernel.bin := append-kernel
IMAGE/rootfs.bin := append-rootfs | pad-rootfs IMAGE/rootfs.bin := append-rootfs | pad-rootfs
IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | combined-image | \ IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | combined-image | \
append-metadata | check-size check-size | append-metadata
KERNEL := kernel-bin | append-dtb | lzma | pad-to $$(BLOCKSIZE) KERNEL := kernel-bin | append-dtb | lzma | pad-to $$(BLOCKSIZE)
KERNEL_INITRAMFS := kernel-bin | append-dtb KERNEL_INITRAMFS := kernel-bin | append-dtb
IMAGE_SIZE := 16000k IMAGE_SIZE := 16000k
@ -1430,7 +1428,7 @@ define Device/nec_wx1200cr
DEVICE_VENDOR := NEC DEVICE_VENDOR := NEC
IMAGE/default := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-rootfs IMAGE/default := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-rootfs
IMAGE/sysupgrade.bin := $$(IMAGE/default) | seama | pad-rootfs | \ IMAGE/sysupgrade.bin := $$(IMAGE/default) | seama | pad-rootfs | \
append-metadata | check-size check-size | append-metadata
DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct
endef endef
@ -1482,10 +1480,8 @@ define Device/netgear_ex6400_ex7300
IMAGE_SIZE := 15552k IMAGE_SIZE := 15552k
IMAGE/default := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | \ IMAGE/default := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | \
netgear-rootfs | pad-rootfs netgear-rootfs | pad-rootfs
IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | \ IMAGE/sysupgrade.bin := $$(IMAGE/default) | check-size | append-metadata
check-size IMAGE/factory.img := $$(IMAGE/default) | netgear-dni | check-size
IMAGE/factory.img := $$(IMAGE/default) | netgear-dni | \
check-size
DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca99x0-ct DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca99x0-ct
endef endef
@ -1868,7 +1864,7 @@ define Device/phicomm_k2t
DEVICE_MODEL := K2T DEVICE_MODEL := K2T
IMAGE_SIZE := 15744k IMAGE_SIZE := 15744k
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | \ IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | \
append-metadata | check-size check-size | append-metadata
DEVICE_PACKAGES := kmod-leds-reset kmod-ath10k-ct-smallbuffers ath10k-firmware-qca9888-ct DEVICE_PACKAGES := kmod-leds-reset kmod-ath10k-ct-smallbuffers ath10k-firmware-qca9888-ct
endef endef
TARGET_DEVICES += phicomm_k2t TARGET_DEVICES += phicomm_k2t
@ -2230,8 +2226,7 @@ define Device/teltonika_rut955
pad-rootfs | teltonika-fw-fake-checksum 20 | append-string master |\ pad-rootfs | teltonika-fw-fake-checksum 20 | append-string master |\
append-md5sum-bin | check-size append-md5sum-bin | check-size
IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(BLOCKSIZE) |\ IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(BLOCKSIZE) |\
append-rootfs | pad-rootfs | append-metadata |\ append-rootfs | pad-rootfs | check-size | append-metadata
check-size
endef endef
TARGET_DEVICES += teltonika_rut955 TARGET_DEVICES += teltonika_rut955
@ -2254,8 +2249,7 @@ define Device/trendnet_tew-823dru
pad-rootfs pad-rootfs
IMAGE/factory.bin := $$(IMAGE/default) | pad-offset $$$$(IMAGE_SIZE) 26 | \ IMAGE/factory.bin := $$(IMAGE/default) | pad-offset $$$$(IMAGE_SIZE) 26 | \
append-string 00AP135AR9558-RT-131129-00 | check-size append-string 00AP135AR9558-RT-131129-00 | check-size
IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | \ IMAGE/sysupgrade.bin := $$(IMAGE/default) | check-size | append-metadata
check-size
endef endef
TARGET_DEVICES += trendnet_tew-823dru TARGET_DEVICES += trendnet_tew-823dru

3
target/linux/ath79/image/nand.mk
View File

@ -166,8 +166,7 @@ define Device/netgear_ath79_nand
IMAGES := sysupgrade.bin factory.img IMAGES := sysupgrade.bin factory.img
IMAGE/factory.img := append-kernel | append-ubi | netgear-dni | \ IMAGE/factory.img := append-kernel | append-ubi | netgear-dni | \
check-size check-size
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata | \ IMAGE/sysupgrade.bin := sysupgrade-tar | check-size | append-metadata
check-size
UBINIZE_OPTS := -E 5 UBINIZE_OPTS := -E 5
endef endef

3
target/linux/ath79/image/tiny.mk
View File

@ -21,8 +21,7 @@ define Device/dlink_dir-615-e4
FACTORY_IMAGE_SIZE := 3456k FACTORY_IMAGE_SIZE := 3456k
IMAGES += factory.bin IMAGES += factory.bin
IMAGE/default := append-kernel | append-rootfs | pad-rootfs IMAGE/default := append-kernel | append-rootfs | pad-rootfs
IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | \ IMAGE/sysupgrade.bin := $$(IMAGE/default) | check-size | append-metadata
check-size
IMAGE/factory.bin := $$(IMAGE/default) | \ IMAGE/factory.bin := $$(IMAGE/default) | \
check-size $$$$(FACTORY_IMAGE_SIZE) | pad-to $$$$(FACTORY_IMAGE_SIZE) | \ check-size $$$$(FACTORY_IMAGE_SIZE) | pad-to $$$$(FACTORY_IMAGE_SIZE) | \
append-string "AP99-AR7240-RT-091105-05" append-string "AP99-AR7240-RT-091105-05"

8
target/linux/ipq40xx/image/generic.mk
View File

@ -35,7 +35,7 @@ define Device/DniImage
IMAGES += factory.img IMAGES += factory.img
IMAGE/factory.img := append-kernel | pad-offset 64k 64 | append-uImage-fakehdr filesystem | append-rootfs | pad-rootfs | netgear-dni IMAGE/factory.img := append-kernel | pad-offset 64k 64 | append-uImage-fakehdr filesystem | append-rootfs | pad-rootfs | netgear-dni
IMAGE/sysupgrade.bin := append-kernel | pad-offset 64k 64 | append-uImage-fakehdr filesystem | \ IMAGE/sysupgrade.bin := append-kernel | pad-offset 64k 64 | append-uImage-fakehdr filesystem | \
append-rootfs | pad-rootfs | append-metadata | check-size append-rootfs | pad-rootfs | check-size | append-metadata
endef endef
define Build/append-rootfshdr define Build/append-rootfshdr
@ -106,7 +106,7 @@ define Device/8dev_habanero-dvk
IMAGE_SIZE := 30976k IMAGE_SIZE := 30976k
SOC := qcom-ipq4019 SOC := qcom-ipq4019
DEVICE_PACKAGES := ipq-wifi-8dev_habanero-dvk DEVICE_PACKAGES := ipq-wifi-8dev_habanero-dvk
IMAGE/sysupgrade.bin := append-kernel | pad-to 64k | append-rootfs | pad-rootfs | append-metadata | check-size IMAGE/sysupgrade.bin := append-kernel | pad-to 64k | append-rootfs | pad-rootfs | check-size | append-metadata
endef endef
TARGET_DEVICES += 8dev_habanero-dvk TARGET_DEVICES += 8dev_habanero-dvk
@ -207,7 +207,7 @@ define Device/avm_fritzbox-4040
UBOOT_PARTITION_SIZE := 524288 UBOOT_PARTITION_SIZE := 524288
IMAGES += eva.bin IMAGES += eva.bin
IMAGE/eva.bin := append-uboot | pad-to $$$$(UBOOT_PARTITION_SIZE) | append-kernel | append-rootfs | pad-rootfs IMAGE/eva.bin := append-uboot | pad-to $$$$(UBOOT_PARTITION_SIZE) | append-kernel | append-rootfs | pad-rootfs
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | check-size | append-metadata
DEVICE_PACKAGES := fritz-tffs fritz-caldata DEVICE_PACKAGES := fritz-tffs fritz-caldata
endef endef
TARGET_DEVICES += avm_fritzbox-4040 TARGET_DEVICES += avm_fritzbox-4040
@ -822,7 +822,7 @@ define Device/zyxel_wre6606
DEVICE_DTS_CONFIG := config@4 DEVICE_DTS_CONFIG := config@4
SOC := qcom-ipq4018 SOC := qcom-ipq4018
IMAGE_SIZE := 13184k IMAGE_SIZE := 13184k
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | check-size | append-metadata
DEVICE_PACKAGES := -kmod-ath10k-ct kmod-ath10k-ct-smallbuffers DEVICE_PACKAGES := -kmod-ath10k-ct kmod-ath10k-ct-smallbuffers
endef endef
TARGET_DEVICES += zyxel_wre6606 TARGET_DEVICES += zyxel_wre6606

2
target/linux/ipq40xx/image/mikrotik.mk
View File

@ -7,7 +7,7 @@ define Device/mikrotik_nor
IMAGES = sysupgrade.bin IMAGES = sysupgrade.bin
IMAGE/sysupgrade.bin := append-kernel | kernel2minor -s 1024 | \ IMAGE/sysupgrade.bin := append-kernel | kernel2minor -s 1024 | \
pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | \ pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | \
append-metadata | check-size check-size | append-metadata
endef endef
define Device/mikrotik_hap-ac2 define Device/mikrotik_hap-ac2

2
target/linux/ipq806x/image/Makefile
View File

@ -401,7 +401,7 @@ define Device/ubnt_unifi-ac-hd
BLOCKSIZE := 64k BLOCKSIZE := 64k
IMAGE_SIZE := 14784k IMAGE_SIZE := 14784k
DEVICE_PACKAGES := ath10k-firmware-qca9984-ct DEVICE_PACKAGES := ath10k-firmware-qca9984-ct
IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | append-metadata | check-size IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size | append-metadata
endef endef
TARGET_DEVICES += ubnt_unifi-ac-hd TARGET_DEVICES += ubnt_unifi-ac-hd

4
target/linux/lantiq/image/Makefile
View File

@ -63,7 +63,7 @@ define Device/Default
SOC := $(DEFAULT_SOC) SOC := $(DEFAULT_SOC)
DEVICE_DTS = $$(SOC)_$(1) DEVICE_DTS = $$(SOC)_$(1)
IMAGES := sysupgrade.bin IMAGES := sysupgrade.bin
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | check-size | append-metadata
endef endef
define Device/NAND/xway define Device/NAND/xway
@ -102,7 +102,7 @@ define Device/AVM
KERNEL := kernel-bin | append-dtb | lzma | eva-image KERNEL := kernel-bin | append-dtb | lzma | eva-image
KERNEL_INITRAMFS := $$(KERNEL) KERNEL_INITRAMFS := $$(KERNEL)
IMAGE/sysupgrade.bin := append-kernel | pad-to 64k | append-avm-fakeroot | \ IMAGE/sysupgrade.bin := append-kernel | pad-to 64k | append-avm-fakeroot | \
append-rootfs | pad-rootfs | append-metadata | check-size append-rootfs | pad-rootfs | check-size | append-metadata
endef endef
ifeq ($(SUBTARGET),ase) ifeq ($(SUBTARGET),ase)

6
target/linux/lantiq/image/ar9.mk
View File

@ -90,10 +90,10 @@ define Device/netgear_dgn3500
factory-na.img factory.img factory-na.img factory.img
IMAGE/sysupgrade-na.bin := \ IMAGE/sysupgrade-na.bin := \
append-kernel | append-rootfs | dgn3500-sercom-footer 0x0 "NA" | \ append-kernel | append-rootfs | dgn3500-sercom-footer 0x0 "NA" | \
pad-rootfs | append-metadata | check-size pad-rootfs | check-size | append-metadata
IMAGE/sysupgrade.bin := \ IMAGE/sysupgrade.bin := \
append-kernel | append-rootfs | dgn3500-sercom-footer 0x0 "WW" | \ append-kernel | append-rootfs | dgn3500-sercom-footer 0x0 "WW" | \
pad-rootfs | append-metadata | check-size pad-rootfs | check-size | append-metadata
IMAGE/factory-na.img := \ IMAGE/factory-na.img := \
pad-extra $(DGN3500_KERNEL_OFFSET_DEC) | append-kernel | append-rootfs | \ pad-extra $(DGN3500_KERNEL_OFFSET_DEC) | append-kernel | append-rootfs | \
dgn3500-sercom-footer $(DGN3500_KERNEL_OFFSET_HEX) "NA" | pad-rootfs | \ dgn3500-sercom-footer $(DGN3500_KERNEL_OFFSET_HEX) "NA" | pad-rootfs | \
@ -119,7 +119,7 @@ define Device/netgear_dgn3500b
IMAGES += factory.img IMAGES += factory.img
IMAGE/sysupgrade.bin := \ IMAGE/sysupgrade.bin := \
append-kernel | append-rootfs | dgn3500-sercom-footer 0x0 "DE" | \ append-kernel | append-rootfs | dgn3500-sercom-footer 0x0 "DE" | \
pad-rootfs | append-metadata | check-size pad-rootfs | check-size | append-metadata
IMAGE/factory.img := \ IMAGE/factory.img := \
pad-extra $(DGN3500_KERNEL_OFFSET_DEC) | append-kernel | append-rootfs | \ pad-extra $(DGN3500_KERNEL_OFFSET_DEC) | append-kernel | append-rootfs | \
dgn3500-sercom-footer $(DGN3500_KERNEL_OFFSET_HEX) "DE" | pad-rootfs | \ dgn3500-sercom-footer $(DGN3500_KERNEL_OFFSET_HEX) "DE" | pad-rootfs | \

2
target/linux/lantiq/image/tp-link.mk
View File

@ -14,7 +14,7 @@ define Device/lantiqTpLink
tplink-v2-header -s -V "ver. 1.0" tplink-v2-header -s -V "ver. 1.0"
IMAGES := sysupgrade.bin IMAGES := sysupgrade.bin
IMAGE/sysupgrade.bin := tplink-v2-image -s -V "ver. 1.0" | \ IMAGE/sysupgrade.bin := tplink-v2-image -s -V "ver. 1.0" | \
append-metadata | check-size check-size | append-metadata
endef endef
define Device/tplink_tdw8970 define Device/tplink_tdw8970

2
target/linux/lantiq/image/vr9.mk
View File

@ -253,7 +253,7 @@ define Device/netgear_dm200
IMAGE/sysupgrade.bin := append-kernel | \ IMAGE/sysupgrade.bin := append-kernel | \
pad-offset 64k 64 | append-uImage-fakehdr filesystem | \ pad-offset 64k 64 | append-uImage-fakehdr filesystem | \
pad-offset 64k 64 | append-uImage-fakehdr filesystem | \ pad-offset 64k 64 | append-uImage-fakehdr filesystem | \
append-rootfs | pad-rootfs | append-metadata | check-size append-rootfs | pad-rootfs | check-size | append-metadata
IMAGE/factory.img := $$(IMAGE/sysupgrade.bin) | netgear-dni IMAGE/factory.img := $$(IMAGE/sysupgrade.bin) | netgear-dni
IMAGE_SIZE := 7872k IMAGE_SIZE := 7872k
NETGEAR_BOARD_ID := DM200 NETGEAR_BOARD_ID := DM200

6
target/linux/ramips/image/Makefile
View File

@ -166,7 +166,7 @@ define Device/Default
IMAGES := sysupgrade.bin IMAGES := sysupgrade.bin
COMPILE := COMPILE :=
sysupgrade_bin := append-kernel | append-rootfs | pad-rootfs sysupgrade_bin := append-kernel | append-rootfs | pad-rootfs
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | check-size | append-metadata
endef endef
define Device/netgear_sercomm_nor define Device/netgear_sercomm_nor
@ -175,7 +175,7 @@ define Device/netgear_sercomm_nor
IMAGES += factory.img IMAGES += factory.img
IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \ IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \
pad-rootfs pad-rootfs
IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size IMAGE/sysupgrade.bin := $$(IMAGE/default) | check-size | append-metadata
IMAGE/factory.img := pad-extra $$$$(SERCOMM_PAD) | $$(IMAGE/default) | \ IMAGE/factory.img := pad-extra $$$$(SERCOMM_PAD) | $$(IMAGE/default) | \
pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | \ pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | \
zip $$$$(SERCOMM_HWNAME).bin | sercom-seal zip $$$$(SERCOMM_HWNAME).bin | sercom-seal
@ -190,7 +190,7 @@ define Device/seama
# - 36 bytes of META data (4-bytes aligned) # - 36 bytes of META data (4-bytes aligned)
IMAGE/default := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-rootfs IMAGE/default := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-rootfs
IMAGE/sysupgrade.bin := \ IMAGE/sysupgrade.bin := \
$$(IMAGE/default) | seama | pad-rootfs | append-metadata | check-size $$(IMAGE/default) | seama | pad-rootfs | check-size | append-metadata
IMAGE/factory.bin := \ IMAGE/factory.bin := \
$$(IMAGE/default) | pad-rootfs -x 64 | seama | seama-seal | check-size $$(IMAGE/default) | pad-rootfs -x 64 | seama | seama-seal | check-size
SEAMA_SIGNATURE := SEAMA_SIGNATURE :=

10
target/linux/ramips/image/common-tp-link.mk
View File

@ -11,8 +11,8 @@ define Device/tplink-v1
KERNEL_INITRAMFS := $(KERNEL_DTB) | tplink-v1-header -e -O KERNEL_INITRAMFS := $(KERNEL_DTB) | tplink-v1-header -e -O
IMAGES += factory.bin IMAGES += factory.bin
IMAGE/factory.bin := tplink-v1-image factory -e -O IMAGE/factory.bin := tplink-v1-image factory -e -O
IMAGE/sysupgrade.bin := tplink-v1-image sysupgrade -e -O | append-metadata | \ IMAGE/sysupgrade.bin := tplink-v1-image sysupgrade -e -O | check-size | \
check-size append-metadata
endef endef
define Device/tplink-v2 define Device/tplink-v2
@ -26,8 +26,8 @@ define Device/tplink-v2
KERNEL_INITRAMFS := $(KERNEL_DTB) | tplink-v2-header -e KERNEL_INITRAMFS := $(KERNEL_DTB) | tplink-v2-header -e
IMAGES += factory.bin IMAGES += factory.bin
IMAGE/factory.bin := tplink-v2-image -e IMAGE/factory.bin := tplink-v2-image -e
IMAGE/sysupgrade.bin := tplink-v2-image -s -e | append-metadata | \ IMAGE/sysupgrade.bin := tplink-v2-image -s -e | check-size | \
check-size append-metadata
endef endef
define Device/tplink-safeloader define Device/tplink-safeloader
@ -39,6 +39,6 @@ define Device/tplink-safeloader
KERNEL := $(KERNEL_DTB) | tplink-v1-header -e -O KERNEL := $(KERNEL_DTB) | tplink-v1-header -e -O
IMAGES += factory.bin IMAGES += factory.bin
IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | \ IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | \
append-metadata | check-size check-size | append-metadata
IMAGE/factory.bin := append-rootfs | tplink-safeloader factory IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
endef endef

10
target/linux/ramips/image/mt7620.mk
View File

@ -327,7 +327,7 @@ define Device/edimax_br-6478ac-v2
IMAGE_SIZE := 7744k IMAGE_SIZE := 7744k
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
edimax-header -s CSYS -m RN68 -f 0x70000 -S 0x01100000 | pad-rootfs | \ edimax-header -s CSYS -m RN68 -f 0x70000 -S 0x01100000 | pad-rootfs | \
append-metadata | check-size check-size | append-metadata
DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci \ DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci \
kmod-usb-ledtrig-usbport kmod-usb-ledtrig-usbport
endef endef
@ -341,7 +341,7 @@ define Device/edimax_ew-7476rpc
IMAGE_SIZE := 7744k IMAGE_SIZE := 7744k
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
edimax-header -s CSYS -m RN79 -f 0x70000 -S 0x01100000 | pad-rootfs | \ edimax-header -s CSYS -m RN79 -f 0x70000 -S 0x01100000 | pad-rootfs | \
append-metadata | check-size check-size | append-metadata
DEVICE_PACKAGES := kmod-mt76x2 kmod-phy-realtek DEVICE_PACKAGES := kmod-mt76x2 kmod-phy-realtek
endef endef
TARGET_DEVICES += edimax_ew-7476rpc TARGET_DEVICES += edimax_ew-7476rpc
@ -354,7 +354,7 @@ define Device/edimax_ew-7478ac
IMAGE_SIZE := 7744k IMAGE_SIZE := 7744k
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
edimax-header -s CSYS -m RN70 -f 0x70000 -S 0x01100000 | pad-rootfs | \ edimax-header -s CSYS -m RN70 -f 0x70000 -S 0x01100000 | pad-rootfs | \
append-metadata | check-size check-size | append-metadata
DEVICE_PACKAGES := kmod-mt76x2 kmod-phy-realtek DEVICE_PACKAGES := kmod-mt76x2 kmod-phy-realtek
endef endef
TARGET_DEVICES += edimax_ew-7478ac TARGET_DEVICES += edimax_ew-7478ac
@ -367,7 +367,7 @@ define Device/edimax_ew-7478apc
IMAGE_SIZE := 7744k IMAGE_SIZE := 7744k
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
edimax-header -s CSYS -m RN75 -f 0x70000 -S 0x01100000 | pad-rootfs | \ edimax-header -s CSYS -m RN75 -f 0x70000 -S 0x01100000 | pad-rootfs | \
append-metadata | check-size check-size | append-metadata
DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci \ DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci \
kmod-usb-ledtrig-usbport kmod-usb-ledtrig-usbport
endef endef
@ -407,7 +407,7 @@ define Device/fon_fon2601
DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
KERNEL_INITRAMFS := $$(KERNEL) | uimage-padhdr KERNEL_INITRAMFS := $$(KERNEL) | uimage-padhdr
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | uimage-padhdr | \ IMAGE/sysupgrade.bin := append-kernel | append-rootfs | uimage-padhdr | \
pad-rootfs | append-metadata | check-size pad-rootfs | check-size | append-metadata
endef endef
TARGET_DEVICES += fon_fon2601 TARGET_DEVICES += fon_fon2601

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

@ -289,7 +289,7 @@ define Device/dlink_dir-8xx-a1
KERNEL_INITRAMFS := $$(KERNEL) | uimage-padhdr 96 KERNEL_INITRAMFS := $$(KERNEL) | uimage-padhdr 96
IMAGES += factory.bin IMAGES += factory.bin
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | uimage-padhdr 96 |\ IMAGE/sysupgrade.bin := append-kernel | append-rootfs | uimage-padhdr 96 |\
pad-rootfs | append-metadata | check-size pad-rootfs | check-size | append-metadata
IMAGE/factory.bin := append-kernel | append-rootfs | uimage-padhdr 96 |\ IMAGE/factory.bin := append-kernel | append-rootfs | uimage-padhdr 96 |\
check-size check-size
endef endef
@ -440,7 +440,7 @@ define Device/edimax_re23s
DEVICE_ALT0_MODEL := Gemini RE23S DEVICE_ALT0_MODEL := Gemini RE23S
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
edimax-header -s CSYS -m RN76 -f 0x70000 -S 0x01100000 | pad-rootfs | \ edimax-header -s CSYS -m RN76 -f 0x70000 -S 0x01100000 | pad-rootfs | \
append-metadata | check-size check-size | append-metadata
IMAGES += factory.bin IMAGES += factory.bin
IMAGE/factory.bin := append-kernel | append-rootfs | \ IMAGE/factory.bin := append-kernel | append-rootfs | \
edimax-header -s CSYS -m RN76 -f 0x70000 -S 0x01100000 | pad-rootfs | \ edimax-header -s CSYS -m RN76 -f 0x70000 -S 0x01100000 | pad-rootfs | \
@ -824,7 +824,7 @@ define Device/linksys_ea7xxx
uboot-envtools uboot-envtools
UBINIZE_OPTS := -E 5 UBINIZE_OPTS := -E 5
IMAGES := sysupgrade.bin factory.bin IMAGES := sysupgrade.bin factory.bin
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata | check-size IMAGE/sysupgrade.bin := sysupgrade-tar | check-size | append-metadata
IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | \ IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | \
append-ubi | check-size | linksys-image type=$$$$(LINKSYS_HWNAME) append-ubi | check-size | linksys-image type=$$$$(LINKSYS_HWNAME)
endef endef
@ -901,8 +901,8 @@ define Device/MikroTik
KERNEL_NAME := vmlinuz KERNEL_NAME := vmlinuz
KERNEL := kernel-bin | append-dtb-elf KERNEL := kernel-bin | append-dtb-elf
IMAGE/sysupgrade.bin := append-kernel | kernel2minor -s 1024 | \ IMAGE/sysupgrade.bin := append-kernel | kernel2minor -s 1024 | \
pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | append-metadata | \ pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size | \
check-size append-metadata
endef endef
define Device/mikrotik_routerboard-750gr3 define Device/mikrotik_routerboard-750gr3

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

@ -500,7 +500,7 @@ define Device/edimax_3g-6200n
IMAGE_SIZE := 3648k IMAGE_SIZE := 3648k
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
edimax-header -s CSYS -m 3G62 -f 0x50000 -S 0x01100000 | pad-rootfs | \ edimax-header -s CSYS -m 3G62 -f 0x50000 -S 0x01100000 | pad-rootfs | \
append-metadata | check-size check-size | append-metadata
DEVICE_VENDOR := Edimax DEVICE_VENDOR := Edimax
DEVICE_MODEL := 3g-6200n DEVICE_MODEL := 3g-6200n
SUPPORTED_DEVICES += 3g-6200n SUPPORTED_DEVICES += 3g-6200n
@ -513,7 +513,7 @@ define Device/edimax_3g-6200nl
IMAGE_SIZE := 3648k IMAGE_SIZE := 3648k
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
edimax-header -s CSYS -m 3G62 -f 0x50000 -S 0x01100000 | pad-rootfs | \ edimax-header -s CSYS -m 3G62 -f 0x50000 -S 0x01100000 | pad-rootfs | \
append-metadata | check-size check-size | append-metadata
DEVICE_VENDOR := Edimax DEVICE_VENDOR := Edimax
DEVICE_MODEL := 3g-6200nl DEVICE_MODEL := 3g-6200nl
SUPPORTED_DEVICES += 3g-6200nl SUPPORTED_DEVICES += 3g-6200nl
@ -1047,7 +1047,7 @@ define Device/trendnet_tew-638apb-v2
BLOCKSIZE := 64k BLOCKSIZE := 64k
IMAGE_SIZE := 3776k IMAGE_SIZE := 3776k
IMAGE/sysupgrade.bin := $$(sysupgrade_bin) | umedia-header 0x026382 | \ IMAGE/sysupgrade.bin := $$(sysupgrade_bin) | umedia-header 0x026382 | \
append-metadata | check-size check-size | append-metadata
DEVICE_VENDOR := TRENDnet DEVICE_VENDOR := TRENDnet
DEVICE_MODEL := TEW-638APB DEVICE_MODEL := TEW-638APB
DEVICE_VARIANT := v2 DEVICE_VARIANT := v2

2
target/linux/ramips/image/rt3883.mk
View File

@ -52,7 +52,7 @@ define Device/edimax_br-6475nd
IMAGE_SIZE := 7744k IMAGE_SIZE := 7744k
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
edimax-header -s CSYS -m RN54 -f 0x70000 -S 0x01100000 | pad-rootfs | \ edimax-header -s CSYS -m RN54 -f 0x70000 -S 0x01100000 | pad-rootfs | \
append-metadata | check-size check-size | append-metadata
DEVICE_VENDOR := Edimax DEVICE_VENDOR := Edimax
DEVICE_MODEL := BR-6475nD DEVICE_MODEL := BR-6475nD
SUPPORTED_DEVICES += br-6475nd SUPPORTED_DEVICES += br-6475nd

2
target/linux/realtek/image/Makefile
View File

@ -24,7 +24,7 @@ define Device/Default
DEVICE_DTS = $$(SOC)_$(1) DEVICE_DTS = $$(SOC)_$(1)
IMAGES := sysupgrade.bin IMAGES := sysupgrade.bin
IMAGE/sysupgrade.bin := append-kernel | pad-to 64k | append-rootfs | pad-rootfs | \ IMAGE/sysupgrade.bin := append-kernel | pad-to 64k | append-rootfs | pad-rootfs | \
append-metadata | check-size check-size | append-metadata
endef endef
# "NGE" refers to the uImage magic # "NGE" refers to the uImage magic