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 <bj...@mork.no>
---
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 := 0x82000000
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
IMAGE_SIZE := 26624k
DEVICE_VENDOR := Linksys
DEVICE_MODEL := E5600
- DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e kmod-mt7663-firmware-ap \
- uboot-envtools
+ DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e kmod-mt7663-firmware-ap
UBINIZE_OPTS := -E 5
IMAGES += factory.bin
IMAGE/sysupgrade.bin := sysupgrade-tar | check-size | append-metadata
@@ -1264,8 +1263,7 @@ define Device/linksys_ea7xxx
KERNEL_SIZE := 4096k
IMAGE_SIZE := 36864k
DEVICE_VENDOR := Linksys
- DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e kmod-mt7615-firmware \
- uboot-envtools
+ DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e kmod-mt7615-firmware
UBINIZE_OPTS := -E 5
IMAGES := sysupgrade.bin factory.bin
IMAGE/sysupgrade.bin := sysupgrade-tar | check-size | append-metadata
@@ -1446,7 +1444,7 @@ define Device/mts_wg430223
IMAGES += factory.trx
IMAGE/factory.trx := append-kernel | append-ubi | check-size
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
- DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware uboot-envtools uencrypt
+ DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware uencrypt
endef
TARGET_DEVICES += mts_wg430223
@@ -1732,7 +1730,7 @@ define Device/raisecom_msg1500-x-00
DEVICE_ALT0_VENDOR := Nokia
DEVICE_ALT0_MODEL := A-040W-Q
DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3 \
- kmod-usb-ledtrig-usbport uboot-envtools
+ kmod-usb-ledtrig-usbport
endef
TARGET_DEVICES += raisecom_msg1500-x-00
@@ -1756,7 +1754,7 @@ define Device/rostelecom_rt-sf-1
DEVICE_VENDOR := Rostelecom
DEVICE_MODEL := RT-SF-1
DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e kmod-mt7615-firmware \
- kmod-usb3 uboot-envtools
+ kmod-usb3
endef
TARGET_DEVICES += rostelecom_rt-sf-1
@@ -1767,7 +1765,7 @@ define Device/samknows_whitebox-v8
DEVICE_VENDOR := SamKnows
DEVICE_MODEL := Whitebox 8
DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
- kmod-usb-ledtrig-usbport uboot-envtools
+ kmod-usb-ledtrig-usbport
SUPPORTED_DEVICES += sk-wb8
endef
TARGET_DEVICES += samknows_whitebox-v8
@@ -1797,7 +1795,7 @@ define Device/sercomm_na502s
DEVICE_VENDOR := SERCOMM
DEVICE_MODEL := NA502S
DEVICE_PACKAGES := kmod-mt76x2 kmod-mt7603 kmod-usb3 kmod-usb-serial \
- kmod-usb-serial-xr_usb_serial_common
+ kmod-usb-serial-xr_usb_serial_common
endef
TARGET_DEVICES += sercomm_na502s
@@ -2188,7 +2186,6 @@ define Device/xiaomi_nand_separate
$(Device/dsa-migration)
$(Device/uimage-lzma-loader)
DEVICE_VENDOR := Xiaomi
- DEVICE_PACKAGES := uboot-envtools
BLOCKSIZE := 128k
PAGESIZE := 2048
KERNEL_SIZE := 4096k
@@ -2236,7 +2233,7 @@ define Device/xiaomi_mi-router-3-pro
IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \
check-size
DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3 \
- kmod-usb-ledtrig-usbport uboot-envtools
+ kmod-usb-ledtrig-usbport
SUPPORTED_DEVICES += xiaomi,mir3p
endef
TARGET_DEVICES += xiaomi_mi-router-3-pro
@@ -2281,7 +2278,7 @@ define Device/xiaomi_mi-router-cr660x
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
IMAGE/firmware.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \
check-size
- DEVICE_PACKAGES += kmod-mt7915e uboot-envtools
+ DEVICE_PACKAGES += kmod-mt7915e
endef
define Device/xiaomi_mi-router-cr6606
@@ -2506,8 +2503,8 @@ define Device/zyxel_lte3301-plus
DEVICE_VENDOR := ZyXEL
DEVICE_MODEL := LTE3301-PLUS
DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3 \
- uboot-envtools kmod-usb-ledtrig-usbport kmod-usb-net-qmi-wwan \
- kmod-usb-serial-option uqmi
+ kmod-usb-ledtrig-usbport kmod-usb-net-qmi-wwan kmod-usb-serial-option \
+ uqmi
KERNEL := $(KERNEL_DTB) | uImage lzma | \
zytrx-header $$(DEVICE_MODEL) $$(VERSION_DIST)-$$(REVISION)
KERNEL_INITRAMFS := $(KERNEL_DTB) | uImage lzma | \
@@ -2524,7 +2521,7 @@ define Device/zyxel_nr7101
UBINIZE_OPTS := -E 5
DEVICE_VENDOR := ZyXEL
DEVICE_MODEL := NR7101
- DEVICE_PACKAGES := kmod-mt7603 kmod-usb3 uboot-envtools
kmod-usb-net-qmi-wwan kmod-usb-serial-option uqmi
+ DEVICE_PACKAGES := kmod-mt7603 kmod-usb3 kmod-usb-net-qmi-wwan
kmod-usb-serial-option uqmi
KERNEL := $(KERNEL_DTB) | uImage lzma | zytrx-header $$(DEVICE_MODEL)
$$(VERSION_DIST)-$$(REVISION)
KERNEL_INITRAMFS := $(KERNEL_DTB) | uImage lzma | zytrx-header
$$(DEVICE_MODEL) 9.99(ABUV.9)$$(VERSION_DIST)-recovery
KERNEL_INITRAMFS_SUFFIX := -recovery.bin
@@ -2539,7 +2536,7 @@ define Device/zyxel_nwa-ax
PAGESIZE := 2048
KERNEL_SIZE := 8192k
UBINIZE_OPTS := -E 5
- DEVICE_PACKAGES := kmod-mt7915e uboot-envtools zyxel-bootconfig
+ DEVICE_PACKAGES := kmod-mt7915e zyxel-bootconfig
KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword
$$(DEVICE_DTS)).dtb
IMAGES += factory.bin ramboot-factory.bin
IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi |
zyxel-nwa-fit
diff --git a/target/linux/ramips/mt7621/target.mk
b/target/linux/ramips/mt7621/target.mk
index d1f987b2e03d..e7e8043973b5 100644
--- a/target/linux/ramips/mt7621/target.mk
+++ b/target/linux/ramips/mt7621/target.mk
@@ -10,7 +10,7 @@ KERNELNAME:=vmlinux vmlinuz
# make Kernel/CopyImage use $LINUX_DIR/vmlinuz
IMAGES_DIR:=../../..
-DEFAULT_PACKAGES += wpad-basic-wolfssl
+DEFAULT_PACKAGES += wpad-basic-wolfssl uboot-envtools
define Target/Description
Build firmware images for Ralink MT7621 based boards.
--
2.30.2
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
