scottk/wlan-ap
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-10-30 01:52:51 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity
Files
36ce8d2abb87e52dea47dcee9c2a7d8ec0020de6
wlan-ap/patches/0036-ucode-update-to-Git-HEAD-2024-04-15.patch
John Crispin d329e3a9ca patches/: re-order and fold patches 
Signed-off-by: John Crispin <john@phrozen.org>
2024-04-27 16:15:25 +02:00

325 lines
10 KiB
Diff
Raw Blame History

From 1442fba1d8691e8f93260574f9bb54a85a6e12b3 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Thu, 16 Nov 2023 16:06:18 +0100
Subject: [PATCH 36/68] ucode: update to Git HEAD (2024-04-15)
96f74b5be829 ubus: make ubus_context first in uc_ubus_connection_t
7e5830edfb38 nl80211: fix datatype of NL80211_BAND_IFTYPE_ATTR_HE_CAP_{MAC,PHY} attrs
5c8fd34bac42 nl80211: fix parsing of NL80211_BAND_ATTR_VHT_MCS_SET attribute
e8d4e4fe967d nl80211: fix decoding of NL80211_BAND_IFTYPE_ATTR_HE_CAP_MCS_SET attribute
30a3f7ad0433 rtnl: store callback in listener registry only on success
9cbe8294909f rtnl: optimize reception of rtnl events
534417132e18 rtnl: increase event socket rx buffer size limit to 1 MiB
3f9811d2f7b7 compiler: close upvalues on loop control statements
ee4af9b55cb4 vm: rework object iteration
a275399dd8e2 uci: refactor uci.changes() to match documentation
1220992631d5 ubus: automatically clear error information
d6fd94014eea uci: automatically clear error information
99837f280b61 uloop: automatically clear error information
ba3855ae3775 lib: fix documentation typo for `pop()` function
be767ae197ba vm: rework `in` operator semantics
4ade84e8fb81 ubus: add explicit support for deferring incoming requests
cfe137be068a uci: remove incorrectly documentated reorder() parameter
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
package/utils/ucode/Makefile | 232 +++++++++++++----------------------
1 file changed, 82 insertions(+), 150 deletions(-)
diff --git a/package/utils/ucode/Makefile b/package/utils/ucode/Makefile
index fe401f69b1..e59691026d 100644
--- a/package/utils/ucode/Makefile
+++ b/package/utils/ucode/Makefile
@@ -12,21 +12,31 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=https://github.com/jow-/ucode.git
-PKG_SOURCE_DATE:=2023-06-06
-PKG_SOURCE_VERSION:=c7d84aae09691a99ae3db427c0b2463732ef84f4
-PKG_MIRROR_HASH:=38826ae70d886d1d7ada3fc6591ac807169aa28107f60f7f2e617520083525fb
+PKG_MIRROR_HASH:=7a4d35d14ede7d853b2095ee239a86aab0b17da2b8cfac814dfa58fabec6374b
+PKG_SOURCE_DATE:=2024-04-15
+PKG_SOURCE_VERSION:=cfe137be068a7ba1895d3c9bcb7b38d21e5a95dd
PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
PKG_LICENSE:=ISC
-PKG_ABI_VERSION:=20220812
+PKG_ABI_VERSION:=20230711
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/cmake.mk
CMAKE_OPTIONS += -DSOVERSION=$(PKG_ABI_VERSION)
+
+ifeq ($(HOST_OS),Darwin)
+ CMAKE_HOST_OPTIONS += \
+ -DCMAKE_SKIP_RPATH=FALSE \
+ -DCMAKE_MACOSX_RPATH=1 \
+ -DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOSTPKG}/lib"
+else
+ CMAKE_HOST_OPTIONS += \
+ -DSOVERSION=$(PKG_ABI_VERSION)
+endif
+
CMAKE_HOST_OPTIONS += \
- -DSOVERSION=$(PKG_ABI_VERSION) \
-DFS_SUPPORT=ON \
-DMATH_SUPPORT=ON \
-DNL80211_SUPPORT=OFF \
@@ -35,7 +45,9 @@ CMAKE_HOST_OPTIONS += \
-DSTRUCT_SUPPORT=ON \
-DUBUS_SUPPORT=OFF \
-DUCI_SUPPORT=OFF \
- -DULOOP_SUPPORT=OFF
+ -DULOOP_SUPPORT=OFF \
+ -DDEBUG_SUPPORT=ON \
+ -DLOG_SUPPORT=OFF
ifeq ($(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_ipq53xx),y)
TARGET_CFLAGS += -DQCA_WIFI_7
@@ -73,115 +85,40 @@ define Package/libucode
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 <math.h> procedures.
-endef
-
-
-define Package/ucode-mod-nl80211
- $(Package/ucode/default)
- TITLE+= (nl80211 module)
- DEPENDS:=ucode +libnl-tiny +libubox +kmod-mac80211
-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 +libubox
-endef
-
-define Package/ucode-mod-rtnl/description
- The rtnl plugin provides access to the Linux routing netlink API.
-endef
-
-
-define Package/ucode-mod-struct
- $(Package/ucode/default)
- TITLE+= (struct module)
- DEPENDS:=ucode
-endef
-
-define Package/ucode-mod-struct/description
- The struct plugin implements Python 3 compatible struct.pack/unpack functionality.
-endef
-
-
-define Package/ucode-mod-ubus
- $(Package/ucode/default)
- TITLE+= (ubus module)
- DEPENDS:=ucode +libubus +libblobmsg-json
+define Build/Prepare
+ $(Build/Prepare/Default)
+ $(CP) $(STAGING_DIR)/usr/include/mac80211/uapi/linux/nl80211.h $(PKG_BUILD_DIR)/nl80211_copy.h
endef
-define Package/ucode-mod-ubus/description
- The ubus module allows ucode template scripts to enumerate and invoke ubus
- procedures.
+define Package/libucode/description
+ The libucode package provides the shared runtime library for the ucode interpreter.
endef
+# 1: name
+# 2: cmake symbol
+# 3: depends
+# 4: description
+define UcodeModule
+ UCODE_MODULES += ucode-mod-$(strip $(1))
+ CMAKE_OPTIONS += -D$(strip $(2))=$(if $(CONFIG_PACKAGE_ucode-mod-$(strip $(1))),ON,OFF)
+ PKG_CONFIG_DEPENDS += CONFIG_PACKAGE_ucode-mod-$(strip $(1))
-define Package/ucode-mod-uci
+ define Package/ucode-mod-$(strip $(1))
$(Package/ucode/default)
- TITLE+= (uci module)
- DEPENDS:=ucode +libuci
-endef
+ TITLE+= ($(strip $(1)) module)
+ DEPENDS:=ucode $(3)
+ endef
-define Package/ucode-mod-uci/description
- The uci module allows templates to read and modify uci configuration.
-endef
+ define Package/ucode-mod-$(strip $(1))/description
+ $(strip $(4))
+ endef
-
-define Package/ucode-mod-uloop
- $(Package/ucode/default)
- TITLE+= (uloop module)
- DEPENDS:=ucode +libubox
+ define Package/ucode-mod-$(strip $(1))/install
+ $(INSTALL_DIR) $$(1)/usr/lib/ucode
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ucode/$(strip $(1)).so $$(1)/usr/lib/ucode/
+ endef
endef
-define Package/ucode-mod-uloop/description
- The uloop module allows ucode scripts to interact with OpenWrt uloop event
- loop implementation.
-endef
-
-define Build/Prepare
- $(Build/Prepare/Default)
- $(CP) $(STAGING_DIR)/usr/include/mac80211/uapi/linux/nl80211.h $(PKG_BUILD_DIR)/nl80211_copy.h
-endef
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/lib $(1)/usr/include/ucode
@@ -200,60 +137,55 @@ define Package/libucode/install
$(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
+$(eval $(call UcodeModule, \
+ debug, DEBUG_SUPPORT, +libubox +libucode, \
+ The debug plugin module provides runtime debugging and introspection facilities.))
-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
+$(eval $(call UcodeModule, \
+ fs, FS_SUPPORT, , \
+ The filesystem plugin module allows interaction with the local file system.))
-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
+$(eval $(call UcodeModule, \
+ log, LOG_SUPPORT, +libubox, \
+ The log plugin module provides access to the syslog and libubox ulog APIs.))
-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
+$(eval $(call UcodeModule, \
+ math, MATH_SUPPORT, , \
+ The math plugin provides access to various <math.h> procedures.))
-define Package/ucode-mod-struct/install
- $(INSTALL_DIR) $(1)/usr/lib/ucode
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ucode/struct.so $(1)/usr/lib/ucode/
-endef
+$(eval $(call UcodeModule, \
+ nl80211, NL80211_SUPPORT, +libnl-tiny +libubox +kmod-mac80211, \
+ The nl80211 plugin provides access to the Linux wireless 802.11 netlink API.))
-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
+$(eval $(call UcodeModule, \
+ resolv, RESOLV_SUPPORT, , \
+ The resolv plugin implements simple DNS resolving.))
-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 UcodeModule, \
+ rtnl, RTNL_SUPPORT, +libnl-tiny +libubox, \
+ The rtnl plugin provides access to the Linux routing netlink API.))
-define Package/ucode-mod-uloop/install
- $(INSTALL_DIR) $(1)/usr/lib/ucode
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ucode/uloop.so $(1)/usr/lib/ucode/
-endef
+$(eval $(call UcodeModule, \
+ struct, STRUCT_SUPPORT, , \
+ The struct plugin implements Python 3 compatible struct.pack/unpack functionality.))
+
+$(eval $(call UcodeModule, \
+ ubus, UBUS_SUPPORT, +libubus +libblobmsg-json, \
+ The ubus module allows ucode template scripts to enumerate and invoke ubus procedures.))
+
+$(eval $(call UcodeModule, \
+ uci, UCI_SUPPORT, +libuci, \
+ The uci module allows templates to read and modify uci configuration.))
+
+$(eval $(call UcodeModule, \
+ uloop, ULOOP_SUPPORT, +libubox, \
+ The uloop module allows ucode scripts to interact with OpenWrt uloop event loop implementation.))
$(eval $(call BuildPackage,libucode))
$(eval $(call BuildPackage,ucode))
-$(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-struct))
-$(eval $(call BuildPackage,ucode-mod-ubus))
-$(eval $(call BuildPackage,ucode-mod-uci))
-$(eval $(call BuildPackage,ucode-mod-uloop))
+
+$(foreach mod,$(UCODE_MODULES), \
+ $(eval $(call BuildPackage,$(mod))))
+
$(eval $(call HostBuild))
--
2.34.1
Reference in New Issue View Git Blame Copy Permalink