him411/wlan-ap-Telecominfraproject
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-12-18 09:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

ucode: update to latest HEAD

Browse Source 
This fixes the signed vs unsigned conversion problem inside telemetry

Fixes: WIFI-3040
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin 2021-09-25 09:49:30 +02:00
parent 89ff811e94
commit ebe982fad7
2 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
feeds/ucentral/ucentral-wifi/Makefile
View File

@ -6,7 +6,7 @@ PKG_RELEASE:=1
PKG_SOURCE_URL=https://github.com/blogic/ucentral-wifi.git PKG_SOURCE_URL=https://github.com/blogic/ucentral-wifi.git
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2021-04-13 PKG_SOURCE_DATE:=2021-04-13
PKG_SOURCE_VERSION:=c273c70879a75cf3ab88bf99898a63a711323b04 PKG_SOURCE_VERSION:=cadac1243bb2577f1f228fa18bba71926201786c
#PKG_MIRROR_HASH:=a8000b3cf43ce9ebfa7305661475fec98ec1dba2dc7b062028c2e17d7c2ec50b #PKG_MIRROR_HASH:=a8000b3cf43ce9ebfa7305661475fec98ec1dba2dc7b062028c2e17d7c2ec50b
PKG_MAINTAINER:=John Crispin <john@phrozen.org> PKG_MAINTAINER:=John Crispin <john@phrozen.org>

52
feeds/ucentral/ucode/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2020 Jo-Philipp Wich <jo@mein.io> # Copyright (C) 2020-2021 Jo-Philipp Wich <jo@mein.io>
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -12,31 +12,28 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=https://github.com/jow-/ucode.git PKG_SOURCE_URL=https://github.com/jow-/ucode.git
PKG_SOURCE_DATE:=2021-03-15 PKG_SOURCE_DATE:=2021-07-30
PKG_SOURCE_VERSION:=2a838d1f9f58d05bc1e15084efa42ad86fc105e4 PKG_SOURCE_VERSION:=5b908bdf64a586d27d5bdd1df8c72a7cd63b386a
PKG_MIRROR_HASH:= PKG_MIRROR_HASH:=
PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io> PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
PKG_LICENSE:=ISC PKG_LICENSE:=ISC
PKG_ASLR_PIE_REGULAR:=1 PKG_ABI_VERSION:=20210730
PKG_BUILD_DEPENDS = ustream-ssl
PKG_CONFIG_DEPENDS:= CONFIG_ucode_lua
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk include $(INCLUDE_DIR)/cmake.mk
include $(INCLUDE_DIR)/version.mk
CMAKE_OPTIONS+=-DFS_SUPPORT=1 -DMATH_SUPPORT=1 -DUBUS_SUPPORT=1 -DUCI_SUPPORT=1 CMAKE_OPTIONS += -DSOVERSION=$(PKG_ABI_VERSION)
define Package/ucode/default define Package/ucode/default
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
TITLE:=ucode - Tiny template language TITLE:=ucode - Tiny scripting and templating language
endef endef
define Package/ucode define Package/ucode
$(Package/ucode/default) $(Package/ucode/default)
DEPENDS:=+libjson-c DEPENDS:=+libucode
endef endef
define Package/ucode/description define Package/ucode/description
@ -45,6 +42,18 @@ define Package/ucode/description
endef 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 define Package/ucode-mod-fs
$(Package/ucode/default) $(Package/ucode/default)
TITLE+= (filesystem module) TITLE+= (filesystem module)
@ -90,33 +99,46 @@ define Package/ucode-mod-uci/description
endef 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 define Package/ucode/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ipkg-install/usr/bin/ucode $(1)/usr/bin/ucode $(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 endef
define Package/ucode-mod-fs/install define Package/ucode-mod-fs/install
$(INSTALL_DIR) $(1)/usr/lib/ucode $(INSTALL_DIR) $(1)/usr/lib/ucode
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ipkg-install/usr/lib/ucode/fs.so $(1)/usr/lib/ucode/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ucode/fs.so $(1)/usr/lib/ucode/
endef endef
define Package/ucode-mod-math/install define Package/ucode-mod-math/install
$(INSTALL_DIR) $(1)/usr/lib/ucode $(INSTALL_DIR) $(1)/usr/lib/ucode
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ipkg-install/usr/lib/ucode/math.so $(1)/usr/lib/ucode/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ucode/math.so $(1)/usr/lib/ucode/
endef endef
define Package/ucode-mod-ubus/install define Package/ucode-mod-ubus/install
$(INSTALL_DIR) $(1)/usr/lib/ucode $(INSTALL_DIR) $(1)/usr/lib/ucode
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ipkg-install/usr/lib/ucode/ubus.so $(1)/usr/lib/ucode/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ucode/ubus.so $(1)/usr/lib/ucode/
endef endef
define Package/ucode-mod-uci/install define Package/ucode-mod-uci/install
$(INSTALL_DIR) $(1)/usr/lib/ucode $(INSTALL_DIR) $(1)/usr/lib/ucode
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ipkg-install/usr/lib/ucode/uci.so $(1)/usr/lib/ucode/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ucode/uci.so $(1)/usr/lib/ucode/
endef endef
$(eval $(call BuildPackage,ucode)) $(eval $(call BuildPackage,ucode))
$(eval $(call BuildPackage,libucode))
$(eval $(call BuildPackage,ucode-mod-fs)) $(eval $(call BuildPackage,ucode-mod-fs))
$(eval $(call BuildPackage,ucode-mod-math)) $(eval $(call BuildPackage,ucode-mod-math))
$(eval $(call BuildPackage,ucode-mod-ubus)) $(eval $(call BuildPackage,ucode-mod-ubus))