From: Tomasz Maciej Nowak Date: Tue, 25 Feb 2020 19:07:41 +0000 (+0100) Subject: layerscape: sysupgrade: require metadata X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=382b1572757b3b4b8cb7ad98f256244eae916bb3;p=openwrt%2Fstaging%2Fldir.git layerscape: sysupgrade: require metadata Require the image metadata check so no invalid image could be fed to sysupgrade without force option. Cc: Mathew McBride Signed-off-by: Tomasz Maciej Nowak --- diff --git a/target/linux/layerscape/base-files/lib/upgrade/platform.sh b/target/linux/layerscape/base-files/lib/upgrade/platform.sh index a2ee81cf3a..013023295b 100644 --- a/target/linux/layerscape/base-files/lib/upgrade/platform.sh +++ b/target/linux/layerscape/base-files/lib/upgrade/platform.sh @@ -6,6 +6,8 @@ RAMFS_COPY_BIN="/usr/sbin/fw_printenv /usr/sbin/fw_setenv /usr/sbin/ubinfo /bin/echo" RAMFS_COPY_DATA="/etc/fw_env.config /var/lock/fw_printenv.lock" +REQUIRE_IMAGE_METADATA=1 + platform_do_upgrade_traverse_nandubi() { bootsys=$(fw_printenv bootsys | awk -F= '{{print $2}}') newbootsys=2 diff --git a/target/linux/layerscape/image/armv8_64b.mk b/target/linux/layerscape/image/armv8_64b.mk index bd7055b3ee..ff4846c9bf 100644 --- a/target/linux/layerscape/image/armv8_64b.mk +++ b/target/linux/layerscape/image/armv8_64b.mk @@ -291,5 +291,6 @@ define Device/traverse-ls1043 IMAGE/root = append-rootfs IMAGE/sysupgrade.bin = sysupgrade-tar | append-metadata MKUBIFS_OPTS := -m 2048 -e 124KiB -c 4096 + SUPPORTED_DEVICES := traverse,ls1043s traverse,ls1043v endef TARGET_DEVICES += traverse-ls1043