Several devices depend on fw_printenv during sysupgrade. Make sure
it always is present in all images, including initramfs images built
by the buildbots.
Fixes: 2449a632084b ("ramips: mt7621: Add support for ZyXEL NR7101")
Signed-off-by: Bjørn Mork
---
target/linux/ramips/image/mt7621.mk | 55 +---
target/linux/ramips/mt7621/target.mk | 2 +-
2 files changed, 27 insertions(+), 30 deletions(-)
diff --git a/target/linux/ramips/image/mt7621.mk
b/target/linux/ramips/image/mt7621.mk
index 81ee50e0af82..36bd0ef1edc5 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -174,7 +174,7 @@ define Device/alfa-network_quad-e4g
IMAGE_SIZE := 16064k
DEVICE_VENDOR := ALFA Network
DEVICE_MODEL := Quad-E4G
- DEVICE_PACKAGES := kmod-ata-ahci kmod-sdhci-mt7620 kmod-usb3 uboot-envtools \
+ DEVICE_PACKAGES := kmod-ata-ahci kmod-sdhci-mt7620 kmod-usb3 \
-wpad-basic-wolfssl
SUPPORTED_DEVICES += quad-e4g
endef
@@ -183,7 +183,7 @@ TARGET_DEVICES += alfa-network_quad-e4g
define Device/ampedwireless_ally_common
$(Device/dsa-migration)
DEVICE_VENDOR := Amped Wireless
- DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware uboot-envtools
+ DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware
IMAGE_SIZE := 32768k
KERNEL_SIZE := 4096k
BLOCKSIZE := 128k
@@ -280,7 +280,7 @@ define Device/asus_rt-ac65p
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \
check-size
- DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e kmod-mt7615-firmware uboot-envtools
+ DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e kmod-mt7615-firmware
endef
TARGET_DEVICES += asus_rt-ac65p
@@ -297,7 +297,7 @@ define Device/asus_rt-ac85p
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \
check-size
- DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e kmod-mt7615-firmware uboot-envtools
+ DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e kmod-mt7615-firmware
endef
TARGET_DEVICES += asus_rt-ac85p
@@ -326,7 +326,7 @@ define Device/asus_rt-ax53u
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \
check-size
- DEVICE_PACKAGES := kmod-mt7915e kmod-usb3 uboot-envtools
+ DEVICE_PACKAGES := kmod-mt7915e kmod-usb3
endef
TARGET_DEVICES += asus_rt-ax53u
@@ -348,7 +348,7 @@ define Device/beeline_smartbox-flash
IMAGE/factory.trx := append-kernel | append-ubi | check-size
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e kmod-mt7615-firmware \
- uboot-envtools uencrypt
+ uencrypt
endef
TARGET_DEVICES += beeline_smartbox-flash
@@ -361,7 +361,7 @@ define Device/beeline_smartbox-giga
DEVICE_VENDOR := Beeline
DEVICE_MODEL := SmartBox GIGA
DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e kmod-mt7663-firmware-ap \
- kmod-usb3 uboot-envtools
+ kmod-usb3
endef
TARGET_DEVICES += beeline_smartbox-giga
@@ -374,7 +374,7 @@ define Device/beeline_smartbox-turbo
DEVICE_VENDOR := Beeline
DEVICE_MODEL := SmartBox TURBO
DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e kmod-mt7615-firmware \
- kmod-usb3 uboot-envtools
+ kmod-usb3
endef
TARGET_DEVICES += beeline_smartbox-turbo
@@ -386,7 +386,7 @@ define Device/belkin_rt1800
IMAGE_SIZE := 49152k
DEVICE_VENDOR := Belkin
DEVICE_MODEL := RT1800
- DEVICE_PACKAGES := kmod-mt7915e kmod-usb3 uboot-envtools
+ DEVICE_PACKAGES := kmod-mt7915e kmod-usb3
UBINIZE_OPTS := -E 5
KERNEL_LOADADDR := 0x8200
KERNEL := kernel-bin | relocate-kernel 0x80001000 | lzma | \
@@ -440,7 +440,7 @@ define Device/bolt_arion
IMAGE_SIZE := 32448k
DEVICE_VENDOR := BOLT
DEVICE_MODEL := Arion
- DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 uboot-envtools
+ DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2
endef
TARGET_DEVICES += bolt_arion
@@ -877,7 +877,7 @@ define Device/h3c_tx180x
KERNEL := $$(KERNEL_INITRAMFS) | h3c-blank-header
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
DEVICE_VENDOR := H3C
- DEVICE_PACKAGES := kmod-mt7915e uboot-envtools
+ DEVICE_PACKAGES := kmod-mt7915e
endef
define Device/h3c_tx1800-plus
@@ -911,7 +911,7 @@ define Device/haier-sim_wr1800k
KERNEL_INITRAMFS := $$(KERNEL) | \
haier-sim_wr1800k-factory
$(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.bin
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
- DEVICE_PACKAGES := kmod-mt7915e uboot-envtools
+ DEVICE_PACKAGES := kmod-mt7915e
endef
define Device/haier_har-20s2u1
@@ -1199,7 +1199,7 @@ define Device/jcg_q20
check-size
DEVICE_VENDOR := JCG
DEVICE_MODEL := Q20
- DEVICE_PACKAGES := kmod-mt7915e uboot-envtools
+ DEVICE_PACKAGES := kmod-mt7915e
endef
TARGET_DEVICES += jcg_q20
@@ -1237,8 +1237,7 @@ define Device/linksys_e5600
