aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/utils/ucode/Makefile27
-rw-r--r--package/utils/ucode/patches/100-fix-int-format-on-32bit-system.patch11
2 files changed, 22 insertions, 16 deletions
diff --git a/package/utils/ucode/Makefile b/package/utils/ucode/Makefile
index beafb94bb4..f53a3a3529 100644
--- a/package/utils/ucode/Makefile
+++ b/package/utils/ucode/Makefile
@@ -8,17 +8,17 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ucode
-PKG_RELEASE:=2
+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_SOURCE_DATE:=2022-01-26
+PKG_SOURCE_VERSION:=ddc5aa7cd3121300f2ba6e68cb038258a616d4e4
+PKG_MIRROR_HASH:=f9a3c010c54288a2363757b58ef31a827b8314e444bb7bf48926f7d4ea88b9d6
PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
PKG_LICENSE:=ISC
-PKG_ABI_VERSION:=20210730
+PKG_ABI_VERSION:=20220120
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
@@ -109,6 +109,17 @@ define Package/ucode-mod-rtnl/description
endef
+define Package/ucode-mod-struct
+ $(Package/ucode/default)
+ TITLE+= (struct module)
+ DEPENDS:=ucode
+endef
+
+define Package/ucode-mod-struct/description
+ The struct plugin implemnts Python 3 compatible struct.pack/unpack functionality.
+endef
+
+
define Package/ucode-mod-ubus
$(Package/ucode/default)
TITLE+= (ubus module)
@@ -174,6 +185,11 @@ define Package/ucode-mod-rtnl/install
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ucode/rtnl.so $(1)/usr/lib/ucode/
endef
+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
+
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/
@@ -192,5 +208,6 @@ $(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))
diff --git a/package/utils/ucode/patches/100-fix-int-format-on-32bit-system.patch b/package/utils/ucode/patches/100-fix-int-format-on-32bit-system.patch
deleted file mode 100644
index c557d0c1bd..0000000000
--- a/package/utils/ucode/patches/100-fix-int-format-on-32bit-system.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib.c
-+++ b/lib.c
-@@ -1438,7 +1438,7 @@ uc_printf_common(uc_vm_t *vm, size_t nar
-
- switch (t) {
- case UC_INTEGER:
-- ucv_stringbuf_printf(buf, sfmt, arg.n);
-+ ucv_stringbuf_printf(buf, sfmt, (int)arg.n);
- break;
-
- case UC_DOUBLE: