From c80c82d0a8f734d70e10f7dd5556075d58b8532f Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 2 Nov 2021 18:08:47 +0100 Subject: [PATCH 01/22] include/cmake.mk: add support for overriding the host install prefix Signed-off-by: Felix Fietkau (cherry picked from commit a6a9f9be278e718f3f8a5cb7640dd8035cc802b9) --- include/cmake.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 \ From abd656dfc047ecea24a600fd6a605d444ffe5a7f Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sat, 21 May 2022 17:44:46 +0800 Subject: [PATCH 02/22] x86/geode: fix target file Signed-off-by: Tianling Shen --- target/linux/x86/geode/target.mk | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) 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) From 015985f0c343b5ba527038826a2cd76122d5f7a4 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Mon, 23 May 2022 14:34:17 +0800 Subject: [PATCH 03/22] ucode: remove Signed-off-by: Tianling Shen --- package/utils/ucode/Makefile | 196 ----------------------------------- 1 file changed, 196 deletions(-) delete mode 100644 package/utils/ucode/Makefile diff --git a/package/utils/ucode/Makefile b/package/utils/ucode/Makefile deleted file mode 100644 index 2c11fe05be..0000000000 --- a/package/utils/ucode/Makefile +++ /dev/null @@ -1,196 +0,0 @@ -# -# Copyright (C) 2020-2021 Jo-Philipp Wich -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=ucode -PKG_RELEASE:=1 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL=https://github.com/jow-/ucode.git -PKG_SOURCE_DATE:=2021-10-25 -PKG_SOURCE_VERSION:=a7976c2802a9da737f62bec496c7115211c442a7 -PKG_MIRROR_HASH:=6bc3ddeef41d68fd96894957356472e576c625fcf7277cbb36aa464b8d3c274d -PKG_MAINTAINER:=Jo-Philipp Wich -PKG_LICENSE:=ISC - -PKG_ABI_VERSION:=20210730 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -CMAKE_OPTIONS += -DSOVERSION=$(PKG_ABI_VERSION) - -define Package/ucode/default - SECTION:=utils - CATEGORY:=Utilities - TITLE:=ucode - Tiny scripting and templating language -endef - -define Package/ucode - $(Package/ucode/default) - DEPENDS:=+libucode -endef - -define Package/ucode/description - ucode is a tiny script interpreter featuring an ECMAScript oriented - script language and Jinja-inspired templating. -endef - - -define Package/libucode - $(Package/ucode/default) - TITLE+= - runtime library - ABI_VERSION:=$(PKG_ABI_VERSION) - DEPENDS:=+libjson-c -endef - -define Package/libucode/description - The libucode package provides the shared runtime library for the ucode interpreter. -endef - - -define Package/ucode-mod-fs - $(Package/ucode/default) - TITLE+= (filesystem module) - DEPENDS:=ucode -endef - -define Package/ucode-mod-fs/description - The filesystem plugin module allows interaction with the local file system. -endef - - -define Package/ucode-mod-math - $(Package/ucode/default) - TITLE+= (math module) - DEPENDS:=ucode -endef - -define Package/ucode-mod-math/description - The math plugin provides access to various procedures. -endef - - -define Package/ucode-mod-nl80211 - $(Package/ucode/default) - TITLE+= (nl80211 module) - DEPENDS:=ucode +libnl-tiny -endef - -define Package/ucode-mod-nl80211/description - The nl80211 plugin provides access to the Linux wireless 802.11 netlink API. -endef - - -define Package/ucode-mod-resolv - $(Package/ucode/default) - TITLE+= (resolv module) - DEPENDS:=ucode -endef - -define Package/ucode-mod-resolv/description - The resolv plugin implements simple DNS resolving. -endef - - -define Package/ucode-mod-rtnl - $(Package/ucode/default) - TITLE+= (rtnl module) - DEPENDS:=ucode +libnl-tiny -endef - -define Package/ucode-mod-rtnl/description - The rtnl plugin provides access to the Linux routing netlink API. -endef - - -define Package/ucode-mod-ubus - $(Package/ucode/default) - TITLE+= (ubus module) - DEPENDS:=ucode +libubus +libblobmsg-json -endef - -define Package/ucode-mod-ubus/description - The ubus module allows ucode template scripts to enumerate and invoke ubus - procedures. -endef - - -define Package/ucode-mod-uci - $(Package/ucode/default) - TITLE+= (uci module) - DEPENDS:=ucode +libuci -endef - -define Package/ucode-mod-uci/description - The uci module allows templates to read and modify uci configuration. -endef - - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/lib $(1)/usr/include/ucode - $(CP) $(PKG_INSTALL_DIR)/usr/include/ucode/*.h $(1)/usr/include/ucode/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libucode.so* $(1)/usr/lib/ -endef - - -define Package/ucode/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ucode $(1)/usr/bin/ucode -endef - -define Package/libucode/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libucode.so.* $(1)/usr/lib/ -endef - -define Package/ucode-mod-fs/install - $(INSTALL_DIR) $(1)/usr/lib/ucode - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ucode/fs.so $(1)/usr/lib/ucode/ -endef - -define Package/ucode-mod-math/install - $(INSTALL_DIR) $(1)/usr/lib/ucode - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ucode/math.so $(1)/usr/lib/ucode/ -endef - -define Package/ucode-mod-nl80211/install - $(INSTALL_DIR) $(1)/usr/lib/ucode - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ucode/nl80211.so $(1)/usr/lib/ucode/ -endef - -define Package/ucode-mod-resolv/install - $(INSTALL_DIR) $(1)/usr/lib/ucode - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ucode/resolv.so $(1)/usr/lib/ucode/ -endef - -define Package/ucode-mod-rtnl/install - $(INSTALL_DIR) $(1)/usr/lib/ucode - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ucode/rtnl.so $(1)/usr/lib/ucode/ -endef - -define Package/ucode-mod-ubus/install - $(INSTALL_DIR) $(1)/usr/lib/ucode - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ucode/ubus.so $(1)/usr/lib/ucode/ -endef - -define Package/ucode-mod-uci/install - $(INSTALL_DIR) $(1)/usr/lib/ucode - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ucode/uci.so $(1)/usr/lib/ucode/ -endef - - -$(eval $(call BuildPackage,ucode)) -$(eval $(call BuildPackage,libucode)) -$(eval $(call BuildPackage,ucode-mod-fs)) -$(eval $(call BuildPackage,ucode-mod-math)) -$(eval $(call BuildPackage,ucode-mod-nl80211)) -$(eval $(call BuildPackage,ucode-mod-resolv)) -$(eval $(call BuildPackage,ucode-mod-rtnl)) -$(eval $(call BuildPackage,ucode-mod-ubus)) -$(eval $(call BuildPackage,ucode-mod-uci)) From 18300e0e471061a1fb986fdd564089a0ad8bd33d Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Mon, 23 May 2022 14:35:34 +0800 Subject: [PATCH 04/22] firewall4: remove Signed-off-by: Tianling Shen --- package/network/config/firewall4/Makefile | 45 ----------------------- 1 file changed, 45 deletions(-) delete mode 100644 package/network/config/firewall4/Makefile diff --git a/package/network/config/firewall4/Makefile b/package/network/config/firewall4/Makefile deleted file mode 100644 index a4f63a91ee..0000000000 --- a/package/network/config/firewall4/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# -# Copyright (C) 2021 Jo-Philipp Wich -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=firewall4 -PKG_RELEASE:=$(AUTORELEASE) - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL=$(PROJECT_GIT)/project/firewall4.git -PKG_SOURCE_DATE:=2021-10-25 -PKG_SOURCE_VERSION:=eb0a3ee812d48f1faecbf6258c293e475b4016a0 -PKG_MIRROR_HASH:=46b5bdea13a285dbd1b3432fe8cfd8cb98a2797b86b176d7762e0987ec2f230c -PKG_MAINTAINER:=Jo-Philipp Wich -PKG_LICENSE:=ISC - -include $(INCLUDE_DIR)/package.mk - -define Package/firewall4 - SECTION:=net - CATEGORY:=Base system - TITLE:=OpenWrt 4th gen firewall - DEPENDS:=+ucode +ucode-mod-fs +ucode-mod-uci +ucode-mod-ubus +kmod-nft-core +kmod-nft-fib +kmod-nft-nat +kmod-nft-nat6 +nftables-json - CONFLICTS:=firewall kmod-ipt-nat -endef - -define Package/firewall4/description - This package provides an nftables-based implementation of the UCI firewall - sharing the same configuration format. -endef - -define Package/firewall4/conffiles -/etc/config/firewall -/etc/nftables.d/ -endef - -define Package/firewall4/install - $(CP) -a $(PKG_BUILD_DIR)/root/* $(1)/ -endef - -define Build/Compile -endef - -$(eval $(call BuildPackage,firewall4)) From 52388e379f7603fcf963b77e74e092d4da40d7f7 Mon Sep 17 00:00:00 2001 From: ZiMing Mo Date: Wed, 25 May 2022 16:13:40 +0800 Subject: [PATCH 05/22] firewall3: fix locking issue (cherry picked from commit c7a557861a7f6cb22d1a17dc01e8240c246b1f04) --- .../001-firewall3-fix-locking-issue.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/network/config/firewall/patches/001-firewall3-fix-locking-issue.patch 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 From d6f9dd7fa9ac8cc48c3b4a35a8bcaa1d5449dbaf Mon Sep 17 00:00:00 2001 From: Tiago Gaspar Date: Wed, 4 May 2022 10:36:07 +0100 Subject: [PATCH 06/22] firewall: config: remove restictions on DHCPv6 allow rule Remove restrictions on source and destination addresses, which aren't specified on RFC8415, and for some reason in openwrt are configured to allow both link-local and ULA addresses. As cleared out in issue #5066 there are some ISPs that use Gloabal Unicast addresses, so fix this rule to allow them. Fixes: #5066 Signed-off-by: Tiago Gaspar [rebase onto firewall3, clarify subject, bump PKG_RELEASE] Signed-off-by: Jo-Philipp Wich (cherry picked from commit 65258f5d6093809c541050256646795bc0a460a9) --- package/network/config/firewall/Makefile | 2 +- package/network/config/firewall/files/firewall.config | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) 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 From 31c660335c0d626ac5ce37c8a0ec82bf80c10932 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Wed, 19 Jan 2022 18:10:05 +0100 Subject: [PATCH 07/22] util-linux: Add taskset This adds the taskset application from util Linux. It is already built, but not packaged yet. Signed-off-by: Hauke Mehrtens (cherry picked from commit 6ae657e459c8c62f4f844a17098d6cc75b81c91b) --- package/utils/util-linux/Makefile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile index a6e1dce5aa..93b7c25072 100644 --- a/package/utils/util-linux/Makefile +++ b/package/utils/util-linux/Makefile @@ -439,6 +439,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 @@ -777,6 +786,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/ @@ -845,6 +859,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)) From c1ba87f706018c223869c2c3bcd9732cf2aa58c7 Mon Sep 17 00:00:00 2001 From: Roman Azarenko Date: Tue, 25 Jan 2022 18:16:30 +0100 Subject: [PATCH 08/22] util-linux: add lslocks This change adds the "lslocks" utility from util-linux. Signed-off-by: Roman Azarenko (cherry picked from commit 5bd926efa99a0638e03e26ed50f1c44b196888da) --- package/utils/util-linux/Makefile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile index 93b7c25072..edf90b466f 100644 --- a/package/utils/util-linux/Makefile +++ b/package/utils/util-linux/Makefile @@ -313,6 +313,16 @@ 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/more $(call Package/util-linux/Default) TITLE:=filter for paging through text one screenful at a time @@ -720,6 +730,11 @@ 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/more/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/more $(1)/usr/bin/ @@ -847,6 +862,7 @@ $(eval $(call BuildPackage,look)) $(eval $(call BuildPackage,losetup)) $(eval $(call BuildPackage,lsblk)) $(eval $(call BuildPackage,lscpu)) +$(eval $(call BuildPackage,lslocks)) $(eval $(call BuildPackage,more)) $(eval $(call BuildPackage,mcookie)) $(eval $(call BuildPackage,mount-utils)) From 42f500ac351da6ef599fcb910ef8661ce0c515c3 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Fri, 27 Mar 2020 12:40:33 +0200 Subject: [PATCH 09/22] util-linux: package ipcs command Add a package for util-linux' ipcs command, to show information about System V inter-process communication facilities. Signed-off-by: Stijn Tintel (cherry picked from commit 2c929f8105237d3ebd645ea4e3387585c139b6ab) --- package/utils/util-linux/Makefile | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile index edf90b466f..7dc2fa9080 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 @@ -705,6 +717,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 @@ -857,6 +874,7 @@ $(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)) From 70185ee7b5ac306244488874c14cecc3f6403bdc Mon Sep 17 00:00:00 2001 From: Oskari Rauta Date: Thu, 3 Mar 2022 04:57:08 +0200 Subject: [PATCH 10/22] util-linux: add lsns lsns lists system namespaces Signed-off-by: Oskari Rauta (cherry picked from commit ef4bf8b403205062ddb38ebe7b8c4951be346368) --- package/utils/util-linux/Makefile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile index 7dc2fa9080..706c3194b1 100644 --- a/package/utils/util-linux/Makefile +++ b/package/utils/util-linux/Makefile @@ -335,6 +335,16 @@ 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 @@ -752,6 +762,11 @@ define Package/lslocks/install $(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/ @@ -881,6 +896,7 @@ $(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)) From 206ad7b6a72cdc001efc36b3dcc69bccf4679cf4 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 26 May 2022 17:24:32 +0800 Subject: [PATCH 11/22] Revert "util-linux: use meson to build" util-linux 2.37 doesn't support meson yet. This reverts commit eab60d315feca87f453fc6c63fde169ea803c897. Signed-off-by: Tianling Shen --- package/utils/util-linux/Makefile | 117 ++++++++---------- .../util-linux/patches/010-meson-typo.patch | 20 --- ...eson-fix-compilation-without-systemd.patch | 22 ---- .../patches/030-meson-don-t-use-run.patch | 34 ----- .../040-meson-fix-cpu_set_t-test.patch | 23 ---- .../050-meson-fix-environ-search.patch | 23 ---- ...son-add-_GNU_SOURCE-for-sighandler_t.patch | 23 ---- .../patches/070-meson-fix-isnan-check.patch | 24 ---- .../patches/080-meson-fix-tzname-check.patch | 23 ---- .../util-linux/patches/090-meson-libpam.patch | 18 --- ...-make-libcap-ng-dependent-on-setpriv.patch | 31 ----- ...se-urandom.patch => 100-use_urandom.patch} | 0 ...n-fix-when-HAVE_CLOCK_GETTIME-is-set.patch | 21 ---- ...oject-version-from-the-version-gen-s.patch | 20 --- ...r-in-processing-version-for-pc-files.patch | 26 ---- .../util-linux/patches/200-meson-no-po.patch | 10 -- 16 files changed, 51 insertions(+), 384 deletions(-) delete mode 100644 package/utils/util-linux/patches/010-meson-typo.patch delete mode 100644 package/utils/util-linux/patches/020-meson-fix-compilation-without-systemd.patch delete mode 100644 package/utils/util-linux/patches/030-meson-don-t-use-run.patch delete mode 100644 package/utils/util-linux/patches/040-meson-fix-cpu_set_t-test.patch delete mode 100644 package/utils/util-linux/patches/050-meson-fix-environ-search.patch delete mode 100644 package/utils/util-linux/patches/060-meson-add-_GNU_SOURCE-for-sighandler_t.patch delete mode 100644 package/utils/util-linux/patches/070-meson-fix-isnan-check.patch delete mode 100644 package/utils/util-linux/patches/080-meson-fix-tzname-check.patch delete mode 100644 package/utils/util-linux/patches/090-meson-libpam.patch delete mode 100644 package/utils/util-linux/patches/100-meson-make-libcap-ng-dependent-on-setpriv.patch rename package/utils/util-linux/patches/{210-use-urandom.patch => 100-use_urandom.patch} (100%) delete mode 100644 package/utils/util-linux/patches/110-meson-fix-when-HAVE_CLOCK_GETTIME-is-set.patch delete mode 100644 package/utils/util-linux/patches/120-meson-get-the-project-version-from-the-version-gen-s.patch delete mode 100644 package/utils/util-linux/patches/130-meson-fix-error-in-processing-version-for-pc-files.patch delete mode 100644 package/utils/util-linux/patches/200-meson-no-po.patch diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile index 706c3194b1..a93c9f6fdc 100644 --- a/package/utils/util-linux/Makefile +++ b/package/utils/util-linux/Makefile @@ -25,10 +25,14 @@ PKG_LICENSE_FILES:= COPYING \ libuuid/COPYING \ Documentation/licenses/COPYING.BSD-3 +PKG_BUILD_PARALLEL:=1 + +PKG_FIXUP:=autoreconf PKG_INSTALL:=1 +DISABLE_NLS:=--disable-nls + include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/meson.mk define Package/util-linux/Default SECTION:=utils @@ -548,69 +552,44 @@ define Package/wipefs/description libblkid. endef -MESON_ARGS += \ - -Dsystemd=disabled \ - -Dtinfo=disabled \ - -Dcryptsetup=disabled \ - -Dlibutil=disabled \ - -Dlibutempter=disabled \ - -Dlibpcre2-posix=disabled \ - -Dlibuser=disabled \ - -Duse-tty-group=false \ - -Duse-tls=false \ - -Dbuild-python=disabled \ - -Dbuild-zramctl=disabled \ - -Dbuild-fsck=disabled \ - -Dbuild-wipefs=disabled \ - -Dbuild-fallocate=disabled \ - -Dbuild-setpriv=disabled \ - -Dbuild-hardlink=disabled \ - -Dbuild-cramfs=disabled \ - -Dbuild-bfs=disabled \ - -Dbuild-minix=disabled \ - -Dbuild-fdformat=disabled \ - -Dbuild-lslogins=disabled \ - -Dbuild-wdctl=disabled \ - -Dbuild-cal=disabled \ - -Dbuild-switch_root=disabled \ - -Dbuild-pivot_root=disabled \ - -Dbuild-lsmem=disabled \ - -Dbuild-lsirq=disabled \ - -Dbuild-irqtop=disabled \ - -Dbuild-chmem=disabled \ - -Dbuild-ipcrm=disabled \ - -Dbuild-rfkill=disabled \ - -Dbuild-tunelp=disabled \ - -Dbuild-kill=disabled \ - -Dbuild-last=disabled \ - -Dbuild-utmpdump=disabled \ - -Dbuild-line=disabled \ - -Dbuild-mesg=disabled \ - -Dbuild-raw=disabled \ - -Dbuild-vipw=disabled \ - -Dbuild-newgrp=disabled \ - -Dbuild-chfn-chsh=disabled \ - -Dbuild-login=disabled \ - -Dbuild-nologin=disabled \ - -Dbuild-sulogin=disabled \ - -Dbuild-su=disabled \ - -Dbuild-runuser=disabled \ - -Dbuild-ul=disabled \ - -Dbuild-pg=disabled \ - -Dbuild-write=disabled \ - -Dbuild-bash-completion=disabled \ - -Dbuild-pylibmount=disabled \ - -Dreadline=disabled \ - -Dmagic=disabled \ - -Dncursesw=enabled +CONFIGURE_ARGS += \ + --disable-use-tty-group \ + --disable-rpath \ + --disable-tls \ + --disable-su \ + --disable-sulogin \ + --disable-makeinstall-chown \ + --disable-login \ + --disable-nologin \ + --disable-lslogins \ + --disable-runuser \ + --disable-chfn-chsh \ + --disable-raw \ + --without-python \ + --without-udev \ + --without-readline \ + --without-libmagic \ + --with-ncursesw + +TARGET_CFLAGS += $(FPIC) -std=gnu99 define Build/InstallDev $(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/blkid.pc $(1)/usr/lib/pkgconfig + $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/blkid.pc + $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/blkid.pc $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fdisk.pc $(1)/usr/lib/pkgconfig + $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/fdisk.pc + $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/fdisk.pc $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/mount.pc $(1)/usr/lib/pkgconfig + $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/mount.pc + $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/mount.pc $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/smartcols.pc $(1)/usr/lib/pkgconfig + $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/smartcols.pc + $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/smartcols.pc $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/uuid.pc $(1)/usr/lib/pkgconfig + $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/uuid.pc + $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/uuid.pc $(INSTALL_DIR) $(1)/usr/include/blkid $(CP) $(PKG_INSTALL_DIR)/usr/include/blkid/blkid.h $(1)/usr/include/blkid @@ -624,37 +603,43 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/include/libsmartcols/libsmartcols.h $(1)/usr/include/libsmartcols $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libblkid.so* $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfdisk.so* $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmount.so* $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuuid.so* $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsmartcols.so* $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/lib/libblkid.so* $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/lib/libfdisk.so* $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/lib/libmount.so* $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/lib/libuuid.so* $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/lib/libsmartcols.so* $(1)/usr/lib + + $(LN) libblkid.so.1 $(1)/usr/lib/libblkid.so + $(LN) libfdisk.so.1 $(1)/usr/lib/libfdisk.so + $(LN) libmount.so.1 $(1)/usr/lib/libmount.so + $(LN) libuuid.so.1 $(1)/usr/lib/libuuid.so + $(LN) libsmartcols.so.1 $(1)/usr/lib/libsmartcols.so endef define Package/libfdisk/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfdisk.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/lib/libfdisk.so.* $(1)/usr/lib/ endef define Package/libblkid/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libblkid.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/lib/libblkid.so.* $(1)/usr/lib/ endef define Package/libmount/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmount.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/lib/libmount.so.* $(1)/usr/lib/ endef define Package/libsmartcols/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsmartcols.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/lib/libsmartcols.so.* $(1)/usr/lib/ endef define Package/libuuid/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuuid.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/lib/libuuid.so.* $(1)/usr/lib/ endef define Package/agetty/install diff --git a/package/utils/util-linux/patches/010-meson-typo.patch b/package/utils/util-linux/patches/010-meson-typo.patch deleted file mode 100644 index 466d942d58..0000000000 --- a/package/utils/util-linux/patches/010-meson-typo.patch +++ /dev/null @@ -1,20 +0,0 @@ -From c387d4fe7a1435a762a5b7d8b75feb13ad613315 Mon Sep 17 00:00:00 2001 -From: Anatoly Pugachev -Date: Fri, 8 Apr 2022 15:34:16 +0300 -Subject: [PATCH] libfdisk: meson.build fix typo - ---- - libfdisk/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/libfdisk/meson.build -+++ b/libfdisk/meson.build -@@ -11,7 +11,7 @@ libfdisk_h = configure_file( - output : 'libfdisk.h', - configuration : defs, - install : build_libfdisk, -- install_dir : join_paths(get_option('includedir'), 'libfisk'), -+ install_dir : join_paths(get_option('includedir'), 'libfdisk'), - ) - - lib_fdisk_sources = ''' diff --git a/package/utils/util-linux/patches/020-meson-fix-compilation-without-systemd.patch b/package/utils/util-linux/patches/020-meson-fix-compilation-without-systemd.patch deleted file mode 100644 index aa209994ec..0000000000 --- a/package/utils/util-linux/patches/020-meson-fix-compilation-without-systemd.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 38b15ca2dc4ca32bbe4a2449e1c7b645e4577840 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Fri, 29 Apr 2022 16:53:43 -0700 -Subject: [PATCH 1/7] meson: fix compilation without systemd - -systemdsystemunitdir is used elsewhere. - -Signed-off-by: Rosen Penev ---- - meson.build | 1 + - 1 file changed, 1 insertion(+) - ---- a/meson.build -+++ b/meson.build -@@ -720,6 +720,7 @@ if fs_search_path_extra != '' - endif - conf.set_quoted('FS_SEARCH_PATH', fs_search_path) - -+systemdsystemunitdir = '' - if systemd.found() - systemdsystemunitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir') - endif diff --git a/package/utils/util-linux/patches/030-meson-don-t-use-run.patch b/package/utils/util-linux/patches/030-meson-don-t-use-run.patch deleted file mode 100644 index 7803dd7725..0000000000 --- a/package/utils/util-linux/patches/030-meson-don-t-use-run.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e25db9169450d3d5fb43656a2eae5c08999310f4 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Fri, 29 Apr 2022 16:56:54 -0700 -Subject: [PATCH 2/7] meson: don't use run - -Fixes cross compilation. run is not needed anyway. - -Signed-off-by: Rosen Penev ---- - meson.build | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - ---- a/meson.build -+++ b/meson.build -@@ -577,8 +577,7 @@ int main(void) { - return tzname ? 0 : 1; - } - '''.format(have ? 1 : 0) --result = cc.run(code, name : 'using tzname[]') --have = result.compiled() and result.returncode() == 0 -+have = cc.compiles(code, name : 'using tzname[]') - conf.set('HAVE_TZNAME', have ? 1 : false) - - socket_libs = [] -@@ -641,8 +640,7 @@ int main(void) { - return (*__progname != 0); - } - ''' --result = cc.run(code, name : 'using __progname') --have = result.compiled() and result.returncode() == 0 -+have = cc.compiles(code, name : 'using __progname') - conf.set('HAVE___PROGNAME', have ? 1 : false) - - build_plymouth_support = get_option('build-plymouth-support') diff --git a/package/utils/util-linux/patches/040-meson-fix-cpu_set_t-test.patch b/package/utils/util-linux/patches/040-meson-fix-cpu_set_t-test.patch deleted file mode 100644 index bdbfc4bfe0..0000000000 --- a/package/utils/util-linux/patches/040-meson-fix-cpu_set_t-test.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 4194bb5b35e9b5f3296bf17b7cabcc5cb1632ba3 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Fri, 29 Apr 2022 16:55:15 -0700 -Subject: [PATCH 3/7] meson: fix cpu_set_t test - -_GNU_SOURCE is needed here. - -Signed-off-by: Rosen Penev ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/meson.build -+++ b/meson.build -@@ -379,7 +379,7 @@ endforeach - have = cc.has_header('sched.h') - conf.set10('HAVE_DECL_CPU_ALLOC', have) - # We get -1 if the size cannot be determined --have_cpu_set_t = cc.sizeof('cpu_set_t', prefix : '#include ') > 0 -+have_cpu_set_t = cc.sizeof('cpu_set_t', prefix : '#define _GNU_SOURCE\n#include ') > 0 - conf.set('HAVE_CPU_SET_T', have_cpu_set_t ? 1 : false) - - have = cc.has_header_symbol('stdlib.h', 'environ') diff --git a/package/utils/util-linux/patches/050-meson-fix-environ-search.patch b/package/utils/util-linux/patches/050-meson-fix-environ-search.patch deleted file mode 100644 index 2cd02e5b47..0000000000 --- a/package/utils/util-linux/patches/050-meson-fix-environ-search.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 1e9e2b9fe365cc4a0025d44dc0a9c54bfffe9058 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Fri, 29 Apr 2022 18:16:17 -0700 -Subject: [PATCH 4/7] meson: fix environ search - -musl has it defined in unistd.h and hidden behind _GNU_SOURCE. - -Signed-off-by: Rosen Penev ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/meson.build -+++ b/meson.build -@@ -382,7 +382,7 @@ conf.set10('HAVE_DECL_CPU_ALLOC', have) - have_cpu_set_t = cc.sizeof('cpu_set_t', prefix : '#define _GNU_SOURCE\n#include ') > 0 - conf.set('HAVE_CPU_SET_T', have_cpu_set_t ? 1 : false) - --have = cc.has_header_symbol('stdlib.h', 'environ') -+have = cc.has_header_symbol('unistd.h', 'environ', prefix : '#define _GNU_SOURCE') - conf.set10('HAVE_ENVIRON_DECL', have) - - have = cc.has_header_symbol('signal.h', 'sighandler_t') diff --git a/package/utils/util-linux/patches/060-meson-add-_GNU_SOURCE-for-sighandler_t.patch b/package/utils/util-linux/patches/060-meson-add-_GNU_SOURCE-for-sighandler_t.patch deleted file mode 100644 index 7f9137f8bc..0000000000 --- a/package/utils/util-linux/patches/060-meson-add-_GNU_SOURCE-for-sighandler_t.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 5d7557eb3827664b2b78145373907f2a6994bdf9 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Fri, 29 Apr 2022 18:17:52 -0700 -Subject: [PATCH 5/7] meson: add _GNU_SOURCE for sighandler_t - -musl requires it. - -Signed-off-by: Rosen Penev ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/meson.build -+++ b/meson.build -@@ -385,7 +385,7 @@ conf.set('HAVE_CPU_SET_T', have_cpu_set_ - have = cc.has_header_symbol('unistd.h', 'environ', prefix : '#define _GNU_SOURCE') - conf.set10('HAVE_ENVIRON_DECL', have) - --have = cc.has_header_symbol('signal.h', 'sighandler_t') -+have = cc.has_header_symbol('signal.h', 'sighandler_t', prefix : '#define _GNU_SOURCE') - conf.set('HAVE_SIGHANDLER_T', have ? 1 : false) - - have = cc.has_header_symbol('string.h', 'strsignal') diff --git a/package/utils/util-linux/patches/070-meson-fix-isnan-check.patch b/package/utils/util-linux/patches/070-meson-fix-isnan-check.patch deleted file mode 100644 index a0b104f801..0000000000 --- a/package/utils/util-linux/patches/070-meson-fix-isnan-check.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 777652585924034deeba98ae3192f26bc32bb661 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Fri, 29 Apr 2022 18:19:53 -0700 -Subject: [PATCH 6/7] meson: fix isnan check - -musl only has isnan as a macro, not as a function. Handle the former -case. - -Signed-off-by: Rosen Penev ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/meson.build -+++ b/meson.build -@@ -622,7 +622,7 @@ rtas_libs = cc.find_library('rtas', requ - conf.set('HAVE_LIBRTAS', rtas_libs.found() ? 1 : false) - - math_libs = [] --if not cc.has_function('isnan') -+if not cc.has_header_symbol('math.h', 'isnan') - lib = cc.find_library('m', required : true) - if (cc.has_function('isnan', dependencies : lib) and - cc.has_function('__isnan', dependencies : lib)) diff --git a/package/utils/util-linux/patches/080-meson-fix-tzname-check.patch b/package/utils/util-linux/patches/080-meson-fix-tzname-check.patch deleted file mode 100644 index f5d53c4d36..0000000000 --- a/package/utils/util-linux/patches/080-meson-fix-tzname-check.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 9a6b2618b46a859388139d1eb18f876886786659 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Fri, 29 Apr 2022 19:00:53 -0700 -Subject: [PATCH] meson: fix tzname check - -tzname is not a type but a variable. sizeof only works on types. - -Signed-off-by: Rosen Penev ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/meson.build -+++ b/meson.build -@@ -565,7 +565,7 @@ have = cc.has_member('struct tm', 'tm_zo - prefix : '#include ') - conf.set('HAVE_STRUCT_TM_TM_ZONE', have ? 1 : false) - --have = cc.sizeof('tzname', prefix : '#include ') > 0 -+have = cc.has_header_symbol('time.h', 'tzname') - conf.set('HAVE_DECL_TZNAME', have ? 1 : false) - - code = ''' diff --git a/package/utils/util-linux/patches/090-meson-libpam.patch b/package/utils/util-linux/patches/090-meson-libpam.patch deleted file mode 100644 index c9a91b9937..0000000000 --- a/package/utils/util-linux/patches/090-meson-libpam.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -299,10 +299,14 @@ conf.set('HAVE_LIBUDEV', lib_udev.found( - - lib_crypt = cc.find_library('crypt') - --lib_pam = cc.find_library('pam') -+req_libpam = not (get_option('build-login').disabled() or get_option('build-chfn-chsh').disabled() -+ or get_option('build-su').disabled() or get_option('build-runuser').disabled()) -+lib_pam = cc.find_library('pam', required : req_libpam) - if lib_pam.found() - lib_pam_misc = cc.find_library('pam_misc') - lib_pam = [lib_pam, lib_pam_misc] -+else -+ lib_pam_misc = declare_dependency() - endif - - lib_cryptsetup = dependency( diff --git a/package/utils/util-linux/patches/100-meson-make-libcap-ng-dependent-on-setpriv.patch b/package/utils/util-linux/patches/100-meson-make-libcap-ng-dependent-on-setpriv.patch deleted file mode 100644 index d8b1199004..0000000000 --- a/package/utils/util-linux/patches/100-meson-make-libcap-ng-dependent-on-setpriv.patch +++ /dev/null @@ -1,31 +0,0 @@ -From cd23a4336f49ba6a12ade557a09589f2a7c966f4 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Mon, 2 May 2022 16:18:33 -0700 -Subject: [PATCH] meson: make libcap-ng dependent on setpriv - -Signed-off-by: Rosen Penev ---- - meson.build | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - ---- a/meson.build -+++ b/meson.build -@@ -334,7 +334,8 @@ have = cc.has_function( - conf.set('HAVE_CRYPT_ACTIVATE_BY_SIGNED_KEY', have ? 1 : false) - - lib_cap_ng = dependency( -- 'libcap-ng') -+ 'libcap-ng', -+ required : get_option('build-setpriv')) - - lib_selinux = dependency( - 'libselinux', -@@ -1754,7 +1755,7 @@ if opt and not is_disabler(exe) - exes += exe - endif - --opt = not get_option('build-setpriv').disabled() -+opt = not get_option('build-setpriv').disabled() and lib_cap_ng.found() - exe = executable( - 'setpriv', - setpriv_sources, diff --git a/package/utils/util-linux/patches/210-use-urandom.patch b/package/utils/util-linux/patches/100-use_urandom.patch similarity index 100% rename from package/utils/util-linux/patches/210-use-urandom.patch rename to package/utils/util-linux/patches/100-use_urandom.patch diff --git a/package/utils/util-linux/patches/110-meson-fix-when-HAVE_CLOCK_GETTIME-is-set.patch b/package/utils/util-linux/patches/110-meson-fix-when-HAVE_CLOCK_GETTIME-is-set.patch deleted file mode 100644 index bba8baf5ab..0000000000 --- a/package/utils/util-linux/patches/110-meson-fix-when-HAVE_CLOCK_GETTIME-is-set.patch +++ /dev/null @@ -1,21 +0,0 @@ -From e51565b653cf09985df57cb7254b16d5af5df223 Mon Sep 17 00:00:00 2001 -From: Nicolas Caramelli -Date: Fri, 29 Apr 2022 18:16:36 +0200 -Subject: [PATCH] meson: fix when HAVE_CLOCK_GETTIME is set - -Signed-off-by: Nicolas Caramelli ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/meson.build -+++ b/meson.build -@@ -602,7 +602,7 @@ if not have - have = cc.has_function('clock_gettime', - dependencies : realtime_libs) - endif --conf.set('HAVE_CLOCK_GETTIME', have_dirfd ? 1 : false) -+conf.set('HAVE_CLOCK_GETTIME', have ? 1 : false) - - thread_libs = dependency('threads') - diff --git a/package/utils/util-linux/patches/120-meson-get-the-project-version-from-the-version-gen-s.patch b/package/utils/util-linux/patches/120-meson-get-the-project-version-from-the-version-gen-s.patch deleted file mode 100644 index 8529c8268e..0000000000 --- a/package/utils/util-linux/patches/120-meson-get-the-project-version-from-the-version-gen-s.patch +++ /dev/null @@ -1,20 +0,0 @@ -From e0c1a86bf88b568a7afe8ebaea1b9f84afb892c2 Mon Sep 17 00:00:00 2001 -From: Eli Schwartz -Date: Wed, 4 May 2022 23:52:31 -0400 -Subject: [PATCH] meson: get the project version from the version-gen script - -This matches autotools and ensures that the version number is actually -reliable. ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/meson.build -+++ b/meson.build -@@ -1,5 +1,5 @@ - project('util-linux', 'c', -- version : '2.37', -+ version : run_command('tools/git-version-gen', check: true).stdout(), - license : 'GPLv2+') - - pkgconfig = import('pkgconfig') diff --git a/package/utils/util-linux/patches/130-meson-fix-error-in-processing-version-for-pc-files.patch b/package/utils/util-linux/patches/130-meson-fix-error-in-processing-version-for-pc-files.patch deleted file mode 100644 index 75e88682e3..0000000000 --- a/package/utils/util-linux/patches/130-meson-fix-error-in-processing-version-for-pc-files.patch +++ /dev/null @@ -1,26 +0,0 @@ -From dc307e1cbf73f6dbf72bb049c19d332774cdb4e7 Mon Sep 17 00:00:00 2001 -From: Eli Schwartz -Date: Thu, 5 May 2022 00:16:15 -0400 -Subject: [PATCH] meson: fix error in processing version for pc files - -This awk command was copied verbatim from configure.ac, which included -non-awk syntax because configure.ac cannot contain [ literals. - -Rewrite these autoconf quadrigraphs as their actual values, for meson. - -Fixes always setting the micro version to "0". ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/meson.build -+++ b/meson.build -@@ -41,7 +41,7 @@ conf.set_quoted('PACKAGE_VERSION', meson - - codes = [''' {print $1} ''', - ''' {sub("-.*","",$2); print $2} ''', -- ''' {sub("-.*","",$3); print $3 ~ /^@<:@0-9@:>@+$/ ? $3 : 0} '''] -+ ''' {sub("-.*","",$3); print $3 ~ /^[0-9]+$/ ? $3 : 0} '''] - pc_version = [] - foreach code : codes - res = run_command('bash', '-c', diff --git a/package/utils/util-linux/patches/200-meson-no-po.patch b/package/utils/util-linux/patches/200-meson-no-po.patch deleted file mode 100644 index d626036bb2..0000000000 --- a/package/utils/util-linux/patches/200-meson-no-po.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -774,7 +774,6 @@ subdir('disk-utils') - subdir('misc-utils') - subdir('text-utils') - subdir('term-utils') --subdir('po') - - includes = [dir_include, - dir_libblkid, From 0d1dfcb5554d83fb945d1d4cddc2701002f4d289 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 26 May 2022 17:25:42 +0800 Subject: [PATCH 12/22] Revert "util-linux: update to 2.38" This breaks build on kernel 4.9 This reverts commit dd7e948e00340fa14c972df7de38c7521e24203f. Signed-off-by: Tianling Shen --- package/utils/util-linux/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile index a93c9f6fdc..6d44e92f00 100644 --- a/package/utils/util-linux/Makefile +++ b/package/utils/util-linux/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=util-linux -PKG_VERSION:=2.38 +PKG_VERSION:=2.37.3 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.38 -PKG_HASH:=6d111cbe4d55b336db2f1fbeffbc65b89908704c01136371d32aa9bec373eb64 +PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.37 +PKG_HASH:=590c592e58cd6bf38519cb467af05ce6a1ab18040e3e3418f24bcfb2f55f9776 PKG_CPE_ID:=cpe:/a:kernel:util-linux PKG_LICENSE:=GPL-2.0-only From b3fd8d4f034414a5fc90dca4b42895dbed35588f Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 26 May 2022 17:26:47 +0800 Subject: [PATCH 13/22] util-linux: update to 2.37.4 Signed-off-by: Tianling Shen --- package/utils/util-linux/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile index 6d44e92f00..446ad716a6 100644 --- a/package/utils/util-linux/Makefile +++ b/package/utils/util-linux/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=util-linux -PKG_VERSION:=2.37.3 +PKG_VERSION:=2.37.4 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.37 -PKG_HASH:=590c592e58cd6bf38519cb467af05ce6a1ab18040e3e3418f24bcfb2f55f9776 +PKG_HASH:=634e6916ad913366c3536b6468e7844769549b99a7b2bf80314de78ab5655b83 PKG_CPE_ID:=cpe:/a:kernel:util-linux PKG_LICENSE:=GPL-2.0-only From 78ed4933c6e5466dd3c45081981d87ccb9fd190a Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 26 May 2022 19:15:39 +0800 Subject: [PATCH 14/22] mac80211: brcm: fix build for kernel < 4.13 Signed-off-by: Tianling Shen --- ...add-initial-support-for-monitor-mode.patch | 27 +++++++++++++------ ...und-bug-with-some-inconsistent-BSSes.patch | 2 +- ...62-brcmfmac-Disable-power-management.patch | 2 +- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/package/kernel/mac80211/patches/brcm/419-v5.6-0002-brcmfmac-add-initial-support-for-monitor-mode.patch b/package/kernel/mac80211/patches/brcm/419-v5.6-0002-brcmfmac-add-initial-support-for-monitor-mode.patch index 070002292b..bba1f97b7b 100644 --- a/package/kernel/mac80211/patches/brcm/419-v5.6-0002-brcmfmac-add-initial-support-for-monitor-mode.patch +++ b/package/kernel/mac80211/patches/brcm/419-v5.6-0002-brcmfmac-add-initial-support-for-monitor-mode.patch @@ -24,7 +24,14 @@ Signed-off-by: Kalle Valo --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -@@ -11,6 +11,7 @@ +@@ -5,12 +5,14 @@ + + /* Toplevel file. Relies on dhd_linux.c to send commands to the dongle. */ + ++#include + #include + #include + #include #include #include #include @@ -32,7 +39,7 @@ Signed-off-by: Kalle Valo #include #include -@@ -619,6 +620,82 @@ static bool brcmf_is_ibssmode(struct brc +@@ -619,6 +621,86 @@ static bool brcmf_is_ibssmode(struct brc return vif->wdev.iftype == NL80211_IFTYPE_ADHOC; } @@ -69,8 +76,12 @@ Signed-off-by: Kalle Valo + } + ndev->type = ARPHRD_IEEE80211_RADIOTAP; + ndev->ieee80211_ptr = &vif->wdev; ++#if LINUX_VERSION_IS_GEQ(4, 13, 0) + ndev->needs_free_netdev = true; + ndev->priv_destructor = brcmf_cfg80211_free_netdev; ++#else ++ ndev->destructor = brcmf_cfg80211_free_netdev; ++#endif + SET_NETDEV_DEV(ndev, wiphy_dev(cfg->wiphy)); + + ifp = netdev_priv(ndev); @@ -115,7 +126,7 @@ Signed-off-by: Kalle Valo static struct wireless_dev *brcmf_cfg80211_add_iface(struct wiphy *wiphy, const char *name, unsigned char name_assign_type, -@@ -641,9 +718,10 @@ static struct wireless_dev *brcmf_cfg802 +@@ -641,9 +723,10 @@ static struct wireless_dev *brcmf_cfg802 case NL80211_IFTYPE_STATION: case NL80211_IFTYPE_AP_VLAN: case NL80211_IFTYPE_WDS: @@ -127,7 +138,7 @@ Signed-off-by: Kalle Valo case NL80211_IFTYPE_AP: wdev = brcmf_ap_add_vif(wiphy, name, params); break; -@@ -826,9 +904,10 @@ int brcmf_cfg80211_del_iface(struct wiph +@@ -826,9 +909,10 @@ int brcmf_cfg80211_del_iface(struct wiph case NL80211_IFTYPE_STATION: case NL80211_IFTYPE_AP_VLAN: case NL80211_IFTYPE_WDS: @@ -139,7 +150,7 @@ Signed-off-by: Kalle Valo case NL80211_IFTYPE_AP: return brcmf_cfg80211_del_ap_iface(wiphy, wdev); case NL80211_IFTYPE_P2P_CLIENT: -@@ -6477,9 +6556,10 @@ static int brcmf_setup_ifmodes(struct wi +@@ -6477,9 +6561,10 @@ static int brcmf_setup_ifmodes(struct wi struct ieee80211_iface_limit *c0_limits = NULL; struct ieee80211_iface_limit *p2p_limits = NULL; struct ieee80211_iface_limit *mbss_limits = NULL; @@ -152,7 +163,7 @@ Signed-off-by: Kalle Valo mbss = brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MBSS); p2p = brcmf_feat_is_enabled(ifp, BRCMF_FEAT_P2P); rsdb = brcmf_feat_is_enabled(ifp, BRCMF_FEAT_RSDB); -@@ -6493,6 +6573,8 @@ static int brcmf_setup_ifmodes(struct wi +@@ -6493,6 +6578,8 @@ static int brcmf_setup_ifmodes(struct wi wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC) | BIT(NL80211_IFTYPE_AP); @@ -161,7 +172,7 @@ Signed-off-by: Kalle Valo if (p2p) wiphy->interface_modes |= BIT(NL80211_IFTYPE_P2P_CLIENT) | BIT(NL80211_IFTYPE_P2P_GO) | -@@ -6500,18 +6582,18 @@ static int brcmf_setup_ifmodes(struct wi +@@ -6500,18 +6587,18 @@ static int brcmf_setup_ifmodes(struct wi c = 0; i = 0; @@ -186,7 +197,7 @@ Signed-off-by: Kalle Valo if (p2p) { c0_limits[i].max = 1; c0_limits[i++].types = BIT(NL80211_IFTYPE_P2P_DEVICE); -@@ -6560,14 +6642,20 @@ static int brcmf_setup_ifmodes(struct wi +@@ -6560,14 +6647,20 @@ static int brcmf_setup_ifmodes(struct wi if (mbss) { c++; i = 0; diff --git a/package/kernel/mac80211/patches/brcm/861-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch b/package/kernel/mac80211/patches/brcm/861-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch index 37ebb5190b..4db63f92e6 100644 --- a/package/kernel/mac80211/patches/brcm/861-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch +++ b/package/kernel/mac80211/patches/brcm/861-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch @@ -10,7 +10,7 @@ Signed-off-by: Rafał Miłecki --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -@@ -705,8 +705,36 @@ static struct wireless_dev *brcmf_cfg802 +@@ -710,8 +710,36 @@ static struct wireless_dev *brcmf_cfg802 struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy); struct brcmf_pub *drvr = cfg->pub; struct wireless_dev *wdev; diff --git a/package/kernel/mac80211/patches/brcm/862-brcmfmac-Disable-power-management.patch b/package/kernel/mac80211/patches/brcm/862-brcmfmac-Disable-power-management.patch index 8ecb729aa9..988ece1f5f 100644 --- a/package/kernel/mac80211/patches/brcm/862-brcmfmac-Disable-power-management.patch +++ b/package/kernel/mac80211/patches/brcm/862-brcmfmac-Disable-power-management.patch @@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -@@ -2869,6 +2869,10 @@ brcmf_cfg80211_set_power_mgmt(struct wip +@@ -2874,6 +2874,10 @@ brcmf_cfg80211_set_power_mgmt(struct wip * preference in cfg struct to apply this to * FW later while initializing the dongle */ From f0522b7b59c6a78e9b27679f501eef0a753a1d58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Mon, 27 Jul 2020 12:30:41 +0200 Subject: [PATCH 15/22] treewide: use wpad-basic-openssl as default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In order to support SAE/WPA3-Personal in default images. Replace almost all occurencies of wpad-basic and wpad-mini with wpad-basic-openssl for consistency. Keep out ar71xx from the list as it won't be in the next release and would only make backports harder. Build-tested (build-bot settings): ath79: generic, ramips: mt7620/mt76x8/rt305x, lantiq: xrx200/xway, sunxi: a53 Signed-off-by: Petr Štetiar [rebase, extend commit message] Signed-off-by: Adrian Schmutzler (cherry picked from commit a14f5bb4bd263c21e103f13279d0c2ff03e48fe5) [use openssl variant] Signed-off-by: Tianling Shen --- target/linux/apm821xx/image/Makefile | 2 +- target/linux/apm821xx/nand/target.mk | 2 +- .../apm821xx/sata/profiles/00-default.mk | 2 +- target/linux/ar7/generic/target.mk | 2 +- target/linux/ar71xx/image/generic.mk | 4 +-- target/linux/ath25/Makefile | 2 +- target/linux/ath79/generic/target.mk | 2 +- target/linux/ath79/image/generic-ubnt.mk | 2 +- target/linux/ath79/image/generic.mk | 2 +- target/linux/ath79/tiny/target.mk | 2 +- target/linux/bcm27xx/image/Makefile | 8 +++--- target/linux/bcm53xx/image/Makefile | 2 +- .../generic/profiles/101-Broadcom-wl.mk | 2 +- .../generic/profiles/105-Broadcom-none.mk | 2 +- .../generic/profiles/201-Broadcom-b44-wl.mk | 2 +- .../generic/profiles/205-Broadcom-b44-none.mk | 2 +- .../generic/profiles/211-Broadcom-tg3-wl.mk | 2 +- .../generic/profiles/215-Broadcom-tg3-none.mk | 2 +- .../generic/profiles/221-Broadcom-bgmac-wl.mk | 2 +- .../profiles/225-Broadcom-bgmac-none.mk | 2 +- .../brcm47xx/generic/profiles/PS-1208MFG.mk | 2 +- target/linux/brcm47xx/generic/target.mk | 2 +- .../legacy/profiles/101-Broadcom-wl.mk | 2 +- target/linux/brcm47xx/legacy/target.mk | 2 +- .../mips74k/profiles/102-Broadcom-wl.mk | 2 +- .../mips74k/profiles/103-Broadcom-none.mk | 2 +- target/linux/brcm47xx/mips74k/target.mk | 2 +- target/linux/brcm63xx/image/Makefile | 10 +++---- target/linux/brcm63xx/profiles/default.mk | 2 +- target/linux/cns3xxx/Makefile | 2 +- target/linux/ipq806x/Makefile | 2 +- .../ixp4xx/generic/profiles/200-NSLU2.mk | 2 +- .../ixp4xx/generic/profiles/500-USR8200.mk | 2 +- target/linux/ixp4xx/generic/target.mk | 2 +- target/linux/kirkwood/image/Makefile | 4 +-- target/linux/kirkwood/profiles/00-default.mk | 2 +- target/linux/lantiq/image/ar9.mk | 18 ++++++------ target/linux/lantiq/image/danube.mk | 24 ++++++++-------- target/linux/lantiq/image/tp-link.mk | 8 +++--- target/linux/lantiq/image/vr9.mk | 28 +++++++++---------- target/linux/lantiq/image/xway_legacy.mk | 10 +++---- target/linux/malta/Makefile | 2 +- target/linux/mediatek/Makefile | 2 +- target/linux/mpc85xx/Makefile | 2 +- target/linux/mvebu/image/cortex-a9.mk | 4 +-- target/linux/omap/profiles/00-default.mk | 2 +- target/linux/orion/Makefile | 2 +- target/linux/oxnas/image/ox820.mk | 2 +- target/linux/ramips/rt288x/target.mk | 2 +- target/linux/ramips/rt305x/target.mk | 2 +- target/linux/ramips/rt3883/target.mk | 2 +- target/linux/rb532/Makefile | 2 +- target/linux/sunxi/image/cortex-a53.mk | 2 +- target/linux/sunxi/image/cortex-a7.mk | 10 +++---- target/linux/sunxi/profiles/00-default.mk | 2 +- target/linux/tegra/image/Makefile | 2 +- target/linux/uml/Makefile | 2 +- 57 files changed, 110 insertions(+), 110 deletions(-) diff --git a/target/linux/apm821xx/image/Makefile b/target/linux/apm821xx/image/Makefile index 1e379a7c8c..52b1d28e8b 100644 --- a/target/linux/apm821xx/image/Makefile +++ b/target/linux/apm821xx/image/Makefile @@ -224,7 +224,7 @@ ifeq ($(SUBTARGET),sata) define Device/wd_mybooklive DEVICE_TITLE := Western Digital 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 DEVICE_TYPE := nas DEVICE_DTS := wd-mybooklive SUPPORTED_DEVICES += mbl wd,mybooklive-duo 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 db48353bf2..fbaeca2700 100644 --- a/target/linux/apm821xx/sata/profiles/00-default.mk +++ b/target/linux/apm821xx/sata/profiles/00-default.mk @@ -8,7 +8,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/ar7/generic/target.mk b/target/linux/ar7/generic/target.mk index b40d2a4722..d1c3cb03fe 100644 --- a/target/linux/ar7/generic/target.mk +++ b/target/linux/ar7/generic/target.mk @@ -5,7 +5,7 @@ SUBTARGET:=generic BOARDNAME:=Texas Instruments AR7 boards -DEFAULT_PACKAGES+= kmod-mac80211 kmod-acx-mac80211 wpad-basic +DEFAULT_PACKAGES+= kmod-mac80211 kmod-acx-mac80211 wpad-basic-openssl define Target/Description Build firmware images for TI AR7 based routers. diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk index 6e715b0ce1..2fe6ab1424 100644 --- a/target/linux/ar71xx/image/generic.mk +++ b/target/linux/ar71xx/image/generic.mk @@ -560,7 +560,7 @@ define Device/lan-turtle $(Device/tplink-16mlzma) DEVICE_TITLE := Hak5 LAN Turtle DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage \ - -kmod-ath9k -swconfig -uboot-envtools -wpad-mini + -kmod-ath9k -swconfig -uboot-envtools -wpad-basic-openssl BOARDNAME := LAN-TURTLE DEVICE_PROFILE := LANTURTLE TPLINK_HWID := 0x5348334c @@ -718,7 +718,7 @@ define Device/packet-squirrel $(Device/tplink-16mlzma) DEVICE_TITLE := Hak5 Packet Squirrel DEVICE_PACKAGES := kmod-usb-core kmod-usb2 \ - -kmod-ath9k -swconfig -uboot-envtools -wpad-mini + -kmod-ath9k -swconfig -uboot-envtools -wpad-basic-openssl BOARDNAME := PACKET-SQUIRREL DEVICE_PROFILE := PACKETSQUIRREL TPLINK_HWID := 0x5351524c diff --git a/target/linux/ath25/Makefile b/target/linux/ath25/Makefile index cb8b7ec1be..25f520df44 100644 --- a/target/linux/ath25/Makefile +++ b/target/linux/ath25/Makefile @@ -20,6 +20,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 488aa6df16..fdd2150f07 100644 --- a/target/linux/ath79/generic/target.mk +++ b/target/linux/ath79/generic/target.mk @@ -1,7 +1,7 @@ BOARDNAME:=Generic FEATURES += minor squashfs -DEFAULT_PACKAGES += wpad-basic +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 29edf933d3..178e0f0190 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -228,7 +228,7 @@ endef TARGET_DEVICES += ubnt_rocket-m define Device/ubnt_routerstation_common - DEVICE_PACKAGES := -kmod-ath9k -wpad-mini -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 f0c7150c7b..c467c2be66 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -735,7 +735,7 @@ define Device/jjplus_ja76pf2 SOC := ar7161 DEVICE_VENDOR := jjPlus DEVICE_MODEL := JA76PF2 - DEVICE_PACKAGES += -kmod-ath9k -swconfig -wpad-mini -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/tiny/target.mk b/target/linux/ath79/tiny/target.mk index dba57e5965..cc28831f10 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 += squashfs small_flash -DEFAULT_PACKAGES += wpad-mini +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 a87392512b..96b7d5281a 100644 --- a/target/linux/bcm27xx/image/Makefile +++ b/target/linux/bcm27xx/image/Makefile @@ -79,7 +79,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 @@ -110,7 +110,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 @@ -139,7 +139,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 @@ -155,7 +155,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/bcm53xx/image/Makefile b/target/linux/bcm53xx/image/Makefile index bf146a0966..0a207ac241 100644 --- a/target/linux/bcm53xx/image/Makefile +++ b/target/linux/bcm53xx/image/Makefile @@ -103,7 +103,7 @@ endef DEVICE_VARS += PRODUCTID SIGNATURE NETGEAR_BOARD_ID NETGEAR_REGION TPLINK_BOARD DEVICE_VARS += BUFFALO_TAG_PLATFORM BUFFALO_TAG_VERSION BUFFALO_TAG_MINOR -IEEE8021X := wpad-basic +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 diff --git a/target/linux/brcm47xx/generic/profiles/101-Broadcom-wl.mk b/target/linux/brcm47xx/generic/profiles/101-Broadcom-wl.mk index c3e9d20c13..9b1367d78f 100644 --- a/target/linux/brcm47xx/generic/profiles/101-Broadcom-wl.mk +++ b/target/linux/brcm47xx/generic/profiles/101-Broadcom-wl.mk @@ -7,7 +7,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/brcm47xx/generic/profiles/105-Broadcom-none.mk b/target/linux/brcm47xx/generic/profiles/105-Broadcom-none.mk index 4497124a2e..d2936c1e4c 100644 --- a/target/linux/brcm47xx/generic/profiles/105-Broadcom-none.mk +++ b/target/linux/brcm47xx/generic/profiles/105-Broadcom-none.mk @@ -7,7 +7,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/brcm47xx/generic/profiles/201-Broadcom-b44-wl.mk b/target/linux/brcm47xx/generic/profiles/201-Broadcom-b44-wl.mk index 79b7c5c000..00748b9077 100644 --- a/target/linux/brcm47xx/generic/profiles/201-Broadcom-b44-wl.mk +++ b/target/linux/brcm47xx/generic/profiles/201-Broadcom-b44-wl.mk @@ -7,7 +7,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/brcm47xx/generic/profiles/205-Broadcom-b44-none.mk b/target/linux/brcm47xx/generic/profiles/205-Broadcom-b44-none.mk index 0854b5041e..b9931dec7d 100644 --- a/target/linux/brcm47xx/generic/profiles/205-Broadcom-b44-none.mk +++ b/target/linux/brcm47xx/generic/profiles/205-Broadcom-b44-none.mk @@ -7,7 +7,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/brcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk b/target/linux/brcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk index 6946668c91..48f613ccde 100644 --- a/target/linux/brcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk +++ b/target/linux/brcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk @@ -7,7 +7,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/brcm47xx/generic/profiles/215-Broadcom-tg3-none.mk b/target/linux/brcm47xx/generic/profiles/215-Broadcom-tg3-none.mk index a5a3b4a010..04aa6ca9c5 100644 --- a/target/linux/brcm47xx/generic/profiles/215-Broadcom-tg3-none.mk +++ b/target/linux/brcm47xx/generic/profiles/215-Broadcom-tg3-none.mk @@ -7,7 +7,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/brcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk b/target/linux/brcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk index acdc20fb70..00ae3a18c4 100644 --- a/target/linux/brcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk +++ b/target/linux/brcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk @@ -7,7 +7,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/brcm47xx/generic/profiles/225-Broadcom-bgmac-none.mk b/target/linux/brcm47xx/generic/profiles/225-Broadcom-bgmac-none.mk index db2d1a264c..1e061c050f 100644 --- a/target/linux/brcm47xx/generic/profiles/225-Broadcom-bgmac-none.mk +++ b/target/linux/brcm47xx/generic/profiles/225-Broadcom-bgmac-none.mk @@ -7,7 +7,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/brcm47xx/generic/profiles/PS-1208MFG.mk b/target/linux/brcm47xx/generic/profiles/PS-1208MFG.mk index 14ee46f200..e26112567f 100644 --- a/target/linux/brcm47xx/generic/profiles/PS-1208MFG.mk +++ b/target/linux/brcm47xx/generic/profiles/PS-1208MFG.mk @@ -7,7 +7,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/brcm47xx/generic/target.mk b/target/linux/brcm47xx/generic/target.mk index 2f93778b09..62a0794e6c 100644 --- a/target/linux/brcm47xx/generic/target.mk +++ b/target/linux/brcm47xx/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/brcm47xx/legacy/profiles/101-Broadcom-wl.mk b/target/linux/brcm47xx/legacy/profiles/101-Broadcom-wl.mk index 6a4c5b0394..3724be4ebd 100644 --- a/target/linux/brcm47xx/legacy/profiles/101-Broadcom-wl.mk +++ b/target/linux/brcm47xx/legacy/profiles/101-Broadcom-wl.mk @@ -7,7 +7,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/brcm47xx/legacy/target.mk b/target/linux/brcm47xx/legacy/target.mk index fca6128558..cd4619e3ea 100644 --- a/target/linux/brcm47xx/legacy/target.mk +++ b/target/linux/brcm47xx/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/brcm47xx/mips74k/profiles/102-Broadcom-wl.mk b/target/linux/brcm47xx/mips74k/profiles/102-Broadcom-wl.mk index 66b13bf879..ab2b6fd044 100644 --- a/target/linux/brcm47xx/mips74k/profiles/102-Broadcom-wl.mk +++ b/target/linux/brcm47xx/mips74k/profiles/102-Broadcom-wl.mk @@ -7,7 +7,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/brcm47xx/mips74k/profiles/103-Broadcom-none.mk b/target/linux/brcm47xx/mips74k/profiles/103-Broadcom-none.mk index cc4668de52..c6621c8b3b 100644 --- a/target/linux/brcm47xx/mips74k/profiles/103-Broadcom-none.mk +++ b/target/linux/brcm47xx/mips74k/profiles/103-Broadcom-none.mk @@ -7,7 +7,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/brcm47xx/mips74k/target.mk b/target/linux/brcm47xx/mips74k/target.mk index 1e2e8436d5..a903fc8b7c 100644 --- a/target/linux/brcm47xx/mips74k/target.mk +++ b/target/linux/brcm47xx/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/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile index 1cf64bd8e7..5813397a48 100644 --- a/target/linux/brcm63xx/image/Makefile +++ b/target/linux/brcm63xx/image/Makefile @@ -163,12 +163,12 @@ define Device/Default DEVICE_DTS_DIR := ../dts endef -ATH5K_PACKAGES := kmod-ath5k wpad-basic -ATH9K_PACKAGES := kmod-ath9k wpad-basic -B43_PACKAGES := kmod-b43 wpad-basic +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 -RT61_PACKAGES := kmod-rt61-pci wpad-basic +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/brcm63xx/profiles/default.mk b/target/linux/brcm63xx/profiles/default.mk index 95cd67c46e..c7fe589cea 100644 --- a/target/linux/brcm63xx/profiles/default.mk +++ b/target/linux/brcm63xx/profiles/default.mk @@ -7,7 +7,7 @@ define Profile/Default NAME:=Default Profile - PACKAGES:=kmod-b43 wpad-basic + PACKAGES:=kmod-b43 wpad-basic-openssl PRIORITY:=1 endef diff --git a/target/linux/cns3xxx/Makefile b/target/linux/cns3xxx/Makefile index abb1fccf32..ecfc46df02 100644 --- a/target/linux/cns3xxx/Makefile +++ b/target/linux/cns3xxx/Makefile @@ -25,6 +25,6 @@ include $(INCLUDE_DIR)/target.mk KERNELNAME:=zImage -DEFAULT_PACKAGES += kmod-ath9k kmod-usb2 wpad-basic +DEFAULT_PACKAGES += kmod-ath9k kmod-usb2 wpad-basic-openssl $(eval $(call BuildTarget)) diff --git a/target/linux/ipq806x/Makefile b/target/linux/ipq806x/Makefile index 01b99ad667..b7c4a2df5e 100644 --- a/target/linux/ipq806x/Makefile +++ b/target/linux/ipq806x/Makefile @@ -24,6 +24,6 @@ DEFAULT_PACKAGES += \ kmod-ata-core kmod-ata-ahci kmod-ata-ahci-platform \ kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \ kmod-usb3 kmod-usb-dwc3-of-simple kmod-usb-phy-qcom-dwc3 \ - kmod-ath10k-ct wpad uboot-envtools e2fsprogs autocore-arm + kmod-ath10k-ct wpad-openssl uboot-envtools e2fsprogs autocore-arm $(eval $(call BuildTarget)) diff --git a/target/linux/ixp4xx/generic/profiles/200-NSLU2.mk b/target/linux/ixp4xx/generic/profiles/200-NSLU2.mk index 6a54f74bf3..84173aa895 100644 --- a/target/linux/ixp4xx/generic/profiles/200-NSLU2.mk +++ b/target/linux/ixp4xx/generic/profiles/200-NSLU2.mk @@ -7,7 +7,7 @@ define Profile/NSLU2 NAME:=Linksys NSLU2 - PACKAGES:=-wpad-basic -kmod-ath5k kmod-scsi-core \ + PACKAGES:=-wpad-basic-openssl -kmod-ath5k kmod-scsi-core \ kmod-usb-core kmod-usb-ohci-pci kmod-usb2-pci kmod-usb-storage \ kmod-fs-ext4 endef diff --git a/target/linux/ixp4xx/generic/profiles/500-USR8200.mk b/target/linux/ixp4xx/generic/profiles/500-USR8200.mk index 959c399e92..f8531ab18a 100644 --- a/target/linux/ixp4xx/generic/profiles/500-USR8200.mk +++ b/target/linux/ixp4xx/generic/profiles/500-USR8200.mk @@ -7,7 +7,7 @@ define Profile/USR8200 NAME:=USRobotics USR8200 - PACKAGES:=-wpad-basic kmod-scsi-core \ + PACKAGES:=-wpad-basic-openssl kmod-scsi-core \ kmod-usb-core kmod-usb-uhci kmod-usb2-pci kmod-usb-storage \ kmod-fs-ext4 kmod-firewire kmod-firewire-ohci kmod-firewire-sbp2 endef diff --git a/target/linux/ixp4xx/generic/target.mk b/target/linux/ixp4xx/generic/target.mk index 4794755fdc..23956c6aec 100644 --- a/target/linux/ixp4xx/generic/target.mk +++ b/target/linux/ixp4xx/generic/target.mk @@ -1,6 +1,6 @@ BOARDNAME:=Generic -DEFAULT_PACKAGES+= wpad-basic +DEFAULT_PACKAGES+= wpad-basic-openssl define Target/Description Build firmware images for ixp4xx based boards that boot from internal flash diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile index 9bb2e91d02..c709a6e0b9 100644 --- a/target/linux/kirkwood/image/Makefile +++ b/target/linux/kirkwood/image/Makefile @@ -79,7 +79,7 @@ TARGET_DEVICES += iom_ix2_200 define Device/linksys_audi DEVICE_TITLE := Linksys EA3500 (Audi) - DEVICE_PACKAGES := kmod-mwl8k swconfig wpad-basic kmod-gpio-button-hotplug + DEVICE_PACKAGES := kmod-mwl8k swconfig wpad-basic-openssl kmod-gpio-button-hotplug DEVICE_DTS := kirkwood-linksys-audi KERNEL_SIZE := 2624k KERNEL_IN_UBI := 0 @@ -92,7 +92,7 @@ TARGET_DEVICES += linksys_audi define Device/linksys_viper DEVICE_TITLE := Linksys E4200v2 / EA4500 (Viper) - DEVICE_PACKAGES := kmod-mwl8k swconfig wpad-basic kmod-gpio-button-hotplug + DEVICE_PACKAGES := kmod-mwl8k swconfig wpad-basic-openssl kmod-gpio-button-hotplug DEVICE_DTS := kirkwood-linksys-viper KERNEL_SIZE := 2688k KERNEL_IN_UBI := 0 diff --git a/target/linux/kirkwood/profiles/00-default.mk b/target/linux/kirkwood/profiles/00-default.mk index 002751714e..0eacd94b20 100644 --- a/target/linux/kirkwood/profiles/00-default.mk +++ b/target/linux/kirkwood/profiles/00-default.mk @@ -7,7 +7,7 @@ define Profile/Default NAME:=Default Profile - PACKAGES:=kmod-mwl8k swconfig wpad-basic + PACKAGES:=kmod-mwl8k swconfig wpad-basic-openssl PRIORITY:=1 endef diff --git a/target/linux/lantiq/image/ar9.mk b/target/linux/lantiq/image/ar9.mk index 7a8f05ea58..906cb6911d 100644 --- a/target/linux/lantiq/image/ar9.mk +++ b/target/linux/lantiq/image/ar9.mk @@ -3,7 +3,7 @@ define Device/avm_fritz7312 DEVICE_MODEL := FRITZ!Box 7312 SOC := ar9 IMAGE_SIZE := 15744k - 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 \ @@ -18,7 +18,7 @@ define Device/avm_fritz7320 DEVICE_ALT0_MODEL := HomeServer SOC := ar9 IMAGE_SIZE := 15744k - 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 \ @@ -39,7 +39,7 @@ define Device/bt_homehub-v3a kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \ kmod-ltq-deu-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 endef @@ -56,7 +56,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 @@ -72,7 +72,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 @@ -102,7 +102,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 \ @@ -125,7 +125,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 \ @@ -139,7 +139,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 \ @@ -155,7 +155,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 2fb5ea061f..ac70e88008 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-fw-a kmod-ltq-atm-danube \ kmod-ltq-deu-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 endef TARGET_DEVICES += bt_homehub-v2b @@ -213,7 +213,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 2f9fa7b97f..eb0fff2072 100644 --- a/target/linux/lantiq/image/tp-link.mk +++ b/target/linux/lantiq/image/tp-link.mk @@ -20,7 +20,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 endef TARGET_DEVICES += tplink_tdw8970 @@ -33,7 +33,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 endef TARGET_DEVICES += tplink_tdw8980 @@ -46,7 +46,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 @@ -59,7 +59,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 167c57c7c4..1ccd1e1846 100644 --- a/target/linux/lantiq/image/vr9.mk +++ b/target/linux/lantiq/image/vr9.mk @@ -43,7 +43,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 @@ -56,7 +56,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 @@ -73,7 +73,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 @@ -86,7 +86,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 @@ -101,7 +101,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 @@ -122,7 +122,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 @@ -133,7 +133,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 @@ -144,7 +144,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 @@ -155,7 +155,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 @@ -164,7 +164,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 @@ -175,7 +175,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 @@ -184,7 +184,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 @@ -209,7 +209,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 @@ -221,7 +221,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 SUPPORTED_DEVICES += P2812HNUF3 endef TARGET_DEVICES += zyxel_p-2812hnu-f3 diff --git a/target/linux/lantiq/image/xway_legacy.mk b/target/linux/lantiq/image/xway_legacy.mk index 52a29ab2f0..03294874eb 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 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 c71f34d109..e0732a811a 100644 --- a/target/linux/malta/Makefile +++ b/target/linux/malta/Makefile @@ -18,6 +18,6 @@ KERNEL_PATCHVER:=4.14 include $(INCLUDE_DIR)/target.mk -DEFAULT_PACKAGES += wpad-basic kmod-mac80211-hwsim kmod-pcnet32 +DEFAULT_PACKAGES += wpad-basic-openssl kmod-mac80211-hwsim kmod-pcnet32 $(eval $(call BuildTarget)) diff --git a/target/linux/mediatek/Makefile b/target/linux/mediatek/Makefile index 4d7df98520..7359a5408a 100644 --- a/target/linux/mediatek/Makefile +++ b/target/linux/mediatek/Makefile @@ -14,6 +14,6 @@ KERNEL_PATCHVER:=4.19 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += \ kmod-mt76 kmod-leds-gpio kmod-gpio-button-hotplug \ - wpad-basic + wpad-basic-openssl $(eval $(call BuildTarget)) diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile index 9db478d87b..c03a1fc935 100644 --- a/target/linux/mpc85xx/Makefile +++ b/target/linux/mpc85xx/Makefile @@ -23,6 +23,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/cortex-a9.mk b/target/linux/mvebu/image/cortex-a9.mk index 2107c55f02..63ed26e756 100644 --- a/target/linux/mvebu/image/cortex-a9.mk +++ b/target/linux/mvebu/image/cortex-a9.mk @@ -11,7 +11,7 @@ ifeq ($(SUBTARGET),cortexa9) define Device/linksys $(Device/NAND-128K) DEVICE_TITLE := Linksys $(1) - DEVICE_PACKAGES := kmod-mwlwifi swconfig wpad-basic + DEVICE_PACKAGES := kmod-mwlwifi swconfig wpad-basic-openssl IMAGES += factory.img KERNEL_SIZE := 6144k endef @@ -172,7 +172,7 @@ define Device/cznic_turris-omnia DEVICE_TITLE := Turris Omnia DEVICE_PACKAGES := \ mkf2fs e2fsprogs kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 \ - wpad-basic 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-core kmod-i2c-mux 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-img | sdcard-img | gzip | append-metadata diff --git a/target/linux/omap/profiles/00-default.mk b/target/linux/omap/profiles/00-default.mk index 37c0761029..f5632ef98f 100644 --- a/target/linux/omap/profiles/00-default.mk +++ b/target/linux/omap/profiles/00-default.mk @@ -12,7 +12,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/orion/Makefile b/target/linux/orion/Makefile index 994c37ea6a..c351c0dc30 100644 --- a/target/linux/orion/Makefile +++ b/target/linux/orion/Makefile @@ -19,6 +19,6 @@ include $(INCLUDE_DIR)/target.mk KERNELNAME:=zImage -DEFAULT_PACKAGES += kmod-ath9k wpad-basic kmod-rtc-isl1208 uboot-envtools +DEFAULT_PACKAGES += kmod-ath9k wpad-basic-openssl kmod-rtc-isl1208 uboot-envtools $(eval $(call BuildTarget)) diff --git a/target/linux/oxnas/image/ox820.mk b/target/linux/oxnas/image/ox820.mk index 7a3b8582a6..f090ba18fe 100644 --- a/target/linux/oxnas/image/ox820.mk +++ b/target/linux/oxnas/image/ox820.mk @@ -48,7 +48,7 @@ TARGET_DEVICES += akitio_mycloud define Device/cloudengines_pogoplugpro DEVICE_TITLE := Cloud Engines PogoPlug Pro (with mPCIe) SUPPORTED_DEVICES += pogoplug-pro - DEVICE_PACKAGES := kmod-usb2-oxnas kmod-usb-ledtrig-usbport kmod-rt2800-pci wpad-basic + DEVICE_PACKAGES := kmod-usb2-oxnas kmod-usb-ledtrig-usbport kmod-rt2800-pci wpad-basic-openssl endef TARGET_DEVICES += cloudengines_pogoplugpro diff --git a/target/linux/ramips/rt288x/target.mk b/target/linux/ramips/rt288x/target.mk index 11b5a0b520..4ea3214cb2 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-mini +DEFAULT_PACKAGES += kmod-rt2800-soc wpad-basic-openssl 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 e36fa637b1..1b157cb4f7 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-mini +DEFAULT_PACKAGES += kmod-rt2800-soc wpad-basic-openssl 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 2cc19858e4..b2d3bd5365 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-mini +DEFAULT_PACKAGES += kmod-rt2800-pci kmod-rt2800-soc wpad-basic-openssl define Target/Description Build firmware images for Ralink RT3662/RT3883 based boards. diff --git a/target/linux/rb532/Makefile b/target/linux/rb532/Makefile index 5aa8a6dc55..e29997b86e 100644 --- a/target/linux/rb532/Makefile +++ b/target/linux/rb532/Makefile @@ -16,6 +16,6 @@ KERNEL_PATCHVER:=4.14 include $(INCLUDE_DIR)/target.mk -DEFAULT_PACKAGES += wpad-basic kmod-ath5k kmod-input-rb532 e2fsprogs mkf2fs nand-utils +DEFAULT_PACKAGES += wpad-basic-openssl kmod-ath5k kmod-input-rb532 e2fsprogs mkf2fs nand-utils $(eval $(call BuildTarget)) diff --git a/target/linux/sunxi/image/cortex-a53.mk b/target/linux/sunxi/image/cortex-a53.mk index c5bc5ed59b..337aef3e2d 100644 --- a/target/linux/sunxi/image/cortex-a53.mk +++ b/target/linux/sunxi/image/cortex-a53.mk @@ -32,7 +32,7 @@ define Device/friendlyarm_nanopi-r1s-h5 DEVICE_VENDOR := FriendlyARM DEVICE_MODEL := Nanopi R1S H5 DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-rtl8189es \ - kmod-usb-net kmod-usb-net-rtl8152 wpad-basic + kmod-usb-net kmod-usb-net-rtl8152 wpad-basic-openssl SUPPORTED_DEVICES:=nanopi-r1s-h5 SUNXI_DTS_DIR := allwinner/ SOC := sun50i-h5 diff --git a/target/linux/sunxi/image/cortex-a7.mk b/target/linux/sunxi/image/cortex-a7.mk index 34ed5e5bd8..a1d725f5d9 100644 --- a/target/linux/sunxi/image/cortex-a7.mk +++ b/target/linux/sunxi/image/cortex-a7.mk @@ -26,7 +26,7 @@ define Device/friendlyarm_nanopi-m1-plus DEVICE_VENDOR := FriendlyARM DEVICE_MODEL := NanoPi M1 Plus DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-leds-gpio kmod-ledtrig-heartbeat \ - kmod-brcmfmac cypress-firmware-43430-sdio wpad-basic + kmod-brcmfmac cypress-firmware-43430-sdio wpad-basic-openssl SOC := sun8i-h3 endef TARGET_DEVICES += friendlyarm_nanopi-m1-plus @@ -42,7 +42,7 @@ define Device/friendlyarm_nanopi-neo-air DEVICE_VENDOR := FriendlyARM DEVICE_MODEL := NanoPi NEO Air DEVICE_PACKAGES := kmod-rtc-sunxi kmod-leds-gpio kmod-ledtrig-heartbeat \ - kmod-brcmfmac cypress-firmware-43430-sdio wpad-basic + kmod-brcmfmac cypress-firmware-43430-sdio wpad-basic-openssl SOC := sun8i-h3 endef TARGET_DEVICES += friendlyarm_nanopi-neo-air @@ -51,7 +51,7 @@ define Device/friendlyarm_nanopi-r1 DEVICE_VENDOR := FriendlyARM DEVICE_MODEL := NanoPi R1 DEVICE_PACKAGES := kmod-rtc-sunxi kmod-leds-gpio kmod-ledtrig-heartbeat \ - kmod-brcmfmac cypress-firmware-43430-sdio wpad-basic \ + kmod-brcmfmac cypress-firmware-43430-sdio wpad-basic-openssl \ kmod-usb-net kmod-usb-net-rtl8152 SOC := sun8i-h3 endef @@ -60,7 +60,7 @@ TARGET_DEVICES += friendlyarm_nanopi-r1 define Device/lamobo_lamobo-r1 DEVICE_VENDOR := Lamobo DEVICE_MODEL := Lamobo R1 - DEVICE_PACKAGES:=kmod-ata-sunxi kmod-rtl8192cu swconfig wpad-basic + DEVICE_PACKAGES:=kmod-ata-sunxi kmod-rtl8192cu swconfig wpad-basic-openssl SOC := sun7i-a20 endef TARGET_DEVICES += lamobo_lamobo-r1 @@ -143,7 +143,7 @@ define Device/sinovoip_bananapi-m2-plus DEVICE_VENDOR := Sinovoip DEVICE_MODEL := Banana Pi M2+ DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-leds-gpio kmod-ledtrig-heartbeat \ - kmod-brcmfmac brcmfmac-firmware-43430a0-sdio wpad-basic + kmod-brcmfmac 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 101769cf7b..4e10174d84 100644 --- a/target/linux/sunxi/profiles/00-default.mk +++ b/target/linux/sunxi/profiles/00-default.mk @@ -17,7 +17,7 @@ define Profile/Default kmod-sun4i-emac \ rtl8188eu-firmware \ swconfig \ - wpad-basic + wpad-basic-openssl PRIORITY := 1 endef diff --git a/target/linux/tegra/image/Makefile b/target/linux/tegra/image/Makefile index a450a058e0..39ce9d1bd8 100644 --- a/target/linux/tegra/image/Makefile +++ b/target/linux/tegra/image/Makefile @@ -48,7 +48,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-mini + 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 1962249c48..947cfeb05d 100644 --- a/target/linux/uml/Makefile +++ b/target/linux/uml/Makefile @@ -34,7 +34,7 @@ endef LINUX_TARGET_CONFIG:=$(CURDIR)/config/$(ARCH) -DEFAULT_PACKAGES += wpad-basic kmod-mac80211-hwsim mkf2fs e2fsprogs +DEFAULT_PACKAGES += wpad-basic-openssl kmod-mac80211-hwsim mkf2fs e2fsprogs endif From ce30363cd91acf99dcd9925def9415c7bb7115e6 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Fri, 27 May 2022 16:33:15 +0800 Subject: [PATCH 16/22] rtl8188eu: fix build on kernel 4.9 Signed-off-by: Tianling Shen --- package/kernel/rtl8188eu/Makefile | 9 +-- .../patches/030-fix-build-newer-k4.9.patch | 70 +++++++++++++++++++ 2 files changed, 73 insertions(+), 6 deletions(-) create mode 100644 package/kernel/rtl8188eu/patches/030-fix-build-newer-k4.9.patch diff --git a/package/kernel/rtl8188eu/Makefile b/package/kernel/rtl8188eu/Makefile index 05b6722b1e..fce85be0d7 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/rtl8188eu/patches/030-fix-build-newer-k4.9.patch b/package/kernel/rtl8188eu/patches/030-fix-build-newer-k4.9.patch new file mode 100644 index 0000000000..5f8168065b --- /dev/null +++ b/package/kernel/rtl8188eu/patches/030-fix-build-newer-k4.9.patch @@ -0,0 +1,70 @@ +diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c +index fb8a2cf..b4924f6 100644 +--- a/os_dep/linux/ioctl_cfg80211.c ++++ b/os_dep/linux/ioctl_cfg80211.c +@@ -1022,7 +1022,7 @@ void rtw_cfg80211_indicate_connect(_adapter *padapter) + #endif + struct cfg80211_bss *bss = NULL; + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10 ,0) + struct cfg80211_roam_info roam_info ={}; + #endif + +@@ -1090,7 +1090,7 @@ check_bss: + struct ieee80211_channel *notify_channel; + u32 freq; + u16 channel = cur_network->network.Configuration.DSConfig; +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)) || LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0) + struct cfg80211_roam_info roam_info; + #endif + +@@ -1098,7 +1098,7 @@ check_bss: + notify_channel = ieee80211_get_channel(wiphy, freq); + #endif + +- #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0) + roam_info.bssid = cur_network->network.MacAddress; + roam_info.req_ie = pmlmepriv->assoc_req + sizeof(struct rtw_ieee80211_hdr_3addr) + 2; + roam_info.req_ie_len = pmlmepriv->assoc_req_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 2; +@@ -1117,7 +1117,7 @@ check_bss: + , pmlmepriv->assoc_rsp + sizeof(struct rtw_ieee80211_hdr_3addr) + 6 + , pmlmepriv->assoc_rsp_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 6 + , GFP_ATOMIC); +- #endif /*LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)*/ ++ #endif /*LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0)*/ + + RTW_INFO(FUNC_ADPT_FMT" call cfg80211_roamed\n", FUNC_ADPT_ARG(padapter)); + +@@ -2292,7 +2292,8 @@ enum nl80211_iftype { + static int cfg80211_rtw_change_iface(struct wiphy *wiphy, + struct net_device *ndev, + enum nl80211_iftype type, +-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) && \ ++ !LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0) + u32 *flags, + #endif + struct vif_params *params) +@@ -4537,7 +4538,8 @@ static int + unsigned char name_assign_type, + #endif + enum nl80211_iftype type, +- #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) ++ #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) && \ ++ !LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0) + u32 *flags, + #endif + struct vif_params *params) +@@ -9146,7 +9148,8 @@ static void rtw_cfg80211_preinit_wiphy(_adapter *adapter, struct wiphy *wiphy) + #endif + + #if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0) && \ +- LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) ++ LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) && \ ++ !LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0) + wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN; + #ifdef CONFIG_PNO_SUPPORT + wiphy->max_sched_scan_ssids = MAX_PNO_LIST_COUNT; From 00cd325b19d7c46bd64403d8f0a4cd9fc0bdfb07 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Fri, 27 May 2022 16:39:57 +0800 Subject: [PATCH 17/22] rtl8189es: fix build on kernel 4.9 Signed-off-by: Tianling Shen --- package/kernel/rtl8189es/Makefile | 9 ++-- .../patches/020-fix-build-newer-k4.9.patch | 51 +++++++++++++++++++ 2 files changed, 54 insertions(+), 6 deletions(-) create mode 100644 package/kernel/rtl8189es/patches/020-fix-build-newer-k4.9.patch diff --git a/package/kernel/rtl8189es/Makefile b/package/kernel/rtl8189es/Makefile index 006a151571..09a70e8ddc 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/rtl8189es/patches/020-fix-build-newer-k4.9.patch b/package/kernel/rtl8189es/patches/020-fix-build-newer-k4.9.patch new file mode 100644 index 0000000000..c631f84481 --- /dev/null +++ b/package/kernel/rtl8189es/patches/020-fix-build-newer-k4.9.patch @@ -0,0 +1,51 @@ +diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c +index 0fc6fbd..bc883ab 100644 +--- a/os_dep/linux/ioctl_cfg80211.c ++++ b/os_dep/linux/ioctl_cfg80211.c +@@ -797,7 +797,7 @@ check_bss: + struct ieee80211_channel *notify_channel; + u32 freq; + u16 channel = cur_network->network.Configuration.DSConfig; +- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)) ++ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)) || LINUX_VERSION_IN_RANGE(4,9,255, 4,10,0) + struct cfg80211_roam_info roam_info = {}; + #endif + +@@ -806,7 +806,7 @@ check_bss: + #endif + + DBG_871X(FUNC_ADPT_FMT" call cfg80211_roamed\n", FUNC_ADPT_ARG(padapter)); +- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)) ++ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)) || LINUX_VERSION_IN_RANGE(4,9,255, 4,10,0) + roam_info.channel = notify_channel; + roam_info.bssid = cur_network->network.MacAddress; + roam_info.req_ie = +@@ -1889,7 +1889,8 @@ enum nl80211_iftype { + static int cfg80211_rtw_change_iface(struct wiphy *wiphy, + struct net_device *ndev, + enum nl80211_iftype type, +- #if (LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0)) ++ #if (LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0)) && \ ++ !LINUX_VERSION_IN_RANGE(4,9,255, 4,10,0) + u32 *flags, + #endif + struct vif_params *params) +@@ -4009,7 +4010,8 @@ static int + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)) + unsigned char name_assign_type, + #endif +- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)) ++ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)) || \ ++ LINUX_VERSION_IN_RANGE(4,9,255, 4,10,0) + enum nl80211_iftype type, struct vif_params *params) + #else + enum nl80211_iftype type, u32 *flags, struct vif_params *params) +@@ -6414,7 +6416,7 @@ static void rtw_cfg80211_preinit_wiphy(_adapter *adapter, struct wiphy *wiphy) + #endif + + #if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0)) +-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0)) ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0)) && !LINUX_VERSION_IN_RANGE(4,9,255, 4,10,0) + wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN; + #else // KERNEL_VERSION >= 4.12 + wiphy->max_sched_scan_reqs = 1; From afe6cd32546c753541c995a7a149a33e2c400325 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Fri, 27 May 2022 16:44:01 +0800 Subject: [PATCH 18/22] rtl8192eu: fix build on kernel 4.9 Signed-off-by: Tianling Shen --- package/kernel/rtl8192eu/Makefile | 9 +-- .../patches/030-fix-build-newer-k4.9.patch | 61 +++++++++++++++++++ 2 files changed, 64 insertions(+), 6 deletions(-) create mode 100644 package/kernel/rtl8192eu/patches/030-fix-build-newer-k4.9.patch diff --git a/package/kernel/rtl8192eu/Makefile b/package/kernel/rtl8192eu/Makefile index d22e858d3e..cdbef84425 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/rtl8192eu/patches/030-fix-build-newer-k4.9.patch b/package/kernel/rtl8192eu/patches/030-fix-build-newer-k4.9.patch new file mode 100644 index 0000000000..27ce9cdc97 --- /dev/null +++ b/package/kernel/rtl8192eu/patches/030-fix-build-newer-k4.9.patch @@ -0,0 +1,61 @@ +diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c +index 70f6434..127ee8a 100644 +--- a/os_dep/linux/ioctl_cfg80211.c ++++ b/os_dep/linux/ioctl_cfg80211.c +@@ -1050,7 +1050,7 @@ void rtw_cfg80211_indicate_connect(_adapter *padapter) + #ifdef CONFIG_P2P + struct wifidirect_info *pwdinfo = &(padapter->wdinfo); + #endif +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0) + struct cfg80211_roam_info roam_info ={}; + #endif + +@@ -1123,7 +1123,7 @@ check_bss: + notify_channel = ieee80211_get_channel(wiphy, freq); + #endif + +- #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0) + roam_info.bssid = cur_network->network.MacAddress; + roam_info.req_ie = pmlmepriv->assoc_req + sizeof(struct rtw_ieee80211_hdr_3addr) + 2; + roam_info.req_ie_len = pmlmepriv->assoc_req_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 2; +@@ -1142,7 +1142,7 @@ check_bss: + , pmlmepriv->assoc_rsp + sizeof(struct rtw_ieee80211_hdr_3addr) + 6 + , pmlmepriv->assoc_rsp_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 6 + , GFP_ATOMIC); +- #endif /*LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)*/ ++ #endif /*LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0)*/ + + RTW_INFO(FUNC_ADPT_FMT" call cfg80211_roamed\n", FUNC_ADPT_ARG(padapter)); + +@@ -2326,7 +2326,8 @@ enum nl80211_iftype { + static int cfg80211_rtw_change_iface(struct wiphy *wiphy, + struct net_device *ndev, + enum nl80211_iftype type, +-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) && \ ++ !LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0) + u32 *flags, + #endif + struct vif_params *params) +@@ -4741,7 +4742,8 @@ static int + unsigned char name_assign_type, + #endif + enum nl80211_iftype type, +- #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) ++ #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) && \ ++ !LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0) + u32 *flags, + #endif + struct vif_params *params) +@@ -9536,7 +9538,8 @@ static void rtw_cfg80211_preinit_wiphy(_adapter *adapter, struct wiphy *wiphy) + #endif + + #if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0) && \ +- LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) ++ LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) && \ ++ !LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0) + wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN; + #ifdef CONFIG_PNO_SUPPORT + wiphy->max_sched_scan_ssids = MAX_PNO_LIST_COUNT; From d73dca503cdf62fb446cb4493566b0309ae8beff Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Fri, 27 May 2022 16:52:00 +0800 Subject: [PATCH 19/22] rtl8812au-ac: fix build on kernel 4.9 Signed-off-by: Tianling Shen --- package/kernel/rtl8812au-ac/Makefile | 10 +--- .../patches/040-fix-build-newer-k4.9.patch | 60 +++++++++++++++++++ 2 files changed, 63 insertions(+), 7 deletions(-) create mode 100644 package/kernel/rtl8812au-ac/patches/040-fix-build-newer-k4.9.patch diff --git a/package/kernel/rtl8812au-ac/Makefile b/package/kernel/rtl8812au-ac/Makefile index 520be3ff1a..7f9cb67007 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/rtl8812au-ac/patches/040-fix-build-newer-k4.9.patch b/package/kernel/rtl8812au-ac/patches/040-fix-build-newer-k4.9.patch new file mode 100644 index 0000000000..7b22dc066a --- /dev/null +++ b/package/kernel/rtl8812au-ac/patches/040-fix-build-newer-k4.9.patch @@ -0,0 +1,60 @@ +diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c +index e9f4ba9..0800861 100644 +--- a/os_dep/linux/ioctl_cfg80211.c ++++ b/os_dep/linux/ioctl_cfg80211.c +@@ -1071,7 +1071,7 @@ void rtw_cfg80211_indicate_connect(_adapter *padapter) + #ifdef CONFIG_P2P + struct wifidirect_info *pwdinfo = &(padapter->wdinfo); + #endif +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0) + struct cfg80211_roam_info roam_info ={}; + #endif + +@@ -1144,7 +1144,7 @@ check_bss: + notify_channel = ieee80211_get_channel(wiphy, freq); + #endif + +- #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0) + roam_info.bssid = cur_network->network.MacAddress; + roam_info.req_ie = pmlmepriv->assoc_req + sizeof(struct rtw_ieee80211_hdr_3addr) + 2; + roam_info.req_ie_len = pmlmepriv->assoc_req_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 2; +@@ -1163,7 +1163,7 @@ check_bss: + , pmlmepriv->assoc_rsp + sizeof(struct rtw_ieee80211_hdr_3addr) + 6 + , pmlmepriv->assoc_rsp_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 6 + , GFP_ATOMIC); +- #endif /*LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)*/ ++ #endif /*LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0)*/ + + RTW_INFO(FUNC_ADPT_FMT" call cfg80211_roamed\n", FUNC_ADPT_ARG(padapter)); + +@@ -2404,7 +2404,8 @@ extern int netdev_if2_open(struct net_device *pnetdev); + static int cfg80211_rtw_change_iface(struct wiphy *wiphy, + struct net_device *ndev, + enum nl80211_iftype type, +-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) && \ ++ !LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0) + u32 *flags, + #endif + struct vif_params *params) +@@ -4852,7 +4853,8 @@ static int + unsigned char name_assign_type, + #endif + enum nl80211_iftype type, +- #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) ++ #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) && \ ++ !LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0) + u32 *flags, + #endif + struct vif_params *params) +@@ -9745,7 +9747,7 @@ struct ieee80211_supported_band *band; + #endif + + #if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0)) +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)) || LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0) + wiphy->max_sched_scan_reqs = 1; + #else + wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN; From bd501b42e79685f0c6b6701dc17dbaf3d3ba34c4 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Fri, 27 May 2022 16:55:46 +0800 Subject: [PATCH 20/22] rtl8821cu: fix build on kernel 4.9 Signed-off-by: Tianling Shen --- package/kernel/rtl8821cu/Makefile | 12 ++-- .../patches/050-fix-build-newer-k4.9.patch | 61 +++++++++++++++++++ 2 files changed, 65 insertions(+), 8 deletions(-) create mode 100644 package/kernel/rtl8821cu/patches/050-fix-build-newer-k4.9.patch diff --git a/package/kernel/rtl8821cu/Makefile b/package/kernel/rtl8821cu/Makefile index 624d03c544..87fe3b3b74 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/rtl8821cu/patches/050-fix-build-newer-k4.9.patch b/package/kernel/rtl8821cu/patches/050-fix-build-newer-k4.9.patch new file mode 100644 index 0000000000..8adaa2d84b --- /dev/null +++ b/package/kernel/rtl8821cu/patches/050-fix-build-newer-k4.9.patch @@ -0,0 +1,61 @@ +diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c +index d9c81c9..0495ac3 100755 +--- a/os_dep/linux/ioctl_cfg80211.c ++++ b/os_dep/linux/ioctl_cfg80211.c +@@ -1011,7 +1011,7 @@ void rtw_cfg80211_indicate_connect(_adapter *padapter) + #ifdef CONFIG_P2P + struct wifidirect_info *pwdinfo = &(padapter->wdinfo); + #endif +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0) + struct cfg80211_roam_info roam_info ={}; + #endif + +@@ -1084,7 +1084,7 @@ check_bss: + notify_channel = ieee80211_get_channel(wiphy, freq); + #endif + +- #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0) + roam_info.bssid = cur_network->network.MacAddress; + roam_info.req_ie = pmlmepriv->assoc_req + sizeof(struct rtw_ieee80211_hdr_3addr) + 2; + roam_info.req_ie_len = pmlmepriv->assoc_req_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 2; +@@ -1103,7 +1103,7 @@ check_bss: + , pmlmepriv->assoc_rsp + sizeof(struct rtw_ieee80211_hdr_3addr) + 6 + , pmlmepriv->assoc_rsp_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 6 + , GFP_ATOMIC); +- #endif /*LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)*/ ++ #endif /*LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0)*/ + + RTW_INFO(FUNC_ADPT_FMT" call cfg80211_roamed\n", FUNC_ADPT_ARG(padapter)); + +@@ -2276,7 +2276,8 @@ enum nl80211_iftype { + static int cfg80211_rtw_change_iface(struct wiphy *wiphy, + struct net_device *ndev, + enum nl80211_iftype type, +-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) && \ ++ !LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0) + u32 *flags, + #endif + struct vif_params *params) +@@ -4594,7 +4595,8 @@ static int + unsigned char name_assign_type, + #endif + enum nl80211_iftype type, +- #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) ++ #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) && \ ++ !LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0) + u32 *flags, + #endif + struct vif_params *params) +@@ -9150,7 +9152,8 @@ static void rtw_cfg80211_preinit_wiphy(_adapter *adapter, struct wiphy *wiphy) + #endif + + #if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0) && \ +- LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) ++ LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) && \ ++ !LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0) + wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN; + #ifdef CONFIG_PNO_SUPPORT + wiphy->max_sched_scan_ssids = MAX_PNO_LIST_COUNT; From e717229d7f7752ac3b5e3de14606ff2bbbe92f27 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Fri, 27 May 2022 16:58:57 +0800 Subject: [PATCH 21/22] rtl88x2bu: fix build on kernel 4.9 Signed-off-by: Tianling Shen --- package/kernel/rtl88x2bu/Makefile | 10 +-- .../patches/030-fix-build-newer-k4.9.patch | 61 +++++++++++++++++++ 2 files changed, 64 insertions(+), 7 deletions(-) create mode 100644 package/kernel/rtl88x2bu/patches/030-fix-build-newer-k4.9.patch diff --git a/package/kernel/rtl88x2bu/Makefile b/package/kernel/rtl88x2bu/Makefile index 6f283a666c..c6ca3d66e4 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/kernel/rtl88x2bu/patches/030-fix-build-newer-k4.9.patch b/package/kernel/rtl88x2bu/patches/030-fix-build-newer-k4.9.patch new file mode 100644 index 0000000000..220266d7c5 --- /dev/null +++ b/package/kernel/rtl88x2bu/patches/030-fix-build-newer-k4.9.patch @@ -0,0 +1,61 @@ +diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c +index 10c30d7..3f74e6f 100644 +--- a/os_dep/linux/ioctl_cfg80211.c ++++ b/os_dep/linux/ioctl_cfg80211.c +@@ -1086,7 +1086,7 @@ int rtw_cfg80211_indicate_connect(_adapter *padapter) + #ifdef CONFIG_P2P + struct wifidirect_info *pwdinfo = &(padapter->wdinfo); + #endif +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0) + struct cfg80211_roam_info roam_info ={}; + #endif + +@@ -1170,7 +1170,7 @@ check_bss: + notify_channel = ieee80211_get_channel(wiphy, freq); + #endif + +- #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0) + roam_info.bssid = cur_network->network.MacAddress; + roam_info.req_ie = pmlmepriv->assoc_req + sizeof(struct rtw_ieee80211_hdr_3addr) + 2; + roam_info.req_ie_len = pmlmepriv->assoc_req_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 2; +@@ -1189,7 +1189,7 @@ check_bss: + , pmlmepriv->assoc_rsp + sizeof(struct rtw_ieee80211_hdr_3addr) + 6 + , pmlmepriv->assoc_rsp_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 6 + , GFP_ATOMIC); +- #endif /*LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)*/ ++ #endif /*LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0)*/ + + RTW_INFO(FUNC_ADPT_FMT" call cfg80211_roamed\n", FUNC_ADPT_ARG(padapter)); + +@@ -2379,7 +2379,8 @@ enum nl80211_iftype { + static int cfg80211_rtw_change_iface(struct wiphy *wiphy, + struct net_device *ndev, + enum nl80211_iftype type, +-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) && \ ++ !LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0) + u32 *flags, + #endif + struct vif_params *params) +@@ -4983,7 +4984,8 @@ static int + unsigned char name_assign_type, + #endif + enum nl80211_iftype type, +- #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) ++ #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) && \ ++ !LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0) + u32 *flags, + #endif + struct vif_params *params) +@@ -9866,7 +9868,8 @@ static void rtw_cfg80211_preinit_wiphy(_adapter *adapter, struct wiphy *wiphy) + #endif + + #if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0) && \ +- LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) ++ LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) && \ ++ !LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0) + wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN; + #ifdef CONFIG_PNO_SUPPORT + wiphy->max_sched_scan_ssids = MAX_PNO_LIST_COUNT; From cf3914cafefb118d323cd233733f8ce87d70e217 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Fri, 27 May 2022 23:40:09 +0800 Subject: [PATCH 22/22] kernel: bump to 4.9.316, 4.14.281, 4.19.245 Refreshed all patches. Signed-off-by: Tianling Shen --- include/kernel-version.mk | 12 ++++++------ ...0-net-bridge-add-support-for-port-isolation.patch | 2 +- .../090-net-generalize-napi_complete_done.patch | 4 ++-- .../640-bridge-only-accept-EAP-locally.patch | 2 +- .../640-bridge-only-accept-EAP-locally.patch | 2 +- ...50-bridge_allow_receiption_on_disabled_port.patch | 4 ++-- ...50-bridge_allow_receiption_on_disabled_port.patch | 4 ++-- ...0051-MIPS-lantiq-improve-USB-initialization.patch | 2 +- ...xrx200-add-gphy-clk-src-device-tree-binding.patch | 4 ++-- .../707-dpaa-ethernet-support-layerscape.patch | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index f8fe610d11..cf78487424 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,13 +6,13 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.9 = .313 -LINUX_VERSION-4.14 = .278 -LINUX_VERSION-4.19 = .242 +LINUX_VERSION-4.9 = .316 +LINUX_VERSION-4.14 = .281 +LINUX_VERSION-4.19 = .245 -LINUX_KERNEL_HASH-4.9.313 = e03b777861fae559cb7ed635500cde305bc2ca34dee4dc2fe806de0060c87bdc -LINUX_KERNEL_HASH-4.14.278 = 3cd6d4eeb3a5d1c906b35c08f0d602f329410c291233bee1a7a2b168c7378bbe -LINUX_KERNEL_HASH-4.19.242 = 59bcfd094ec26b03ca506199224cff53c13325e62d22bd4e31ef4ccafe7265a2 +LINUX_KERNEL_HASH-4.9.316 = 57b698920b2c66b2615d0aa3fd551084560fee901552aff6d89d3553653bcd17 +LINUX_KERNEL_HASH-4.14.281 = 3ae2f9c6966b9b19d27de7d84a4b1697df84a9658c34b850a51673266a583b5e +LINUX_KERNEL_HASH-4.19.245 = 99fddd6027ce924abe9f0435027fc517983b0399787efa44d0bac26e22c3a8e8 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/generic/backport-4.14/090-net-bridge-add-support-for-port-isolation.patch b/target/linux/generic/backport-4.14/090-net-bridge-add-support-for-port-isolation.patch index 483881f35d..a4fbc9c547 100644 --- a/target/linux/generic/backport-4.14/090-net-bridge-add-support-for-port-isolation.patch +++ b/target/linux/generic/backport-4.14/090-net-bridge-add-support-for-port-isolation.patch @@ -42,7 +42,7 @@ Signed-off-by: David S. Miller int br_dev_queue_push_xmit(struct net *net, struct sock *sk, struct sk_buff *skb) --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c -@@ -170,6 +170,7 @@ int br_handle_frame_finish(struct net *n +@@ -177,6 +177,7 @@ int br_handle_frame_finish(struct net *n goto drop; BR_INPUT_SKB_CB(skb)->brdev = br->dev; diff --git a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch index 82a00543f1..81e77e15e1 100644 --- a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch +++ b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch @@ -1304,7 +1304,7 @@ Signed-off-by: David S. Miller adapter->rx_last_jiffies = jiffies; --- a/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/drivers/net/vmxnet3/vmxnet3_drv.c -@@ -1873,7 +1873,7 @@ vmxnet3_poll(struct napi_struct *napi, i +@@ -1879,7 +1879,7 @@ vmxnet3_poll(struct napi_struct *napi, i rxd_done = vmxnet3_do_poll(rx_queue->adapter, budget); if (rxd_done < budget) { @@ -1313,7 +1313,7 @@ Signed-off-by: David S. Miller vmxnet3_enable_all_intrs(rx_queue->adapter); } return rxd_done; -@@ -1904,7 +1904,7 @@ vmxnet3_poll_rx_only(struct napi_struct +@@ -1910,7 +1910,7 @@ vmxnet3_poll_rx_only(struct napi_struct rxd_done = vmxnet3_rq_rx_complete(rq, adapter, budget); if (rxd_done < budget) { diff --git a/target/linux/generic/hack-4.14/640-bridge-only-accept-EAP-locally.patch b/target/linux/generic/hack-4.14/640-bridge-only-accept-EAP-locally.patch index 0dbb8ee3c0..25866a16e1 100644 --- a/target/linux/generic/hack-4.14/640-bridge-only-accept-EAP-locally.patch +++ b/target/linux/generic/hack-4.14/640-bridge-only-accept-EAP-locally.patch @@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c -@@ -166,10 +166,14 @@ int br_handle_frame_finish(struct net *n +@@ -173,10 +173,14 @@ int br_handle_frame_finish(struct net *n } } diff --git a/target/linux/generic/hack-4.19/640-bridge-only-accept-EAP-locally.patch b/target/linux/generic/hack-4.19/640-bridge-only-accept-EAP-locally.patch index f77a1965ca..89c74b3dde 100644 --- a/target/linux/generic/hack-4.19/640-bridge-only-accept-EAP-locally.patch +++ b/target/linux/generic/hack-4.19/640-bridge-only-accept-EAP-locally.patch @@ -12,7 +12,7 @@ Signed-off-by: Etienne Champetier --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c -@@ -108,10 +108,14 @@ int br_handle_frame_finish(struct net *n +@@ -115,10 +115,14 @@ int br_handle_frame_finish(struct net *n } } diff --git a/target/linux/generic/pending-4.14/150-bridge_allow_receiption_on_disabled_port.patch b/target/linux/generic/pending-4.14/150-bridge_allow_receiption_on_disabled_port.patch index 4a53161477..de629c03a1 100644 --- a/target/linux/generic/pending-4.14/150-bridge_allow_receiption_on_disabled_port.patch +++ b/target/linux/generic/pending-4.14/150-bridge_allow_receiption_on_disabled_port.patch @@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c -@@ -237,7 +237,10 @@ static void __br_handle_local_finish(str +@@ -244,7 +244,10 @@ static void __br_handle_local_finish(str /* note: already called with rcu_read_lock */ static int br_handle_local_finish(struct net *net, struct sock *sk, struct sk_buff *skb) { @@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau /* return 1 to signal the okfn() was called so it's ok to use the skb */ return 1; -@@ -332,6 +335,15 @@ rx_handler_result_t br_handle_frame(stru +@@ -339,6 +342,15 @@ rx_handler_result_t br_handle_frame(stru forward: switch (p->state) { diff --git a/target/linux/generic/pending-4.19/150-bridge_allow_receiption_on_disabled_port.patch b/target/linux/generic/pending-4.19/150-bridge_allow_receiption_on_disabled_port.patch index 583c34a448..497b050ad7 100644 --- a/target/linux/generic/pending-4.19/150-bridge_allow_receiption_on_disabled_port.patch +++ b/target/linux/generic/pending-4.19/150-bridge_allow_receiption_on_disabled_port.patch @@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c -@@ -193,6 +193,9 @@ static void __br_handle_local_finish(str +@@ -200,6 +200,9 @@ static void __br_handle_local_finish(str /* note: already called with rcu_read_lock */ static int br_handle_local_finish(struct net *net, struct sock *sk, struct sk_buff *skb) { @@ -25,7 +25,7 @@ Signed-off-by: Felix Fietkau __br_handle_local_finish(skb); /* return 1 to signal the okfn() was called so it's ok to use the skb */ -@@ -289,6 +292,17 @@ rx_handler_result_t br_handle_frame(stru +@@ -296,6 +299,17 @@ rx_handler_result_t br_handle_frame(stru forward: switch (p->state) { diff --git a/target/linux/lantiq/patches-4.19/0051-MIPS-lantiq-improve-USB-initialization.patch b/target/linux/lantiq/patches-4.19/0051-MIPS-lantiq-improve-USB-initialization.patch index a7bdafd704..26c13c8080 100644 --- a/target/linux/lantiq/patches-4.19/0051-MIPS-lantiq-improve-USB-initialization.patch +++ b/target/linux/lantiq/patches-4.19/0051-MIPS-lantiq-improve-USB-initialization.patch @@ -41,7 +41,7 @@ Signed-off-by: Hauke Mehrtens /* the pci enable helper */ static int pci_enable(struct clk *clk) { -@@ -567,4 +586,5 @@ void __init ltq_soc_init(void) +@@ -581,4 +600,5 @@ void __init ltq_soc_init(void) clkdev_add_pmu("1e116000.mei", "dfe", 1, 0, PMU_DFE); clkdev_add_pmu("1e100400.serial", NULL, 1, 0, PMU_ASC0); } diff --git a/target/linux/lantiq/patches-4.19/0301-xrx200-add-gphy-clk-src-device-tree-binding.patch b/target/linux/lantiq/patches-4.19/0301-xrx200-add-gphy-clk-src-device-tree-binding.patch index b98abe8b4b..dfca25db3e 100644 --- a/target/linux/lantiq/patches-4.19/0301-xrx200-add-gphy-clk-src-device-tree-binding.patch +++ b/target/linux/lantiq/patches-4.19/0301-xrx200-add-gphy-clk-src-device-tree-binding.patch @@ -1,6 +1,6 @@ --- a/arch/mips/lantiq/xway/sysctrl.c +++ b/arch/mips/lantiq/xway/sysctrl.c -@@ -424,6 +424,20 @@ static void clkdev_add_clkout(void) +@@ -438,6 +438,20 @@ static void clkdev_add_clkout(void) } } @@ -21,7 +21,7 @@ /* bring up all register ranges that we need for basic system control */ void __init ltq_soc_init(void) { -@@ -587,4 +601,6 @@ void __init ltq_soc_init(void) +@@ -601,4 +615,6 @@ void __init ltq_soc_init(void) clkdev_add_pmu("1e100400.serial", NULL, 1, 0, PMU_ASC0); } usb_set_clock(); diff --git a/target/linux/layerscape/patches-4.14/707-dpaa-ethernet-support-layerscape.patch b/target/linux/layerscape/patches-4.14/707-dpaa-ethernet-support-layerscape.patch index 271cc81a3f..1a321c2e0e 100644 --- a/target/linux/layerscape/patches-4.14/707-dpaa-ethernet-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/707-dpaa-ethernet-support-layerscape.patch @@ -151019,7 +151019,7 @@ Signed-off-by: Zhao Qiang #define NETIF_F_RX_UDP_TUNNEL_PORT __NETIF_F(RX_UDP_TUNNEL_PORT) +#define NETIF_F_HW_ACCEL_MQ __NETIF_F(HW_ACCEL_MQ) - /* Finds the next feature with the highest number of the range of start till 0. + /* Finds the next feature with the highest number of the range of start-1 till 0. */ --- /dev/null +++ b/include/uapi/linux/fmd/Kbuild