diff --git a/include/cmake.mk b/include/cmake.mk index 3318468c90..b9a7e36dee 100644 --- a/include/cmake.mk +++ b/include/cmake.mk @@ -52,6 +52,7 @@ CMAKE_RANLIB:=$(call cmake_tool,$(TARGET_RANLIB)) CMAKE_FIND_ROOT_PATH:=$(STAGING_DIR)/usr;$(TOOLCHAIN_DIR)$(if $(CONFIG_EXTERNAL_TOOLCHAIN),;$(CONFIG_TOOLCHAIN_ROOT)) CMAKE_HOST_FIND_ROOT_PATH:=$(STAGING_DIR)/host;$(STAGING_DIR_HOSTPKG);$(STAGING_DIR_HOST) CMAKE_SHARED_LDFLAGS:=-Wl,-Bsymbolic-functions +CMAKE_HOST_INSTALL_PREFIX = $(HOST_BUILD_PREFIX) ifeq ($(HOST_USE_NINJA),1) CMAKE_HOST_OPTIONS += -DCMAKE_GENERATOR="Ninja" @@ -157,7 +158,7 @@ define Host/Configure/Default -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \ -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \ -DCMAKE_STRIP=: \ - -DCMAKE_INSTALL_PREFIX=$(HOST_BUILD_PREFIX) \ + -DCMAKE_INSTALL_PREFIX=$(CMAKE_HOST_INSTALL_PREFIX) \ -DCMAKE_PREFIX_PATH=$(HOST_BUILD_PREFIX) \ -DCMAKE_SKIP_RPATH=TRUE \ -DCMAKE_INSTALL_LIBDIR=lib \ diff --git a/package/kernel/rtl8188eu/Makefile b/package/kernel/rtl8188eu/Makefile index 9ae74a2121..5effe64662 100644 --- a/package/kernel/rtl8188eu/Makefile +++ b/package/kernel/rtl8188eu/Makefile @@ -1,14 +1,11 @@ +# SPDX-License-Identifier: GPL-3.0-only # -# Copyright (C) 2021 ImmortalWrt -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# +# Copyright (C) 2021-2022 ImmortalWrt.org include $(TOPDIR)/rules.mk PKG_NAME:=rtl8188eu -PKG_RELEASE:=1 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_URL:=https://github.com/aircrack-ng/rtl8188eus.git PKG_SOURCE_PROTO:=git diff --git a/package/kernel/rtl8189es/Makefile b/package/kernel/rtl8189es/Makefile index dba46a14ab..a709176df7 100644 --- a/package/kernel/rtl8189es/Makefile +++ b/package/kernel/rtl8189es/Makefile @@ -1,14 +1,11 @@ +# SPDX-License-Identifier: GPL-3.0-only # -# Copyright (C) 2021 ImmortalWrt -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2021-2022 ImmortalWrt.org include $(TOPDIR)/rules.mk PKG_NAME:=rtl8189es -PKG_RELEASE:=1 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_URL:=https://github.com/jwrdegoede/rtl8189ES_linux.git PKG_SOURCE_PROTO:=git diff --git a/package/kernel/rtl8192eu/Makefile b/package/kernel/rtl8192eu/Makefile index 55f38bdbfc..33bd8ad393 100644 --- a/package/kernel/rtl8192eu/Makefile +++ b/package/kernel/rtl8192eu/Makefile @@ -1,14 +1,11 @@ +# SPDX-License-Identifier: GPL-3.0-only # -# Copyright (C) 2021 ImmortalWrt -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# +# Copyright (C) 2021-2022 ImmortalWrt.org include $(TOPDIR)/rules.mk PKG_NAME:=rtl8192eu -PKG_RELEASE:=1 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_URL:=https://github.com/Mange/rtl8192eu-linux-driver.git PKG_SOURCE_PROTO:=git diff --git a/package/kernel/rtl8812au-ac/Makefile b/package/kernel/rtl8812au-ac/Makefile index 3e7ac14f7c..ee89067ddc 100644 --- a/package/kernel/rtl8812au-ac/Makefile +++ b/package/kernel/rtl8812au-ac/Makefile @@ -1,18 +1,14 @@ +# SPDX-License-Identifier: GPL-3.0-only # # Copyright (C) 2020 stepheny # # -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# +# Copyright (C) 2021-2022 ImmortalWrt.org include $(TOPDIR)/rules.mk PKG_NAME:=rtl8812au-ac -PKG_RELEASE:=1 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_URL:=https://github.com/aircrack-ng/rtl8812au.git PKG_SOURCE_PROTO:=git diff --git a/package/kernel/rtl8821cu/Makefile b/package/kernel/rtl8821cu/Makefile index 052efad813..a9d97f0d39 100644 --- a/package/kernel/rtl8821cu/Makefile +++ b/package/kernel/rtl8821cu/Makefile @@ -1,15 +1,11 @@ +# SPDX-License-Identifier: GPL-3.0-only # -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# +# Copyright (C) 2021-2022 ImmortalWrt.org include $(TOPDIR)/rules.mk PKG_NAME:=rtl8821cu -PKG_RELEASE:=1 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_URL:=https://github.com/brektrou/rtl8821CU.git PKG_SOURCE_PROTO:=git @@ -19,7 +15,7 @@ PKG_MIRROR_HASH:=77958d3bff8b0145504a10959765be0e3743b9c4880a5173d156238c2c569a5 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINTER:=CN_SZTL +PKG_MAINTAINTER:=Tianling Shen PKG_BUILD_PARALLEL:=1 diff --git a/package/kernel/rtl88x2bu/Makefile b/package/kernel/rtl88x2bu/Makefile index bb62018cca..75796ff195 100644 --- a/package/kernel/rtl88x2bu/Makefile +++ b/package/kernel/rtl88x2bu/Makefile @@ -1,15 +1,11 @@ +# SPDX-License-Identifier: GPL-3.0-only # -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# +# Copyright (C) 2021 ImmortalWrt.org include $(TOPDIR)/rules.mk PKG_NAME:=rtl88x2bu -PKG_RELEASE:=1 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_URL:=https://github.com/morrownr/88x2bu.git PKG_SOURCE_PROTO:=git diff --git a/package/network/config/firewall/Makefile b/package/network/config/firewall/Makefile index 57f0abd797..1bf62c8fc2 100644 --- a/package/network/config/firewall/Makefile +++ b/package/network/config/firewall/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=firewall -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/firewall3.git diff --git a/package/network/config/firewall/files/firewall.config b/package/network/config/firewall/files/firewall.config index 994d71a21e..09119af014 100644 --- a/package/network/config/firewall/files/firewall.config +++ b/package/network/config/firewall/files/firewall.config @@ -55,13 +55,11 @@ config rule option target ACCEPT # Allow DHCPv6 replies -# see https://dev.openwrt.org/ticket/10381 +# see https://github.com/openwrt/openwrt/issues/5066 config rule option name Allow-DHCPv6 option src wan option proto udp - option src_ip fc00::/6 - option dest_ip fc00::/6 option dest_port 546 option family ipv6 option target ACCEPT diff --git a/package/network/config/firewall/patches/001-firewall3-fix-locking-issue.patch b/package/network/config/firewall/patches/001-firewall3-fix-locking-issue.patch new file mode 100644 index 0000000000..8ce18407ca --- /dev/null +++ b/package/network/config/firewall/patches/001-firewall3-fix-locking-issue.patch @@ -0,0 +1,38 @@ +From df1306a96127e91ff2d513a0a67345baaf61d113 Mon Sep 17 00:00:00 2001 +From: Florian Eckert +Date: Fri, 19 Nov 2021 09:51:02 +0100 +Subject: [PATCH] firewall3: fix locking issue + +By calling the command 'fw3 reload' several times at the same time, I +noticed that the locking was not working properly. It happened from time +to time that some firewall rules were present twice in the system! + +By removing the 'unlink' systemcall, this error no longer occurred on my +systems. + +Since fw3 does not run as a service, it makes no sense to delete this +lock file every time a filehandler is no longer open on this lock file, +because fw3 binary is not running. + +If fw3 does run as a service then we can remove this lock file on +service stop. But this is not the case for fw3. + +Signed-off-by: Florian Eckert +--- + utils.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/utils.c b/utils.c +index 17d5bf9..92e966c 100644 +--- a/utils.c ++++ b/utils.c +@@ -397,7 +397,6 @@ fw3_unlock_path(int *fd, const char *lockpath) + warn("Cannot release exclusive lock: %s", strerror(errno)); + + close(*fd); +- unlink(FW3_LOCKFILE); + + *fd = -1; + } +-- +2.30.2 diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile index a6e1dce5aa..706c3194b1 100644 --- a/package/utils/util-linux/Makefile +++ b/package/utils/util-linux/Makefile @@ -261,6 +261,18 @@ define Package/hwclock/description hwclock is a tool for accessing the Hardware Clock endef +define Package/ipcs +$(call Package/util-linux/Default) + TITLE:=show information on IPC facilities +endef + +define Package/ipcs/description + ipcs shows information on the inter-process communication facilities for + which the calling process has read access. By default it shows information + about all three resources: shared memory segments, message queues, and + semaphore arrays. +endef + define Package/logger $(call Package/util-linux/Default) TITLE:=a shell command interface to the syslog system log module @@ -313,6 +325,26 @@ define Package/lscpu/description lscpu displays information about the CPU architecture endef +define Package/lslocks +$(call Package/util-linux/Default) + TITLE:=list local system locks + DEPENDS:= +libmount +libsmartcols +endef + +define Package/lslocks/description + lslocks lists information about all the currently held file locks in a Linux system +endef + +define Package/lsns +$(call Package/util-linux/Default) + TITLE:=list system namespaces + DEPENDS:= +libblkid +libmount +libsmartcols +endef + +define Package/lsns/description + lsns lists information about all namespaces and their processes +endef + define Package/more $(call Package/util-linux/Default) TITLE:=filter for paging through text one screenful at a time @@ -439,6 +471,15 @@ define Package/swap-utils/description contains: mkswap, swaplabel endef +define Package/taskset +$(call Package/util-linux/Default) + TITLE:=set or retrieve a process's CPU affinity +endef + +define Package/taskset/description + contains: taskset +endef + define Package/unshare $(call Package/util-linux/Default) TITLE:=unshare userspace tool @@ -686,6 +727,11 @@ define Package/hwclock/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hwclock $(1)/usr/sbin/ endef +define Package/ipcs/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ipcs $(1)/usr/bin/ +endef + define Package/logger/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/logger $(1)/usr/bin/util-linux-logger @@ -711,6 +757,16 @@ define Package/lscpu/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lscpu $(1)/usr/bin/ endef +define Package/lslocks/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lslocks $(1)/usr/bin/ +endef + +define Package/lsns/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lsns $(1)/usr/bin/ +endef + define Package/more/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/more $(1)/usr/bin/ @@ -777,6 +833,11 @@ define Package/swap-utils/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/swaplabel $(1)/usr/sbin/ endef +define Package/taskset/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/taskset $(1)/usr/bin/ +endef + define Package/unshare/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/unshare $(1)/usr/bin/ @@ -828,11 +889,14 @@ $(eval $(call BuildPackage,flock)) $(eval $(call BuildPackage,fstrim)) $(eval $(call BuildPackage,getopt)) $(eval $(call BuildPackage,hwclock)) +$(eval $(call BuildPackage,ipcs)) $(eval $(call BuildPackage,logger)) $(eval $(call BuildPackage,look)) $(eval $(call BuildPackage,losetup)) $(eval $(call BuildPackage,lsblk)) $(eval $(call BuildPackage,lscpu)) +$(eval $(call BuildPackage,lslocks)) +$(eval $(call BuildPackage,lsns)) $(eval $(call BuildPackage,more)) $(eval $(call BuildPackage,mcookie)) $(eval $(call BuildPackage,mount-utils)) @@ -845,6 +909,7 @@ $(eval $(call BuildPackage,script-utils)) $(eval $(call BuildPackage,setterm)) $(eval $(call BuildPackage,sfdisk)) $(eval $(call BuildPackage,swap-utils)) +$(eval $(call BuildPackage,taskset)) $(eval $(call BuildPackage,unshare)) $(eval $(call BuildPackage,uuidd)) $(eval $(call BuildPackage,uuidgen)) diff --git a/target/linux/apm821xx/image/sata.mk b/target/linux/apm821xx/image/sata.mk index 6fe8324b93..16b187b8aa 100644 --- a/target/linux/apm821xx/image/sata.mk +++ b/target/linux/apm821xx/image/sata.mk @@ -6,7 +6,7 @@ endef define Device/wd_mybooklive DEVICE_VENDOR := Western Digital DEVICE_MODEL := My Book Live Series (Single + Duo) - DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-usb-storage kmod-fs-vfat wpad-basic + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-usb-storage kmod-fs-vfat wpad-basic-openssl SUPPORTED_DEVICES += mbl wd,mybooklive-duo BLOCKSIZE := 1k DTB_SIZE := 16384 diff --git a/target/linux/apm821xx/nand/target.mk b/target/linux/apm821xx/nand/target.mk index 16475307d7..266a35415a 100644 --- a/target/linux/apm821xx/nand/target.mk +++ b/target/linux/apm821xx/nand/target.mk @@ -1,7 +1,7 @@ BOARDNAME:=Devices with NAND flash (Routers) FEATURES += nand pcie ramdisk squashfs usb -DEFAULT_PACKAGES += kmod-ath9k swconfig wpad-basic +DEFAULT_PACKAGES += kmod-ath9k swconfig wpad-basic-openssl define Target/Description Build firmware images for APM821XX boards with NAND flash. diff --git a/target/linux/apm821xx/sata/profiles/00-default.mk b/target/linux/apm821xx/sata/profiles/00-default.mk index 5935c5be19..a38d4eb909 100644 --- a/target/linux/apm821xx/sata/profiles/00-default.mk +++ b/target/linux/apm821xx/sata/profiles/00-default.mk @@ -5,7 +5,7 @@ define Profile/Default NAME:=Default Profile PRIORITY:=1 - PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-usb-storage kmod-fs-vfat wpad-basic + PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-usb-storage kmod-fs-vfat wpad-basic-openssl endef define Profile/Default/Description diff --git a/target/linux/archs38/generic/profiles/00-default.mk b/target/linux/archs38/generic/profiles/00-default.mk index 252a8c1c9b..19eb067fcf 100644 --- a/target/linux/archs38/generic/profiles/00-default.mk +++ b/target/linux/archs38/generic/profiles/00-default.mk @@ -4,7 +4,7 @@ define Profile/Default NAME:=Default Profile (all drivers) - PACKAGES:= kmod-usb-core kmod-usb2 kmod-ath9k-htc wpad-basic + PACKAGES:= kmod-usb-core kmod-usb2 kmod-ath9k-htc wpad-basic-openssl endef define Profile/Default/Description diff --git a/target/linux/ath25/Makefile b/target/linux/ath25/Makefile index 0426c65e4f..348b153a79 100644 --- a/target/linux/ath25/Makefile +++ b/target/linux/ath25/Makefile @@ -18,6 +18,6 @@ endef include $(INCLUDE_DIR)/target.mk -DEFAULT_PACKAGES += wpad-mini kmod-ath5k swconfig kmod-gpio-button-hotplug +DEFAULT_PACKAGES += wpad-basic-openssl kmod-ath5k swconfig kmod-gpio-button-hotplug $(eval $(call BuildTarget)) diff --git a/target/linux/ath79/generic/target.mk b/target/linux/ath79/generic/target.mk index 4e53c89260..ca6c2da1e5 100644 --- a/target/linux/ath79/generic/target.mk +++ b/target/linux/ath79/generic/target.mk @@ -1,6 +1,6 @@ BOARDNAME:=Generic -DEFAULT_PACKAGES += wpad-basic-wolfssl +DEFAULT_PACKAGES += wpad-basic-openssl define Target/Description Build firmware images for generic Atheros AR71xx/AR913x/AR934x based boards. diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index 2bfa786b4d..4dd3ed5cc2 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -372,7 +372,7 @@ endef TARGET_DEVICES += ubnt_rocket-m define Device/ubnt_routerstation_common - DEVICE_PACKAGES := -kmod-ath9k -wpad-basic-wolfssl -uboot-envtools kmod-usb-ohci \ + DEVICE_PACKAGES := -kmod-ath9k -wpad-basic-openssl -uboot-envtools kmod-usb-ohci \ kmod-usb2 fconfig DEVICE_VENDOR := Ubiquiti SOC := ar7161 diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 67188b2ec6..4a2ef834f4 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -1308,7 +1308,7 @@ define Device/hak5_lan-turtle TPLINK_HWID := 0x5348334c IMAGES := sysupgrade.bin DEVICE_PACKAGES := kmod-usb-chipidea2 -iwinfo -kmod-ath9k -swconfig \ - -uboot-envtools -wpad-basic-wolfssl + -uboot-envtools -wpad-basic-openssl SUPPORTED_DEVICES += lan-turtle endef TARGET_DEVICES += hak5_lan-turtle @@ -1321,7 +1321,7 @@ define Device/hak5_packet-squirrel TPLINK_HWID := 0x5351524c IMAGES := sysupgrade.bin DEVICE_PACKAGES := kmod-usb-chipidea2 -iwinfo -kmod-ath9k -swconfig \ - -uboot-envtools -wpad-basic-wolfssl + -uboot-envtools -wpad-basic-openssl SUPPORTED_DEVICES += packet-squirrel endef TARGET_DEVICES += hak5_packet-squirrel @@ -1344,7 +1344,7 @@ define Device/iodata_etg3-r DEVICE_VENDOR := I-O DATA DEVICE_MODEL := ETG3-R IMAGE_SIZE := 7680k - DEVICE_PACKAGES := -iwinfo -kmod-ath9k -wpad-basic-wolfssl + DEVICE_PACKAGES := -iwinfo -kmod-ath9k -wpad-basic-openssl endef TARGET_DEVICES += iodata_etg3-r @@ -1404,7 +1404,7 @@ define Device/jjplus_ja76pf2 SOC := ar7161 DEVICE_VENDOR := jjPlus DEVICE_MODEL := JA76PF2 - DEVICE_PACKAGES += -kmod-ath9k -swconfig -wpad-basic-wolfssl -uboot-envtools fconfig + DEVICE_PACKAGES += -kmod-ath9k -swconfig -wpad-basic-openssl -uboot-envtools fconfig IMAGES += kernel.bin rootfs.bin IMAGE/kernel.bin := append-kernel IMAGE/rootfs.bin := append-rootfs | pad-rootfs diff --git a/target/linux/ath79/mikrotik/target.mk b/target/linux/ath79/mikrotik/target.mk index f5df904487..5618f6cbd7 100644 --- a/target/linux/ath79/mikrotik/target.mk +++ b/target/linux/ath79/mikrotik/target.mk @@ -3,7 +3,7 @@ FEATURES += minor nand KERNELNAME := vmlinux vmlinuz IMAGES_DIR := ../../.. -DEFAULT_PACKAGES += wpad-basic-wolfssl +DEFAULT_PACKAGES += wpad-basic-openssl define Target/Description Build firmware images for MikroTik devices based on Qualcomm Atheros diff --git a/target/linux/ath79/nand/target.mk b/target/linux/ath79/nand/target.mk index 7ea9b57f45..52befec039 100644 --- a/target/linux/ath79/nand/target.mk +++ b/target/linux/ath79/nand/target.mk @@ -2,7 +2,7 @@ BOARDNAME := Generic devices with NAND flash FEATURES += nand -DEFAULT_PACKAGES += wpad-basic-wolfssl +DEFAULT_PACKAGES += wpad-basic-openssl define Target/Description Firmware for boards using Qualcomm Atheros, MIPS-based SoCs diff --git a/target/linux/ath79/tiny/target.mk b/target/linux/ath79/tiny/target.mk index 91f135b56e..4de6b8a642 100644 --- a/target/linux/ath79/tiny/target.mk +++ b/target/linux/ath79/tiny/target.mk @@ -1,7 +1,7 @@ BOARDNAME:=Devices with small flash FEATURES += small_flash -DEFAULT_PACKAGES += wpad-basic-wolfssl +DEFAULT_PACKAGES += wpad-basic-openssl define Target/Description Build firmware images for Atheros AR71xx/AR913x/AR934x based boards with small flash diff --git a/target/linux/bcm27xx/image/Makefile b/target/linux/bcm27xx/image/Makefile index 9b25a26ede..663183b34b 100644 --- a/target/linux/bcm27xx/image/Makefile +++ b/target/linux/bcm27xx/image/Makefile @@ -77,7 +77,7 @@ define Device/rpi DEVICE_PACKAGES := \ cypress-firmware-43430-sdio \ cypress-nvram-43430-sdio-rpi-zero-w \ - kmod-brcmfmac wpad-basic + kmod-brcmfmac wpad-basic-openssl endef ifeq ($(SUBTARGET),bcm2708) TARGET_DEVICES += rpi @@ -108,7 +108,7 @@ define Device/rpi-2 cypress-nvram-43430-sdio-rpi-3b \ cypress-firmware-43455-sdio \ cypress-nvram-43455-sdio-rpi-3b-plus cypress-nvram-43455-sdio-rpi-4b \ - kmod-brcmfmac wpad-basic + kmod-brcmfmac wpad-basic-openssl IMAGE/sysupgrade.img.gz := boot-common | boot-2708 | boot-2711 | sdcard-img | gzip | append-metadata IMAGE/factory.img.gz := boot-common | boot-2708 | boot-2711 | sdcard-img | gzip endef @@ -137,7 +137,7 @@ define Device/rpi-3 cypress-nvram-43430-sdio-rpi-3b \ cypress-firmware-43455-sdio \ cypress-nvram-43455-sdio-rpi-3b-plus \ - kmod-brcmfmac wpad-basic + kmod-brcmfmac wpad-basic-openssl endef ifeq ($(SUBTARGET),bcm2710) TARGET_DEVICES += rpi-3 @@ -158,7 +158,7 @@ define Device/rpi-4 DEVICE_PACKAGES := \ cypress-firmware-43455-sdio \ cypress-nvram-43455-sdio-rpi-4b \ - kmod-brcmfmac wpad-basic + kmod-brcmfmac wpad-basic-openssl IMAGE/sysupgrade.img.gz := boot-common | boot-2711 | sdcard-img | gzip | append-metadata IMAGE/factory.img.gz := boot-common | boot-2711 | sdcard-img | gzip endef diff --git a/target/linux/bcm47xx/generic/profiles/101-Broadcom-wl.mk b/target/linux/bcm47xx/generic/profiles/101-Broadcom-wl.mk index 12cffecdb8..bf98ef9622 100644 --- a/target/linux/bcm47xx/generic/profiles/101-Broadcom-wl.mk +++ b/target/linux/bcm47xx/generic/profiles/101-Broadcom-wl.mk @@ -4,7 +4,7 @@ define Profile/Broadcom-wl NAME:=Broadcom SoC, all Ethernet, BCM43xx WiFi (wl, proprietary) - PACKAGES:=-wpad-basic kmod-b44 kmod-tg3 kmod-bgmac kmod-brcm-wl wlc nas + PACKAGES:=-wpad-basic-openssl kmod-b44 kmod-tg3 kmod-bgmac kmod-brcm-wl wlc nas endef define Profile/Broadcom-wl/Description diff --git a/target/linux/bcm47xx/generic/profiles/105-Broadcom-none.mk b/target/linux/bcm47xx/generic/profiles/105-Broadcom-none.mk index 883e028090..07e20d83e7 100644 --- a/target/linux/bcm47xx/generic/profiles/105-Broadcom-none.mk +++ b/target/linux/bcm47xx/generic/profiles/105-Broadcom-none.mk @@ -4,7 +4,7 @@ define Profile/Broadcom-none NAME:=Broadcom SoC, all Ethernet, No WiFi - PACKAGES:=-wpad-basic kmod-b44 kmod-tg3 kmod-bgmac + PACKAGES:=-wpad-basic-openssl kmod-b44 kmod-tg3 kmod-bgmac endef define Profile/Broadcom-none/Description diff --git a/target/linux/bcm47xx/generic/profiles/201-Broadcom-b44-wl.mk b/target/linux/bcm47xx/generic/profiles/201-Broadcom-b44-wl.mk index f3ef1fb12a..afd688f0bd 100644 --- a/target/linux/bcm47xx/generic/profiles/201-Broadcom-b44-wl.mk +++ b/target/linux/bcm47xx/generic/profiles/201-Broadcom-b44-wl.mk @@ -4,7 +4,7 @@ define Profile/Broadcom-b44-wl NAME:=Broadcom SoC, b44 Ethernet, BCM43xx WiFi (wl, proprietary) - PACKAGES:=-wpad-basic kmod-b44 kmod-brcm-wl wlc nas + PACKAGES:=-wpad-basic-openssl kmod-b44 kmod-brcm-wl wlc nas endef define Profile/Broadcom-b44-wl/Description diff --git a/target/linux/bcm47xx/generic/profiles/205-Broadcom-b44-none.mk b/target/linux/bcm47xx/generic/profiles/205-Broadcom-b44-none.mk index 171f371227..3ba2c12b04 100644 --- a/target/linux/bcm47xx/generic/profiles/205-Broadcom-b44-none.mk +++ b/target/linux/bcm47xx/generic/profiles/205-Broadcom-b44-none.mk @@ -4,7 +4,7 @@ define Profile/Broadcom-b44-none NAME:=Broadcom SoC, b44 Ethernet, No WiFi - PACKAGES:=-wpad-basic kmod-b44 + PACKAGES:=-wpad-basic-openssl kmod-b44 endef define Profile/Broadcom-b44-none/Description diff --git a/target/linux/bcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk b/target/linux/bcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk index a0eeb90920..22949b10c4 100644 --- a/target/linux/bcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk +++ b/target/linux/bcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk @@ -4,7 +4,7 @@ define Profile/Broadcom-tg3-wl NAME:=Broadcom SoC, tg3 Ethernet, BCM43xx WiFi (wl, proprietary) - PACKAGES:=-wpad-basic kmod-brcm-wl wlc nas kmod-tg3 + PACKAGES:=-wpad-basic-openssl kmod-brcm-wl wlc nas kmod-tg3 endef define Profile/Broadcom-tg3-wl/Description diff --git a/target/linux/bcm47xx/generic/profiles/215-Broadcom-tg3-none.mk b/target/linux/bcm47xx/generic/profiles/215-Broadcom-tg3-none.mk index 373f407e3f..46b26472e9 100644 --- a/target/linux/bcm47xx/generic/profiles/215-Broadcom-tg3-none.mk +++ b/target/linux/bcm47xx/generic/profiles/215-Broadcom-tg3-none.mk @@ -4,7 +4,7 @@ define Profile/Broadcom-tg3-none NAME:=Broadcom SoC, tg3 Ethernet, no WiFi - PACKAGES:=-wpad-basic kmod-tg3 + PACKAGES:=-wpad-basic-openssl kmod-tg3 endef define Profile/Broadcom-tg3-none/Description diff --git a/target/linux/bcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk b/target/linux/bcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk index e0bc84c371..0b14ae2497 100644 --- a/target/linux/bcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk +++ b/target/linux/bcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk @@ -4,7 +4,7 @@ define Profile/Broadcom-bgmac-wl NAME:=Broadcom SoC, bgmac Ethernet, BCM43xx WiFi (wl, proprietary) - PACKAGES:=-wpad-basic kmod-bgmac kmod-brcm-wl wlc nas + PACKAGES:=-wpad-basic-openssl kmod-bgmac kmod-brcm-wl wlc nas endef define Profile/Broadcom-bgmac-wl/Description diff --git a/target/linux/bcm47xx/generic/profiles/225-Broadcom-bgmac-none.mk b/target/linux/bcm47xx/generic/profiles/225-Broadcom-bgmac-none.mk index da194d828f..49813c0c36 100644 --- a/target/linux/bcm47xx/generic/profiles/225-Broadcom-bgmac-none.mk +++ b/target/linux/bcm47xx/generic/profiles/225-Broadcom-bgmac-none.mk @@ -4,7 +4,7 @@ define Profile/Broadcom-bgmac-none NAME:=Broadcom SoC, bgmac Ethernet, No WiFi - PACKAGES:=-wpad-basic kmod-bgmac + PACKAGES:=-wpad-basic-openssl kmod-bgmac endef define Profile/Broadcom-bgmac-none/Description diff --git a/target/linux/bcm47xx/generic/profiles/PS-1208MFG.mk b/target/linux/bcm47xx/generic/profiles/PS-1208MFG.mk index 5d2d7324b2..87b98e6e0c 100644 --- a/target/linux/bcm47xx/generic/profiles/PS-1208MFG.mk +++ b/target/linux/bcm47xx/generic/profiles/PS-1208MFG.mk @@ -4,7 +4,7 @@ define Profile/Ps1208mfg NAME:=Edimax PS-1208MFG - PACKAGES:=-firewall -dropbear -dnsmasq -mtd -ppp -wpad-basic kmod-b44 block-mount kmod-usb-storage kmod-usb2 kmod-usb-ohci -iptables -swconfig kmod-fs-ext4 + PACKAGES:=-firewall -dropbear -dnsmasq -mtd -ppp -wpad-basic-openssl kmod-b44 block-mount kmod-usb-storage kmod-usb2 kmod-usb-ohci -iptables -swconfig kmod-fs-ext4 endef define Profile/Ps1208mfg/Description diff --git a/target/linux/bcm47xx/generic/target.mk b/target/linux/bcm47xx/generic/target.mk index 2f93778b09..62a0794e6c 100644 --- a/target/linux/bcm47xx/generic/target.mk +++ b/target/linux/bcm47xx/generic/target.mk @@ -1,7 +1,7 @@ BOARDNAME:=Generic FEATURES+=pcmcia -DEFAULT_PACKAGES += wpad-basic +DEFAULT_PACKAGES += wpad-basic-openssl define Target/Description Build generic firmware for all Broadcom BCM47xx and BCM53xx MIPS diff --git a/target/linux/bcm47xx/legacy/profiles/101-Broadcom-wl.mk b/target/linux/bcm47xx/legacy/profiles/101-Broadcom-wl.mk index 94129b4f55..7d8b0c8cfc 100644 --- a/target/linux/bcm47xx/legacy/profiles/101-Broadcom-wl.mk +++ b/target/linux/bcm47xx/legacy/profiles/101-Broadcom-wl.mk @@ -4,7 +4,7 @@ define Profile/Broadcom-wl NAME:=Broadcom SoC, all Ethernet, BCM43xx WiFi (wl, proprietary) - PACKAGES:=-wpad-mini kmod-brcm-wl-mini wlc nas + PACKAGES:=-wpad-basic-openssl kmod-brcm-wl-mini wlc nas endef define Profile/Broadcom-wl/Description diff --git a/target/linux/bcm47xx/legacy/target.mk b/target/linux/bcm47xx/legacy/target.mk index fca6128558..cd4619e3ea 100644 --- a/target/linux/bcm47xx/legacy/target.mk +++ b/target/linux/bcm47xx/legacy/target.mk @@ -1,7 +1,7 @@ FEATURES += low_mem pcmcia small_flash BOARDNAME:=Legacy (BMIPS3300) -DEFAULT_PACKAGES += wpad-mini +DEFAULT_PACKAGES += wpad-basic-openssl define Target/Description Build firmware for Broadcom BCM47xx and BCM53xx devices with diff --git a/target/linux/bcm47xx/mips74k/profiles/102-Broadcom-wl.mk b/target/linux/bcm47xx/mips74k/profiles/102-Broadcom-wl.mk index 571753c472..7ece0ffbd9 100644 --- a/target/linux/bcm47xx/mips74k/profiles/102-Broadcom-wl.mk +++ b/target/linux/bcm47xx/mips74k/profiles/102-Broadcom-wl.mk @@ -4,7 +4,7 @@ define Profile/Broadcom-mips74k-wl NAME:=Broadcom SoC, BCM43xx WiFi (proprietary wl) - PACKAGES:=-wpad-basic kmod-brcm-wl wlc nas + PACKAGES:=-wpad-basic-openssl kmod-brcm-wl wlc nas endef define Profile/Broadcom-mips74k-wl/Description diff --git a/target/linux/bcm47xx/mips74k/profiles/103-Broadcom-none.mk b/target/linux/bcm47xx/mips74k/profiles/103-Broadcom-none.mk index 34fb3652a9..c3d0c321b6 100644 --- a/target/linux/bcm47xx/mips74k/profiles/103-Broadcom-none.mk +++ b/target/linux/bcm47xx/mips74k/profiles/103-Broadcom-none.mk @@ -4,7 +4,7 @@ define Profile/Broadcom-mips74k-none NAME:=Broadcom SoC, No WiFi - PACKAGES:=-wpad-basic + PACKAGES:=-wpad-basic-openssl endef define Profile/Broadcom-mips74k-none/Description diff --git a/target/linux/bcm47xx/mips74k/target.mk b/target/linux/bcm47xx/mips74k/target.mk index 1e2e8436d5..a903fc8b7c 100644 --- a/target/linux/bcm47xx/mips74k/target.mk +++ b/target/linux/bcm47xx/mips74k/target.mk @@ -1,7 +1,7 @@ BOARDNAME:=MIPS 74K CPU_TYPE:=74kc -DEFAULT_PACKAGES += wpad-basic +DEFAULT_PACKAGES += wpad-basic-openssl define Target/Description Build firmware for Broadcom BCM47xx and BCM53xx devices with diff --git a/target/linux/bcm53xx/image/Makefile b/target/linux/bcm53xx/image/Makefile index 48e7db03c9..7bc795fcd9 100644 --- a/target/linux/bcm53xx/image/Makefile +++ b/target/linux/bcm53xx/image/Makefile @@ -111,7 +111,7 @@ DEVICE_VARS += SIGNATURE DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_REGION TPLINK_BOARD DEVICE_VARS += LUXUL_BOARD -IEEE8021X := wpad-basic-wolfssl +IEEE8021X := wpad-basic-openssl B43 := $(IEEE8021X) kmod-b43 BRCMFMAC_43602A1 := $(IEEE8021X) kmod-brcmfmac brcmfmac-firmware-43602a1-pcie BRCMFMAC_4366B1 := $(IEEE8021X) kmod-brcmfmac brcmfmac-firmware-4366b1-pcie @@ -414,7 +414,7 @@ define Device/phicomm_k3 DEVICE_VENDOR := PHICOMM DEVICE_MODEL := K3 DEVICE_PACKAGES := $(USB3_PACKAGES) brcmfmac-firmware-4366c0-pcie-vendor \ - kmod-brcmfmac wpad-basic-wolfssl luci-app-k3screenctrl + kmod-brcmfmac wpad-basic-openssl luci-app-k3screenctrl IMAGES := trx endef TARGET_DEVICES += phicomm_k3 diff --git a/target/linux/bcm63xx/image/Makefile b/target/linux/bcm63xx/image/Makefile index f35358173c..8b86c7e322 100644 --- a/target/linux/bcm63xx/image/Makefile +++ b/target/linux/bcm63xx/image/Makefile @@ -305,12 +305,12 @@ define Device/Default endef DEVICE_VARS += CHIP_ID DEVICE_LOADADDR -ATH5K_PACKAGES := kmod-ath5k wpad-basic-wolfssl -ATH9K_PACKAGES := kmod-ath9k wpad-basic-wolfssl -B43_PACKAGES := kmod-b43 wpad-basic-wolfssl +ATH5K_PACKAGES := kmod-ath5k wpad-basic-openssl +ATH9K_PACKAGES := kmod-ath9k wpad-basic-openssl +B43_PACKAGES := kmod-b43 wpad-basic-openssl BRCMWL_PACKAGES := kmod-brcm-wl nas wlc -RT28_PACKAGES := kmod-rt2800-pci wpad-basic-wolfssl -RT61_PACKAGES := kmod-rt61-pci wpad-basic-wolfssl +RT28_PACKAGES := kmod-rt2800-pci wpad-basic-openssl +RT61_PACKAGES := kmod-rt61-pci wpad-basic-openssl USB1_PACKAGES := kmod-usb-ohci kmod-usb-ledtrig-usbport USB2_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport diff --git a/target/linux/bcm63xx/profiles/default.mk b/target/linux/bcm63xx/profiles/default.mk index 6928cdb764..c3ca64ee35 100644 --- a/target/linux/bcm63xx/profiles/default.mk +++ b/target/linux/bcm63xx/profiles/default.mk @@ -4,7 +4,7 @@ define Profile/Default NAME:=Default Profile - PACKAGES:=kmod-b43 wpad-basic-wolfssl + PACKAGES:=kmod-b43 wpad-basic-openssl PRIORITY:=1 endef diff --git a/target/linux/bmips/image/Makefile b/target/linux/bmips/image/Makefile index 89cd04b0ec..6d2b4a27f4 100644 --- a/target/linux/bmips/image/Makefile +++ b/target/linux/bmips/image/Makefile @@ -249,8 +249,8 @@ define Device/Default DEVICE_LOADADDR := endef -ATH9K_PACKAGES := kmod-ath9k wpad-basic-wolfssl -B43_PACKAGES := kmod-b43 wpad-basic-wolfssl +ATH9K_PACKAGES := kmod-ath9k wpad-basic-openssl +B43_PACKAGES := kmod-b43 wpad-basic-openssl USB1_PACKAGES := kmod-usb-ohci kmod-ledtrig-usbdev USB2_PACKAGES := $(USB1_PACKAGES) kmod-usb2 diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile index f1cd2611d2..afb7ef339c 100644 --- a/target/linux/kirkwood/image/Makefile +++ b/target/linux/kirkwood/image/Makefile @@ -36,7 +36,7 @@ define Device/checkpoint_l-50 DEVICE_VENDOR := Check Point DEVICE_MODEL := L-50 DEVICE_PACKAGES := kmod-ath9k kmod-gpio-button-hotplug kmod-mvsdio \ - kmod-rtc-s35390a kmod-usb-ledtrig-usbport wpad-basic-wolfssl + kmod-rtc-s35390a kmod-usb-ledtrig-usbport wpad-basic-openssl IMAGES := sysupgrade.bin endef TARGET_DEVICES += checkpoint_l-50 @@ -105,7 +105,7 @@ TARGET_DEVICES += iom_ix2-200 define Device/linksys DEVICE_VENDOR := Linksys - DEVICE_PACKAGES := kmod-mwl8k wpad-basic-wolfssl kmod-gpio-button-hotplug + DEVICE_PACKAGES := kmod-mwl8k wpad-basic-openssl kmod-gpio-button-hotplug KERNEL_IN_UBI := UBINIZE_OPTS := -E 5 IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi diff --git a/target/linux/lantiq/image/ar9.mk b/target/linux/lantiq/image/ar9.mk index 6a0173c4b9..727325a4e9 100644 --- a/target/linux/lantiq/image/ar9.mk +++ b/target/linux/lantiq/image/ar9.mk @@ -4,7 +4,7 @@ define Device/avm_fritz7312 SOC := ar9 IMAGE_SIZE := 15744k LOADER_FLASH_OFFS := 0x31000 - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic \ + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-openssl \ kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ ltq-adsl-app ppp-mod-pppoa \ @@ -20,7 +20,7 @@ define Device/avm_fritz7320 SOC := ar9 IMAGE_SIZE := 15744k LOADER_FLASH_OFFS := 0x31000 - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic \ + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-openssl \ kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ ltq-adsl-app ppp-mod-pppoa \ @@ -41,7 +41,7 @@ define Device/bt_homehub-v3a kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \ ltq-adsl-app ppp-mod-pppoa \ - kmod-ath9k kmod-owl-loader wpad-basic \ + kmod-ath9k kmod-owl-loader wpad-basic-openssl \ uboot-envtools SUPPORTED_DEVICES += BTHOMEHUBV3A DEFAULT := n @@ -59,7 +59,7 @@ define Device/buffalo_wbmr-hp-g300h-a kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \ ltq-adsl-app ppp-mod-pppoa \ - kmod-ath9k kmod-owl-loader wpad-basic + kmod-ath9k kmod-owl-loader wpad-basic-openssl SUPPORTED_DEVICES := WBMR buffalo,wbmr-hp-g300h endef TARGET_DEVICES += buffalo_wbmr-hp-g300h-a @@ -75,7 +75,7 @@ define Device/buffalo_wbmr-hp-g300h-b kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ ltq-adsl-app ppp-mod-pppoa \ - kmod-ath9k kmod-owl-loader wpad-basic + kmod-ath9k kmod-owl-loader wpad-basic-openssl SUPPORTED_DEVICES := WBMR buffalo,wbmr-hp-g300h endef TARGET_DEVICES += buffalo_wbmr-hp-g300h-b @@ -105,7 +105,7 @@ define Device/netgear_dgn3500 dgn3500-sercom-footer $(DGN3500_KERNEL_OFFSET_HEX) "WW" | pad-rootfs | \ check-size 16320k | pad-to 16384k DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ath9k kmod-owl-loader wpad-basic \ + kmod-ath9k kmod-owl-loader wpad-basic-openssl \ kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \ ltq-adsl-app ppp-mod-pppoa @@ -127,7 +127,7 @@ define Device/netgear_dgn3500b dgn3500-sercom-footer $(DGN3500_KERNEL_OFFSET_HEX) "DE" | pad-rootfs | \ check-size 16320k | pad-to 16384k DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ath9k kmod-owl-loader wpad-basic \ + kmod-ath9k kmod-owl-loader wpad-basic-openssl \ kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ ltq-adsl-app ppp-mod-pppoa @@ -140,7 +140,7 @@ define Device/zte_h201l DEVICE_MODEL := H201L IMAGE_SIZE := 7808k SOC := ar9 - DEVICE_PACKAGES := kmod-ath9k-htc wpad-basic \ + DEVICE_PACKAGES := kmod-ath9k-htc wpad-basic-openssl \ kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ ltq-adsl-app ppp-mod-pppoe \ @@ -156,7 +156,7 @@ define Device/zyxel_p-2601hn DEVICE_VARIANT := F1/F3 IMAGE_SIZE := 15616k SOC := ar9 - DEVICE_PACKAGES := kmod-rt2800-usb wpad-basic \ + DEVICE_PACKAGES := kmod-rt2800-usb wpad-basic-openssl \ kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ ltq-adsl-app ppp-mod-pppoe \ diff --git a/target/linux/lantiq/image/danube.mk b/target/linux/lantiq/image/danube.mk index 2335f11d94..88d2b66f63 100644 --- a/target/linux/lantiq/image/danube.mk +++ b/target/linux/lantiq/image/danube.mk @@ -10,7 +10,7 @@ define Device/arcadyan_arv4510pw kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ ltq-adsl-app ppp-mod-pppoa \ kmod-ltq-tapi kmod-ltq-vmmc \ - kmod-rt2800-pci kmod-ath5k wpad-basic + kmod-rt2800-pci kmod-ath5k wpad-basic-openssl SUPPORTED_DEVICES += ARV4510PW endef TARGET_DEVICES += arcadyan_arv4510pw @@ -42,7 +42,7 @@ define Device/arcadyan_arv7506pw11 DEVICE_PACKAGES := kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ ltq-adsl-app ppp-mod-pppoa \ - kmod-rt2800-pci wpad-basic + kmod-rt2800-pci wpad-basic-openssl SUPPORTED_DEVICES += ARV7506PW11 endef TARGET_DEVICES += arcadyan_arv7506pw11 @@ -59,7 +59,7 @@ define Device/arcadyan_arv7510pw22 kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ ltq-adsl-app ppp-mod-pppoa \ kmod-ltq-tapi kmod-ltq-vmmc \ - kmod-rt2800-pci wpad-basic \ + kmod-rt2800-pci wpad-basic-openssl \ kmod-usb-uhci kmod-usb2 kmod-usb2-pci SUPPORTED_DEVICES += ARV7510PW22 endef @@ -76,7 +76,7 @@ define Device/arcadyan_arv7518pw kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ ltq-adsl-app ppp-mod-pppoa \ - kmod-ath9k kmod-owl-loader wpad-basic + kmod-ath9k kmod-owl-loader wpad-basic-openssl SUPPORTED_DEVICES += ARV7518PW endef TARGET_DEVICES += arcadyan_arv7518pw @@ -92,7 +92,7 @@ define Device/arcadyan_arv7519pw kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ ltq-adsl-app ppp-mod-pppoa \ - kmod-rt2800-pci wpad-basic + kmod-rt2800-pci wpad-basic-openssl SUPPORTED_DEVICES += ARV7519PW endef TARGET_DEVICES += arcadyan_arv7519pw @@ -105,7 +105,7 @@ define Device/arcadyan_arv7525pw DEVICE_ALT0_VARIANT := Typ A IMAGE_SIZE := 3776k SOC := danube - DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic \ + DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-openssl \ kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ ltq-adsl-app ppp-mod-pppoa -swconfig @@ -125,7 +125,7 @@ define Device/arcadyan_arv752dpw kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ ltq-adsl-app ppp-mod-pppoa \ kmod-ltq-tapi kmod-ltq-vmmc \ - kmod-rt2800-pci wpad-basic + kmod-rt2800-pci wpad-basic-openssl SUPPORTED_DEVICES += ARV752DPW endef TARGET_DEVICES += arcadyan_arv752dpw @@ -142,7 +142,7 @@ define Device/arcadyan_arv752dpw22 kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ ltq-adsl-app ppp-mod-pppoa \ kmod-ltq-tapi kmod-ltq-vmmc \ - kmod-rt2800-pci wpad-basic + kmod-rt2800-pci wpad-basic-openssl SUPPORTED_DEVICES += ARV752DPW22 endef TARGET_DEVICES += arcadyan_arv752dpw22 @@ -158,7 +158,7 @@ define Device/arcadyan_arv8539pw22 kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ ltq-adsl-app ppp-mod-pppoa \ - kmod-ath9k kmod-owl-loader wpad-basic + kmod-ath9k kmod-owl-loader wpad-basic-openssl SUPPORTED_DEVICES += ARV8539PW22 endef TARGET_DEVICES += arcadyan_arv8539pw22 @@ -174,7 +174,7 @@ define Device/audiocodes_mp-252 kmod-usb-ledtrig-usbport kmod-usb-dwc2 \ kmod-rt2800-pci \ ltq-adsl-app ppp-mod-pppoa \ - wpad-basic + wpad-basic-openssl SUPPORTED_DEVICES += ACMP252 endef TARGET_DEVICES += audiocodes_mp-252 @@ -191,7 +191,7 @@ define Device/bt_homehub-v2b kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ ltq-adsl-app ppp-mod-pppoa \ - kmod-ath9k kmod-owl-loader wpad-basic + kmod-ath9k kmod-owl-loader wpad-basic-openssl SUPPORTED_DEVICES += BTHOMEHUBV2B DEFAULT := n endef @@ -214,7 +214,7 @@ define Device/siemens_gigaset-sx76x kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ ltq-adsl-app ppp-mod-pppoe \ - kmod-ath5k wpad-basic + kmod-ath5k wpad-basic-openssl SUPPORTED_DEVICES += GIGASX76X endef TARGET_DEVICES += siemens_gigaset-sx76x diff --git a/target/linux/lantiq/image/tp-link.mk b/target/linux/lantiq/image/tp-link.mk index a7c510f382..7050977e98 100644 --- a/target/linux/lantiq/image/tp-link.mk +++ b/target/linux/lantiq/image/tp-link.mk @@ -26,7 +26,7 @@ define Device/tplink_tdw8970 TPLINK_HWID := 0x89700001 TPLINK_HWREV := 1 IMAGE_SIZE := 7680k - DEVICE_PACKAGES:= kmod-ath9k wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES:= kmod-ath9k wpad-basic-openssl kmod-usb-dwc2 kmod-usb-ledtrig-usbport SUPPORTED_DEVICES += TDW8970 DEFAULT := n endef @@ -41,7 +41,7 @@ define Device/tplink_tdw8980 TPLINK_HWID := 0x89800001 TPLINK_HWREV := 14 IMAGE_SIZE := 7680k - DEVICE_PACKAGES:= kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES:= kmod-ath9k kmod-owl-loader wpad-basic-openssl kmod-usb-dwc2 kmod-usb-ledtrig-usbport SUPPORTED_DEVICES += TDW8980 DEFAULT := n endef @@ -56,7 +56,7 @@ define Device/tplink_vr200 TPLINK_HWID := 0x63e64801 TPLINK_HWREV := 0x53 IMAGE_SIZE := 15808k - DEVICE_PACKAGES:= kmod-mt76x0e wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES:= kmod-mt76x0e wpad-basic-openssl kmod-usb-dwc2 kmod-usb-ledtrig-usbport SUPPORTED_DEVICES += VR200 endef TARGET_DEVICES += tplink_vr200 @@ -70,7 +70,7 @@ define Device/tplink_vr200v TPLINK_HWID := 0x73b70801 TPLINK_HWREV := 0x2f IMAGE_SIZE := 15808k - DEVICE_PACKAGES:= kmod-mt76x0e wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-ltq-tapi kmod-ltq-vmmc + DEVICE_PACKAGES:= kmod-mt76x0e wpad-basic-openssl kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-ltq-tapi kmod-ltq-vmmc SUPPORTED_DEVICES += VR200v endef TARGET_DEVICES += tplink_vr200v diff --git a/target/linux/lantiq/image/vr9.mk b/target/linux/lantiq/image/vr9.mk index 1e87a6e85f..7c114d830d 100644 --- a/target/linux/lantiq/image/vr9.mk +++ b/target/linux/lantiq/image/vr9.mk @@ -45,7 +45,7 @@ define Device/arcadyan_vgv7510kw22-brn SIGNATURE := BRNDA6431 MAGIC := 0x12345678 CRC32_POLY := 0x04c11db7 - DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc + DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-openssl kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc SUPPORTED_DEVICES += VGV7510KW22BRN endef TARGET_DEVICES += arcadyan_vgv7510kw22-brn @@ -58,7 +58,7 @@ define Device/arcadyan_vgv7510kw22-nor DEVICE_ALT0_MODEL := Box 6431 DEVICE_ALT0_VARIANT := NOR IMAGE_SIZE := 15232k - DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc + DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-openssl kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc SUPPORTED_DEVICES += VGV7510KW22NOR endef TARGET_DEVICES += arcadyan_vgv7510kw22-nor @@ -75,7 +75,7 @@ define Device/arcadyan_vgv7519-brn SIGNATURE := 5D00008000 MAGIC := 0x12345678 CRC32_POLY := 0x2083b8ed - DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc + DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-openssl kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc SUPPORTED_DEVICES += VGV7519BRN endef TARGET_DEVICES += arcadyan_vgv7519-brn @@ -88,7 +88,7 @@ define Device/arcadyan_vgv7519-nor DEVICE_ALT0_MODEL := Experiabox 8 DEVICE_ALT0_VARIANT := NOR IMAGE_SIZE := 15360k - DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc + DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-openssl kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc SUPPORTED_DEVICES += VGV7519NOR endef TARGET_DEVICES += arcadyan_vgv7519-nor @@ -103,7 +103,7 @@ define Device/avm_fritz3370 IMAGES += eva-kernel.bin eva-filesystem.bin IMAGE/eva-kernel.bin := append-kernel IMAGE/eva-filesystem.bin := append-ubi - DEVICE_PACKAGES := kmod-ath9k wpad-basic kmod-usb-dwc2 fritz-tffs + DEVICE_PACKAGES := kmod-ath9k wpad-basic-openssl kmod-usb-dwc2 fritz-tffs endef define Device/avm_fritz3370-rev2-hynix @@ -126,7 +126,7 @@ define Device/avm_fritz3390 DEVICE_MODEL := FRITZ!Box 3390 KERNEL_SIZE := 4096k IMAGE_SIZE := 49152k - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-wolfssl \ + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-openssl \ kmod-usb-dwc2 fritz-tffs endef TARGET_DEVICES += avm_fritz3390 @@ -135,7 +135,7 @@ define Device/avm_fritz7360sl $(Device/AVM) DEVICE_MODEL := FRITZ!Box 7360 SL IMAGE_SIZE := 15744k - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-openssl kmod-usb-dwc2 SUPPORTED_DEVICES += FRITZ7360SL endef TARGET_DEVICES += avm_fritz7360sl @@ -145,7 +145,7 @@ define Device/avm_fritz7360-v2 DEVICE_MODEL := FRITZ!Box 7360 DEVICE_VARIANT := v2 IMAGE_SIZE := 32128k - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-wolfssl kmod-usb-dwc2 + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-openssl kmod-usb-dwc2 endef TARGET_DEVICES += avm_fritz7360-v2 @@ -155,7 +155,7 @@ define Device/avm_fritz7362sl DEVICE_MODEL := FRITZ!Box 7362 SL KERNEL_SIZE := 4096k IMAGE_SIZE := 49152k - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 fritz-tffs + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-openssl kmod-usb-dwc2 fritz-tffs endef TARGET_DEVICES += avm_fritz7362sl @@ -166,7 +166,7 @@ define Device/avm_fritz7412 BOARD_NAME := FRITZ7412 KERNEL_SIZE := 4096k IMAGE_SIZE := 49152k - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic fritz-tffs-nand fritz-caldata + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-openssl fritz-tffs-nand fritz-caldata endef TARGET_DEVICES += avm_fritz7412 @@ -176,7 +176,7 @@ define Device/avm_fritz7430 DEVICE_MODEL := FRITZ!Box 7430 KERNEL_SIZE := 4096k IMAGE_SIZE := 49152k - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-wolfssl fritz-tffs-nand fritz-caldata + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-openssl fritz-tffs-nand fritz-caldata endef TARGET_DEVICES += avm_fritz7430 @@ -187,7 +187,7 @@ define Device/bt_homehub-v5a DEVICE_VARIANT := Type A BOARD_NAME := BTHOMEHUBV5A DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader \ - kmod-ath10k-ct ath10k-firmware-qca988x-ct wpad-basic kmod-usb-dwc2 + kmod-ath10k-ct ath10k-firmware-qca988x-ct wpad-basic-openssl kmod-usb-dwc2 SUPPORTED_DEVICES += BTHOMEHUBV5A endef TARGET_DEVICES += bt_homehub-v5a @@ -196,7 +196,7 @@ define Device/buffalo_wbmr-300hpd DEVICE_VENDOR := Buffalo DEVICE_MODEL := WBMR-300HPD IMAGE_SIZE := 15616k - DEVICE_PACKAGES := kmod-mt7603 wpad-basic kmod-usb-dwc2 + DEVICE_PACKAGES := kmod-mt7603 wpad-basic-openssl kmod-usb-dwc2 SUPPORTED_DEVICES += WBMR300 endef TARGET_DEVICES += buffalo_wbmr-300hpd @@ -207,7 +207,7 @@ define Device/lantiq_easy80920-nand DEVICE_MODEL := VR9 EASY80920 DEVICE_VARIANT := NAND IMAGE_SIZE := 64512k - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-openssl kmod-usb-dwc2 kmod-usb-ledtrig-usbport endef TARGET_DEVICES += lantiq_easy80920-nand @@ -216,7 +216,7 @@ define Device/lantiq_easy80920-nor DEVICE_MODEL := VR9 EASY80920 DEVICE_VARIANT := NOR IMAGE_SIZE := 7936k - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-openssl kmod-usb-dwc2 kmod-usb-ledtrig-usbport endef TARGET_DEVICES += lantiq_easy80920-nor @@ -241,7 +241,7 @@ define Device/zyxel_p-2812hnu-f1 DEVICE_MODEL := P-2812HNU DEVICE_VARIANT := F1 BOARD_NAME := P2812HNUF1 - DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-openssl kmod-usb-dwc2 kmod-usb-ledtrig-usbport KERNEL_SIZE := 3072k SUPPORTED_DEVICES += P2812HNUF1 endef @@ -253,7 +253,7 @@ define Device/zyxel_p-2812hnu-f3 DEVICE_MODEL := P-2812HNU DEVICE_VARIANT := F3 BOARD_NAME := P2812HNUF3 - DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 + DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-openssl kmod-usb-dwc2 KERNEL_SIZE := 2048k SUPPORTED_DEVICES += P2812HNUF3 DEFAULT := n diff --git a/target/linux/lantiq/image/xway_legacy.mk b/target/linux/lantiq/image/xway_legacy.mk index 52a29ab2f0..6475354fc9 100644 --- a/target/linux/lantiq/image/xway_legacy.mk +++ b/target/linux/lantiq/image/xway_legacy.mk @@ -6,7 +6,7 @@ define Device/arcadyan_arv4518pwr01 kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ ltq-adsl-app ppp-mod-pppoa \ - kmod-ath5k wpad-mini + kmod-ath5k wpad-basic-openssl SUPPORTED_DEVICES += ARV4518PWR01 endef TARGET_DEVICES += arcadyan_arv4518pwr01 @@ -19,7 +19,7 @@ define Device/arcadyan_arv4518pwr01a kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ ltq-adsl-app ppp-mod-pppoa \ - kmod-ath5k wpad-basic + kmod-ath5k wpad-basic-openssl-openssl-openssl SUPPORTED_DEVICES += ARV4518PWR01A endef TARGET_DEVICES += arcadyan_arv4518pwr01a @@ -36,7 +36,7 @@ define Device/arcadyan_arv4520pw kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ ltq-adsl-app ppp-mod-pppoa \ - kmod-rt61-pci wpad-mini + kmod-rt61-pci wpad-basic-openssl SUPPORTED_DEVICES += ARV4520PW endef TARGET_DEVICES += arcadyan_arv4520pw @@ -48,7 +48,7 @@ define Device/arcadyan_arv4525pw DEVICE_ALT0_MODEL := Speedport W502V DEVICE_ALT0_VARIANT := Typ A IMAGE_SIZE := 3776k - DEVICE_PACKAGES := kmod-ath5k wpad-mini \ + DEVICE_PACKAGES := kmod-ath5k wpad-basic-openssl \ kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ ltq-adsl-app ppp-mod-pppoa -swconfig @@ -63,7 +63,7 @@ define Device/arcadyan_arv452cqw DEVICE_ALT0_MODEL := Easybox 801 IMAGE_SIZE := 3776k DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ath5k wpad-mini \ + kmod-ath5k wpad-basic-openssl \ kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ ltq-adsl-app ppp-mod-pppoa diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile index d14838319c..d741cfae9c 100644 --- a/target/linux/malta/Makefile +++ b/target/linux/malta/Makefile @@ -16,6 +16,6 @@ KERNEL_TESTING_PATCHVER:=5.10 include $(INCLUDE_DIR)/target.mk -DEFAULT_PACKAGES += wpad-basic kmod-mac80211-hwsim kmod-pcnet32 mkf2fs e2fsprogs +DEFAULT_PACKAGES += wpad-basic-openssl kmod-mac80211-hwsim kmod-pcnet32 mkf2fs e2fsprogs $(eval $(call BuildTarget)) diff --git a/target/linux/mediatek/mt7622/target.mk b/target/linux/mediatek/mt7622/target.mk index 92c3f47370..30eba59e5f 100644 --- a/target/linux/mediatek/mt7622/target.mk +++ b/target/linux/mediatek/mt7622/target.mk @@ -2,7 +2,7 @@ ARCH:=aarch64 SUBTARGET:=mt7622 BOARDNAME:=MT7622 CPU_TYPE:=cortex-a53 -DEFAULT_PACKAGES += kmod-mt7615e kmod-mt7615-firmware wpad-basic-wolfssl uboot-envtools +DEFAULT_PACKAGES += kmod-mt7615e kmod-mt7615-firmware wpad-basic-openssl uboot-envtools KERNELNAME:=Image dtbs define Target/Description diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile index e9370a17d2..b5d154901c 100644 --- a/target/linux/mpc85xx/Makefile +++ b/target/linux/mpc85xx/Makefile @@ -21,6 +21,6 @@ include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += \ kmod-input-core kmod-input-gpio-keys kmod-button-hotplug \ - kmod-leds-gpio swconfig kmod-ath9k wpad-basic kmod-usb2 + kmod-leds-gpio swconfig kmod-ath9k wpad-basic-openssl kmod-usb2 $(eval $(call BuildTarget)) diff --git a/target/linux/mvebu/image/cortexa9.mk b/target/linux/mvebu/image/cortexa9.mk index ab469772c2..4f66a462b4 100644 --- a/target/linux/mvebu/image/cortexa9.mk +++ b/target/linux/mvebu/image/cortexa9.mk @@ -29,7 +29,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 \ + wpad-basic-openssl kmod-ath9k kmod-ath10k-ct ath10k-firmware-qca988x-ct \ partx-utils kmod-i2c-mux-pca954x IMAGES := $$(DEVICE_IMG_PREFIX)-sysupgrade.img.gz omnia-medkit-$$(DEVICE_IMG_PREFIX)-initramfs.tar.gz IMAGE/$$(DEVICE_IMG_PREFIX)-sysupgrade.img.gz := boot-scr | boot-img | sdcard-img | gzip | append-metadata @@ -66,7 +66,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 wpad-basic-openssl IMAGES += factory.img IMAGE/factory.img := append-kernel | pad-to $$$$(KERNEL_SIZE) | \ append-ubi | pad-to $$$$(PAGESIZE) diff --git a/target/linux/omap/profiles/00-default.mk b/target/linux/omap/profiles/00-default.mk index 4a326d095e..477b523da5 100644 --- a/target/linux/omap/profiles/00-default.mk +++ b/target/linux/omap/profiles/00-default.mk @@ -9,7 +9,7 @@ define Profile/Default kmod-usb-net-asix kmod-usb-net-asix-ax88179 kmod-usb-net-hso \ kmod-usb-net-kaweth kmod-usb-net-pegasus kmod-usb-net-mcs7830 \ kmod-usb-net-smsc95xx kmod-usb-net-dm9601-ether \ - wpad-basic + wpad-basic-openssl PRIORITY := 1 endef diff --git a/target/linux/oxnas/image/ox820.mk b/target/linux/oxnas/image/ox820.mk index 24bbd8e922..707d44216d 100644 --- a/target/linux/oxnas/image/ox820.mk +++ b/target/linux/oxnas/image/ox820.mk @@ -50,7 +50,7 @@ define Device/cloudengines_pogoplugpro DEVICE_MODEL := PogoPlug Pro (with mPCIe) SUPPORTED_DEVICES += pogoplug-pro DEVICE_PACKAGES := kmod-usb2-oxnas kmod-usb-ledtrig-usbport \ - kmod-ata-oxnas-sata kmod-rt2800-pci wpad-basic + kmod-ata-oxnas-sata kmod-rt2800-pci wpad-basic-openssl endef TARGET_DEVICES += cloudengines_pogoplugpro diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 0b47e3f5f8..b7e04e60fc 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -444,7 +444,7 @@ define Device/dual-q_h721 IMAGE_SIZE := 16064k DEVICE_VENDOR := Dual-Q DEVICE_MODEL := H721 - DEVICE_PACKAGES := kmod-ata-ahci kmod-sdhci-mt7620 kmod-usb3 -wpad-basic-wolfssl + DEVICE_PACKAGES := kmod-ata-ahci kmod-sdhci-mt7620 kmod-usb3 -wpad-basic-openssl endef TARGET_DEVICES += dual-q_h721 diff --git a/target/linux/ramips/rt288x/target.mk b/target/linux/ramips/rt288x/target.mk index 814ac97e89..63ca4b3413 100644 --- a/target/linux/ramips/rt288x/target.mk +++ b/target/linux/ramips/rt288x/target.mk @@ -7,7 +7,7 @@ BOARDNAME:=RT288x based boards FEATURES+=small_flash CPU_TYPE:=24kc -DEFAULT_PACKAGES += kmod-rt2800-soc wpad-basic-wolfssl swconfig +DEFAULT_PACKAGES += kmod-rt2800-soc wpad-basic-openssl swconfig define Target/Description Build firmware images for Ralink RT288x based boards. diff --git a/target/linux/ramips/rt305x/target.mk b/target/linux/ramips/rt305x/target.mk index 27ad670ca4..64283d4a01 100644 --- a/target/linux/ramips/rt305x/target.mk +++ b/target/linux/ramips/rt305x/target.mk @@ -7,7 +7,7 @@ BOARDNAME:=RT3x5x/RT5350 based boards FEATURES+=usb ramdisk small_flash CPU_TYPE:=24kc -DEFAULT_PACKAGES += kmod-rt2800-soc wpad-basic-wolfssl swconfig +DEFAULT_PACKAGES += kmod-rt2800-soc wpad-basic-openssl swconfig define Target/Description Build firmware images for Ralink RT3x5x/RT5350 based boards. diff --git a/target/linux/ramips/rt3883/target.mk b/target/linux/ramips/rt3883/target.mk index ff878a0a59..cffed084c6 100644 --- a/target/linux/ramips/rt3883/target.mk +++ b/target/linux/ramips/rt3883/target.mk @@ -7,7 +7,7 @@ BOARDNAME:=RT3662/RT3883 based boards FEATURES+=usb pci small_flash CPU_TYPE:=74kc -DEFAULT_PACKAGES += kmod-rt2800-pci kmod-rt2800-soc wpad-basic-wolfssl swconfig +DEFAULT_PACKAGES += kmod-rt2800-pci kmod-rt2800-soc wpad-basic-openssl swconfig define Target/Description Build firmware images for Ralink RT3662/RT3883 based boards. diff --git a/target/linux/sunxi/image/cortexa53.mk b/target/linux/sunxi/image/cortexa53.mk index 2a2c922682..d2932e6b7f 100644 --- a/target/linux/sunxi/image/cortexa53.mk +++ b/target/linux/sunxi/image/cortexa53.mk @@ -44,7 +44,7 @@ define Device/friendlyarm_nanopi-r1s-h5 DEVICE_VENDOR := FriendlyARM DEVICE_MODEL := Nanopi R1S H5 DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-rtl8189es \ - kmod-usb2 kmod-usb-net-rtl8152 wpad-basic + kmod-usb2 kmod-usb-net-rtl8152 wpad-basic-openssl SUPPORTED_DEVICES:=nanopi-r1s-h5 $(Device/sun50i-h5) endef diff --git a/target/linux/sunxi/image/cortexa7.mk b/target/linux/sunxi/image/cortexa7.mk index 28e5117b13..8afbc20f8f 100644 --- a/target/linux/sunxi/image/cortexa7.mk +++ b/target/linux/sunxi/image/cortexa7.mk @@ -23,7 +23,7 @@ define Device/friendlyarm_nanopi-m1-plus DEVICE_VENDOR := FriendlyARM DEVICE_MODEL := NanoPi M1 Plus DEVICE_PACKAGES:= kmod-leds-gpio kmod-brcmfmac \ - cypress-firmware-43430-sdio wpad-basic-wolfssl + cypress-firmware-43430-sdio wpad-basic-openssl SOC := sun8i-h3 endef TARGET_DEVICES += friendlyarm_nanopi-m1-plus @@ -39,7 +39,7 @@ define Device/friendlyarm_nanopi-neo-air DEVICE_VENDOR := FriendlyARM DEVICE_MODEL := NanoPi NEO Air DEVICE_PACKAGES := kmod-leds-gpio kmod-brcmfmac \ - brcmfmac-firmware-43430a0-sdio wpad-basic-wolfssl + brcmfmac-firmware-43430a0-sdio wpad-basic-openssl SOC := sun8i-h3 endef TARGET_DEVICES += friendlyarm_nanopi-neo-air @@ -48,7 +48,7 @@ define Device/friendlyarm_nanopi-r1 DEVICE_VENDOR := FriendlyARM DEVICE_MODEL := NanoPi R1 DEVICE_PACKAGES := kmod-usb-net-rtl8152 kmod-leds-gpio \ - kmod-brcmfmac cypress-firmware-43430-sdio wpad-basic-wolfssl + kmod-brcmfmac cypress-firmware-43430-sdio wpad-basic-openssl SOC := sun8i-h3 endef TARGET_DEVICES += friendlyarm_nanopi-r1 @@ -65,7 +65,7 @@ define Device/lamobo_lamobo-r1 DEVICE_MODEL := Lamobo R1 DEVICE_ALT0_VENDOR := Bananapi DEVICE_ALT0_MODEL := BPi-R1 - DEVICE_PACKAGES := kmod-ata-sunxi kmod-rtl8192cu wpad-basic-wolfssl + DEVICE_PACKAGES := kmod-ata-sunxi kmod-rtl8192cu wpad-basic-openssl SOC := sun7i-a20 endef TARGET_DEVICES += lamobo_lamobo-r1 @@ -82,7 +82,7 @@ define Device/sinovoip_bananapi-m2-berry DEVICE_VENDOR := Sinovoip DEVICE_MODEL := Banana Pi M2 Berry DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-ata-sunxi kmod-brcmfmac \ - cypress-firmware-43430-sdio wpad-basic-wolfssl + cypress-firmware-43430-sdio wpad-basic-openssl SUPPORTED_DEVICES:=lemaker,bananapi-m2-berry SOC := sun8i-v40 endef @@ -92,7 +92,7 @@ define Device/sinovoip_bananapi-m2-ultra DEVICE_VENDOR := Sinovoip DEVICE_MODEL := Banana Pi M2 Ultra DEVICE_PACKAGES:=kmod-ata-sunxi kmod-brcmfmac \ - brcmfmac-firmware-43430a0-sdio wpad-basic-wolfssl + brcmfmac-firmware-43430a0-sdio wpad-basic-openssl SUPPORTED_DEVICES:=lemaker,bananapi-m2-ultra SOC := sun8i-r40 endef @@ -168,7 +168,7 @@ define Device/sinovoip_bananapi-m2-plus DEVICE_VENDOR := Sinovoip DEVICE_MODEL := Banana Pi M2+ DEVICE_PACKAGES:=kmod-leds-gpio kmod-brcmfmac \ - brcmfmac-firmware-43430a0-sdio wpad-basic-wolfssl + brcmfmac-firmware-43430a0-sdio wpad-basic-openssl SOC := sun8i-h3 endef TARGET_DEVICES += sinovoip_bananapi-m2-plus diff --git a/target/linux/sunxi/profiles/00-default.mk b/target/linux/sunxi/profiles/00-default.mk index 0541087a48..762b7f7852 100644 --- a/target/linux/sunxi/profiles/00-default.mk +++ b/target/linux/sunxi/profiles/00-default.mk @@ -13,7 +13,7 @@ define Profile/Default kmod-sun4i-emac \ rtl8188eu-firmware \ swconfig \ - wpad-basic-wolfssl + wpad-basic-openssl PRIORITY := 1 endef diff --git a/target/linux/tegra/image/Makefile b/target/linux/tegra/image/Makefile index 58c2fe74f8..a45992e5f3 100644 --- a/target/linux/tegra/image/Makefile +++ b/target/linux/tegra/image/Makefile @@ -43,7 +43,7 @@ define Device/compulab_trimslice DEVICE_MODEL := TrimSlice DEVICE_DTS := tegra20-trimslice DEVICE_PACKAGES := kmod-r8169 kmod-rt2800-usb kmod-rtc-em3027 \ - kmod-usb-storage wpad-basic-wolfssl + kmod-usb-storage wpad-basic-openssl UBOOT := trimslice-mmc endef TARGET_DEVICES += compulab_trimslice diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile index 714e639bef..9a18562c7b 100644 --- a/target/linux/uml/Makefile +++ b/target/linux/uml/Makefile @@ -18,7 +18,7 @@ KERNEL_TESTING_PATCHVER:=5.10 include $(INCLUDE_DIR)/target.mk -DEFAULT_PACKAGES += wpad-basic-wolfssl kmod-mac80211-hwsim mkf2fs e2fsprogs +DEFAULT_PACKAGES += wpad-basic-openssl kmod-mac80211-hwsim mkf2fs e2fsprogs endif endif diff --git a/target/linux/x86/geode/target.mk b/target/linux/x86/geode/target.mk index f1d7b9fe14..a64d2baaee 100644 --- a/target/linux/x86/geode/target.mk +++ b/target/linux/x86/geode/target.mk @@ -1,16 +1,5 @@ BOARDNAME:=AMD Geode based systems -FEATURES:=squashfs ext4 pci usb gpio -DEFAULT_PACKAGES += \ - kmod-crypto-hw-geode kmod-crypto-cbc \ - kmod-ath5k kmod-ath9k \ - kmod-button-hotplug \ - kmod-ledtrig-heartbeat kmod-ledtrig-gpio \ - kmod-ledtrig-netdev hwclock wpad-basic -# Geos -DEFAULT_PACKAGES += \ - soloscli linux-atm br2684ctl ppp-mod-pppoa pppdump pppstats \ - hwclock flashrom tc kmod-pppoa kmod-8139cp kmod-mppe \ - kmod-usb-ohci-pci kmod-hwmon-lm90 +FEATURES += pci usb gpio define Target/Description Build firmware images for AMD Geode GX/LX based systems (net5501, alix, geos)