uci: add uci_revert function

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

diff --git a/package/system/uci/Makefile b/package/system/uci/Makefile
index 617f7bc2a9be615d17d2414f13bf832c8c32af39..1355955d1aa6fb7b823d3681038c4b26c165ff7a 100644 (file)
--- a/package/system/uci/Makefile
+++ b/package/system/uci/Makefile
@@ -9,20 +9,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uci
-PKG_RELEASE:=1
+PKG_RELEASE:=6
 
-PKG_SOURCE_URL=$(LEDE_GIT)/project/uci.git
+PKG_SOURCE_URL=$(PROJECT_GIT)/project/uci.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE=2017-12-22
-PKG_SOURCE_VERSION:=25fd142c8dbed12354f544acbe08b3bf71075e53
-PKG_MIRROR_HASH:=b30a452e3e438c8956a20a1449597bcd59d8c505526db1ebef99596294a6b528
+PKG_SOURCE_DATE=2021-04-14
+PKG_SOURCE_VERSION:=4b3db1179747b6a6779029407984bacef851325c
+PKG_MIRROR_HASH:=9d00b5056a0dd4094c7e19f1a0ecaffa90409f22ea28f164d0e36febd06e37d1
 
 PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=
 
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
-PKG_BUILD_PARALLEL:=0
+PKG_FLAGS := nonshared
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
@@ -35,6 +35,7 @@ define Package/libuci
   CATEGORY:=Libraries
   TITLE:=C library for the Unified Configuration Interface (UCI)
   DEPENDS:=+libubox
+  ABI_VERSION:=20130104
 endef
 
 define Package/uci
@@ -54,7 +55,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)
 
@@ -83,6 +84,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))