uci: update to git HEAD

[openwrt/staging/jow.git] / package / system / uci / Makefile

diff --git a/package/system/uci/Makefile b/package/system/uci/Makefile
index 30d63d08fe9c108dff4f9d8ba410a550f65a5ab0..30152607613899635726782092cc5b3d34e7bc14 100644 (file)
--- a/package/system/uci/Makefile
+++ b/package/system/uci/Makefile
@@ -8,28 +8,20 @@
 
 include $(TOPDIR)/rules.mk
 
-UCI_VERSION=2016-07-04
-UCI_RELEASE=1
-
 PKG_NAME:=uci
-PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE))
 PKG_RELEASE:=1
-PKG_REV:=e1bf4356e1b513e158e1b5049147087ed6342cfd
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL=$(LEDE_GIT)/project/uci.git
-PKG_SOURCE_SUBDIR:=uci-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_URL=$(PROJECT_GIT)/project/uci.git
 PKG_SOURCE_PROTO:=git
-PKG_MIRROR_HASH:=1206aff4b41bc4aa78205c7537bc75886244c293cb5f08dc7ba3dc4def93a81c
+PKG_SOURCE_DATE=2023-03-05
+PKG_SOURCE_VERSION:=04d0c46cfe30f557da0c603516636830cab4a08a
+PKG_MIRROR_HASH:=5402091db0645d19a60c3ec51850062138af8fb9eda6764091819637d84f1036
 
 PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=
 
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
-PKG_BUILD_PARALLEL:=0
-
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
@@ -41,6 +33,7 @@ define Package/libuci
   CATEGORY:=Libraries
   TITLE:=C library for the Unified Configuration Interface (UCI)
   DEPENDS:=+libubox
+  ABI_VERSION:=20130104
 endef
 
 define Package/uci
@@ -60,7 +53,7 @@ endef
 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
 TARGET_LDFLAGS += -L$(STAGING_DIR)/usr/lib
 
-CMAKE_OPTIONS = \
+CMAKE_OPTIONS += \
        -DLUAPATH=/usr/lib/lua \
        $(if $(DEBUG),-DUCI_DEBUG=ON)
 
@@ -89,6 +82,6 @@ define Build/InstallDev
        $(CP) $(PKG_BUILD_DIR)/libucimap.a $(1)/usr/lib
 endef
 
-$(eval $(call BuildPackage,uci))
 $(eval $(call BuildPackage,libuci))
 $(eval $(call BuildPackage,libuci-lua))
+$(eval $(call BuildPackage,uci))