Current Turris Omnia snapshot and 19.07 release images doesn't contain wpad and iwinfo as wpad is missing in default package set. Fix it by adding wpad into DEFAULT_PACKAGES and then remove wpad from DEVICE_PACKAGES on devices which likely don't have wireless.
Cc: Tomasz Maciej Nowak <[email protected]> Cc: Klaus Kudielka <[email protected]> Signed-off-by: Petr Štetiar <[email protected]> --- This (or proper fix) should be backported to openwrt-19.07 ideally before 19.07.7 is tagged. target/linux/mvebu/cortexa9/target.mk | 1 + target/linux/mvebu/image/cortexa9.mk | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/target/linux/mvebu/cortexa9/target.mk b/target/linux/mvebu/cortexa9/target.mk index 02697fa62d57..683722948de0 100644 --- a/target/linux/mvebu/cortexa9/target.mk +++ b/target/linux/mvebu/cortexa9/target.mk @@ -9,3 +9,4 @@ BOARDNAME:=Marvell Armada 37x/38x/XP CPU_TYPE:=cortex-a9 CPU_SUBTYPE:=vfpv3-d16 KERNELNAME:=zImage dtbs +DEFAULT_PACKAGES += wpad-basic-wolfssl diff --git a/target/linux/mvebu/image/cortexa9.mk b/target/linux/mvebu/image/cortexa9.mk index 61f4d1781327..c4aa92066479 100644 --- a/target/linux/mvebu/image/cortexa9.mk +++ b/target/linux/mvebu/image/cortexa9.mk @@ -21,7 +21,7 @@ define Device/buffalo_ls421de DEVICE_PACKAGES := \ kmod-rtc-rs5c372a kmod-hwmon-gpiofan kmod-hwmon-drivetemp kmod-usb3 \ kmod-linkstation-poweroff kmod-md-raid0 kmod-md-raid1 kmod-md-mod \ - kmod-fs-xfs mkf2fs e2fsprogs partx-utils + kmod-fs-xfs mkf2fs e2fsprogs partx-utils -wpad-basic-wolfssl endef TARGET_DEVICES += buffalo_ls421de @@ -34,8 +34,7 @@ define Device/cznic_turris-omnia KERNEL_INITRAMFS := kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb DEVICE_PACKAGES := \ mkf2fs e2fsprogs kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 \ - wpad-basic-wolfssl kmod-ath9k kmod-ath10k-ct ath10k-firmware-qca988x-ct \ - partx-utils kmod-i2c-mux-pca954x + kmod-ath9k kmod-ath10k-ct ath10k-firmware-qca988x-ct partx-utils kmod-i2c-mux-pca954x IMAGES := $$(IMAGE_PREFIX)-sysupgrade.img.gz omnia-medkit-$$(IMAGE_PREFIX)-initramfs.tar.gz IMAGE/$$(IMAGE_PREFIX)-sysupgrade.img.gz := boot-scr | boot-img | sdcard-img | gzip | append-metadata IMAGE/omnia-medkit-$$(IMAGE_PREFIX)-initramfs.tar.gz := omnia-medkit-initramfs | gzip @@ -51,6 +50,7 @@ define Device/globalscale_mirabox DEVICE_MODEL := Mirabox SOC := armada-370 SUPPORTED_DEVICES += mirabox + DEVICE_PACKAGES := -wpad-basic-wolfssl endef TARGET_DEVICES += globalscale_mirabox @@ -59,7 +59,7 @@ define Device/kobol_helios4 DEVICE_MODEL := Helios4 KERNEL_INSTALL := 1 KERNEL := kernel-bin - DEVICE_PACKAGES := mkf2fs e2fsprogs partx-utils + DEVICE_PACKAGES := mkf2fs e2fsprogs partx-utils -wpad-basic-wolfssl IMAGES := sdcard.img.gz IMAGE/sdcard.img.gz := boot-scr | boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata SOC := armada-388 @@ -71,7 +71,7 @@ TARGET_DEVICES += kobol_helios4 define Device/linksys $(Device/NAND-128K) DEVICE_VENDOR := Linksys - DEVICE_PACKAGES := kmod-mwlwifi wpad-basic-wolfssl + DEVICE_PACKAGES := kmod-mwlwifi IMAGES += factory.img IMAGE/factory.img := append-kernel | pad-to $$$$(KERNEL_SIZE) | \ append-ubi | pad-to $$$$(PAGESIZE) @@ -167,6 +167,7 @@ define Device/marvell_a370-db DEVICE_MODEL := Armada 370 Development Board (DB-88F6710-BP-DDR3) DEVICE_DTS := armada-370-db SUPPORTED_DEVICES += armada-370-db + DEVICE_PACKAGES := -wpad-basic-wolfssl endef TARGET_DEVICES += marvell_a370-db @@ -176,6 +177,7 @@ define Device/marvell_a370-rd DEVICE_MODEL := Armada 370 RD (RD-88F6710-A1) DEVICE_DTS := armada-370-rd SUPPORTED_DEVICES += armada-370-rd + DEVICE_PACKAGES := -wpad-basic-wolfssl endef TARGET_DEVICES += marvell_a370-rd @@ -189,6 +191,7 @@ define Device/marvell_a385-db-ap append-ubi | pad-to $$$$(PAGESIZE) KERNEL_SIZE := 8192k SUPPORTED_DEVICES += armada-385-db-ap + DEVICE_PACKAGES := -wpad-basic-wolfssl endef TARGET_DEVICES += marvell_a385-db-ap @@ -199,6 +202,7 @@ define Device/marvell_a388-rd IMAGES := firmware.bin IMAGE/firmware.bin := append-kernel | pad-to 256k | append-rootfs | pad-rootfs SUPPORTED_DEVICES := armada-388-rd marvell,a385-rd + DEVICE_PACKAGES := -wpad-basic-wolfssl endef TARGET_DEVICES += marvell_a388-rd @@ -208,6 +212,7 @@ define Device/marvell_axp-db DEVICE_MODEL := Armada XP Development Board (DB-78460-BP) DEVICE_DTS := armada-xp-db SUPPORTED_DEVICES += armada-xp-db + DEVICE_PACKAGES := -wpad-basic-wolfssl endef TARGET_DEVICES += marvell_axp-db @@ -217,6 +222,7 @@ define Device/marvell_axp-gp DEVICE_MODEL := Armada Armada XP GP (DB-MV784MP-GP) DEVICE_DTS := armada-xp-gp SUPPORTED_DEVICES += armada-xp-gp + DEVICE_PACKAGES := -wpad-basic-wolfssl endef TARGET_DEVICES += marvell_axp-gp @@ -230,6 +236,7 @@ define Device/plathome_openblocks-ax3-4 PAGESIZE := 1 IMAGES += factory.img IMAGE/factory.img := append-kernel | pad-to $$(BLOCKSIZE) | append-ubi + DEVICE_PACKAGES := -wpad-basic-wolfssl endef TARGET_DEVICES += plathome_openblocks-ax3-4 @@ -238,7 +245,7 @@ define Device/solidrun_clearfog-base-a1 DEVICE_MODEL := ClearFog Base KERNEL_INSTALL := 1 KERNEL := kernel-bin - DEVICE_PACKAGES := mkf2fs e2fsprogs partx-utils + DEVICE_PACKAGES := mkf2fs e2fsprogs partx-utils -wpad-basic-wolfssl IMAGES := sdcard.img.gz IMAGE/sdcard.img.gz := boot-scr | boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata DEVICE_DTS := armada-388-clearfog-base armada-388-clearfog-pro @@ -256,7 +263,7 @@ define Device/solidrun_clearfog-pro-a1 DEVICE_MODEL := ClearFog Pro KERNEL_INSTALL := 1 KERNEL := kernel-bin - DEVICE_PACKAGES := mkf2fs e2fsprogs partx-utils + DEVICE_PACKAGES := mkf2fs e2fsprogs partx-utils -wpad-basic-wolfssl IMAGES := sdcard.img.gz IMAGE/sdcard.img.gz := boot-scr | boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata DEVICE_DTS := armada-388-clearfog-pro armada-388-clearfog-base _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
