KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ramips: unifiy sysupgrade file extensions

Browse source 
Use .bin as file extension where possible. The user doesn't need to that
sysupgrade images for NAND boards are tarballs.

Signed-off-by: Mathias Kresin <dev@kresin.me>
This commit is contained in:
Mathias Kresin 2018-11-29 10:48:03 +01:00
parent 7f00123d63
commit 1977be8bd0
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
target/linux/ramips/image/mt7621.mk
View file

@ -219,10 +219,10 @@ define Device/mir3g
KERNEL_SIZE := 4096k KERNEL_SIZE := 4096k
IMAGE_SIZE := 32768k IMAGE_SIZE := 32768k
UBINIZE_OPTS := -E 5 UBINIZE_OPTS := -E 5
IMAGES := sysupgrade.tar kernel1.bin rootfs0.bin IMAGES += kernel1.bin rootfs0.bin
IMAGE/kernel1.bin := append-kernel IMAGE/kernel1.bin := append-kernel
IMAGE/rootfs0.bin := append-ubi | check-size $$$$(IMAGE_SIZE) IMAGE/rootfs0.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
DEVICE_TITLE := Xiaomi Mi Router 3G DEVICE_TITLE := Xiaomi Mi Router 3G
SUPPORTED_DEVICES += R3G SUPPORTED_DEVICES += R3G
DEVICE_PACKAGES := \ DEVICE_PACKAGES := \
@ -274,8 +274,8 @@ define Device/r6220
KERNEL_SIZE := 4096k KERNEL_SIZE := 4096k
IMAGE_SIZE := 28672k IMAGE_SIZE := 28672k
UBINIZE_OPTS := -E 5 UBINIZE_OPTS := -E 5
IMAGES := sysupgrade.tar kernel.bin rootfs.bin IMAGES += kernel.bin rootfs.bin
IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
IMAGE/kernel.bin := append-kernel IMAGE/kernel.bin := append-kernel
IMAGE/rootfs.bin := append-ubi | check-size $$$$(IMAGE_SIZE) IMAGE/rootfs.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
DEVICE_TITLE := Netgear R6220 DEVICE_TITLE := Netgear R6220
@ -327,7 +327,7 @@ define Device/re350-v1
TPLINK_HEADER_VERSION := 1 TPLINK_HEADER_VERSION := 1
IMAGE_SIZE := 6016k IMAGE_SIZE := 6016k
KERNEL := $(KERNEL_DTB) | tplink-v1-header -e -O KERNEL := $(KERNEL_DTB) | tplink-v1-header -e -O
IMAGES := sysupgrade.bin factory.bin IMAGES += factory.bin
IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | append-metadata | check-size $$$$(IMAGE_SIZE) IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | append-metadata | check-size $$$$(IMAGE_SIZE)
IMAGE/factory.bin := append-rootfs | tplink-safeloader factory IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
endef endef
@ -368,9 +368,8 @@ define Device/ubnt-erx
DTS := UBNT-ERX DTS := UBNT-ERX
FILESYSTEMS := squashfs FILESYSTEMS := squashfs
KERNEL_SIZE := 3145728 KERNEL_SIZE := 3145728
IMAGES := sysupgrade.tar
KERNEL_INITRAMFS := $$(KERNEL) | ubnt-erx-factory-image $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.tar KERNEL_INITRAMFS := $$(KERNEL) | ubnt-erx-factory-image $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.tar
IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
DEVICE_TITLE := Ubiquiti EdgeRouter X DEVICE_TITLE := Ubiquiti EdgeRouter X
endef endef
TARGET_DEVICES += ubnt-erx TARGET_DEVICES += ubnt-erx

2
target/linux/ramips/image/mt76x8.mk
View file

@ -399,7 +399,7 @@ define Device/zyxel_keenetic-extra-ii
DEVICE_TITLE := ZyXEL Keenetic Extra II DEVICE_TITLE := ZyXEL Keenetic Extra II
DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
IMAGES += factory.bin IMAGES += factory.bin
IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | pad-to $$$$(BLOCKSIZE) | \ IMAGE/factory.bin := $$(sysupgrade_bin) | pad-to $$$$(BLOCKSIZE) | \
check-size $$$$(IMAGE_SIZE) | zyimage -d 6162 -v "ZyXEL Keenetic Extra II" check-size $$$$(IMAGE_SIZE) | zyimage -d 6162 -v "ZyXEL Keenetic Extra II"
endef endef
TARGET_DEVICES += zyxel_keenetic-extra-ii TARGET_DEVICES += zyxel_keenetic-extra-ii