diff options
| author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2021-06-20 18:54:36 +0200 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2021-07-10 19:40:10 +0200 |
| commit | cce8d16bf18909e1634c0aeac05e40a7be96a519 (patch) | |
| tree | a7d60530a46fd5986a1b156de5ed8683cceca08b /target/linux/ath79/image/generic-ubnt.mk | |
| parent | 918908fe7639fde76c486b9be559992873978656 (diff) | |
| download | upstream-cce8d16bf18909e1634c0aeac05e40a7be96a519.tar.gz upstream-cce8d16bf18909e1634c0aeac05e40a7be96a519.tar.bz2 upstream-cce8d16bf18909e1634c0aeac05e40a7be96a519.zip | |
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>
Diffstat (limited to 'target/linux/ath79/image/generic-ubnt.mk')
| -rw-r--r-- | target/linux/ath79/image/generic-ubnt.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index e8ea06a07a..01e8533fd6 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -128,7 +128,7 @@ define Device/ubnt-unifi-jffs2 KERNEL := kernel-bin | append-dtb | lzma | uImage lzma | jffs2 kernel0 IMAGES := sysupgrade.bin factory.bin 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 endef @@ -373,7 +373,7 @@ define Device/ubnt_routerstation_common IMAGE/factory.bin := append-rootfs | pad-rootfs | mkubntimage | \ check-size 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_INITRAMFS := kernel-bin | append-dtb endef |