From 9d6d7d9a0e1f8e516537d80c222ce8f787070280 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 14 Nov 2016 17:32:04 +0100 Subject: [PATCH] ipq806x: append metadata to images Signed-off-by: Felix Fietkau --- .../linux/ipq806x/base-files/lib/upgrade/platform.sh | 1 + target/linux/ipq806x/image/Makefile | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh index 53cdc874cd..db1f4b6b48 100644 --- a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh +++ b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh @@ -1,6 +1,7 @@ . /lib/ipq806x.sh PART_NAME=firmware +REQUIRE_IMAGE_METADATA=1 platform_check_image() { local board=$(ipq806x_board_name) diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile index fc8d1cf4c0..47c28ab651 100644 --- a/target/linux/ipq806x/image/Makefile +++ b/target/linux/ipq806x/image/Makefile @@ -40,6 +40,8 @@ define Device/Default KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts) KERNEL_INITRAMFS_PREFIX := $$(IMG_PREFIX)-$(1)-initramfs KERNEL_PREFIX := $$(IMAGE_PREFIX) + SUPPORTED_DEVICES = $$(BOARD_NAME) + IMAGE/sysupgrade.tar = sysupgrade-tar | append-metadata endef define Device/LegacyImage @@ -58,7 +60,7 @@ define Device/UbiFit KERNEL_IN_UBI := 1 IMAGES := nand-factory.ubi nand-sysupgrade.tar IMAGE/nand-factory.ubi := append-ubi - IMAGE/nand-sysupgrade.tar := sysupgrade-tar + IMAGE/nand-sysupgrade.tar := sysupgrade-tar | append-metadata endef define Device/DniImage @@ -73,7 +75,6 @@ define Device/DniImage UBINIZE_OPTS := -E 5 IMAGES := factory.img sysupgrade.tar IMAGE/factory.img := append-kernel | append-ubi | netgear-dni - IMAGE/sysupgrade.tar = sysupgrade-tar endef DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID @@ -86,7 +87,7 @@ define Device/TpSafeImage TPLINK_BOARD_NAME := IMAGES := factory.bin sysupgrade.bin IMAGE/factory.bin := append-rootfs | tplink-safeloader factory - IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade + IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | append-metadata endef DEVICE_VARS += TPLINK_BOARD_NAME @@ -97,8 +98,7 @@ define Device/ZyXELImage KERNEL = kernel-bin | append-dtb | uImage none | pad-to $${KERNEL_SIZE} KERNEL_NAME := zImage IMAGES := sysupgrade.tar mmcblk0p5-rootfs.bin mmcblk0p4-kernel.bin - IMAGE/sysupgrade.tar/squashfs := append-rootfs | pad-to $$$${BLOCKSIZE} | sysupgrade-tar rootfs=$$$$@ - IMAGE/sysupgrade.tar := sysupgrade-tar + IMAGE/sysupgrade.tar/squashfs := append-rootfs | pad-to $$$${BLOCKSIZE} | sysupgrade-tar rootfs=$$$$@ | append-metadata IMAGE/mmcblk0p5-rootfs.bin := append-rootfs | pad-rootfs | pad-to $$$${BLOCKSIZE} IMAGE/mmcblk0p4-kernel.bin := append-kernel endef @@ -171,7 +171,6 @@ define Device/EA8500 UBINIZE_OPTS := -E 5 IMAGES := factory.bin sysupgrade.tar IMAGE/factory.bin := append-kernel | pad-to $$$${KERNEL_SIZE} | append-ubi - IMAGE/sysupgrade.tar := sysupgrade-tar DEVICE_TITLE := Linksys EA8500 DEVICE_PACKAGES := ath10k-firmware-qca99x0 endef