uci2: Update to 2.0.0

Simplify Makefile while at it.

Signed-off-by: Tianling Shen <[email protected]>

diff --git a/libs/uci2/Makefile b/libs/uci2/Makefile
index c876a84a18ed265fa35949faad01d1943137bbb0..57f5605d4c87556b6f8a3efa8a0010ad624a0d15 100644 (file)
--- a/libs/uci2/Makefile
+++ b/libs/uci2/Makefile
@@ -1,49 +1,38 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uci2
-PKG_VERSION:=1.0
-PKG_RELEASE:=2
+PKG_VERSION:=2.0.0
+PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=https://github.com/sartura/uci2.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2021-07-12
-PKG_SOURCE_VERSION:=56064182acdd8fa522abab67fdbaa10c2a28165c
-PKG_MIRROR_HASH:=94059a5cf110ecc04cfb9a8ffc160f9bd6a03518d4c4b195500d8eff001be9aa
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_DATE).tar.gz
+PKG_SOURCE_VERSION:=v$(PKG_VERSION)
+PKG_MIRROR_HASH:=bc449797b67dee8cfa60673d5440486dbb7422797691e8fa8a01353dd4e2d77a
 
 PKG_MAINTAINER:=Jakov Petrina <[email protected]>
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
+CMAKE_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
-define Package/libuci2/Default
-       TITLE:=AST-based C parser library for UCI
-       URL:=https://github.com/sartura/uci2
-endef
-
 define Package/libuci2
-       $(call Package/libuci2/Default)
-       SECTION:=libs
-       CATEGORY:=Libraries
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=AST-based C parser library for UCI
+  URL:=https://github.com/sartura/uci2
 endef
 
 define Package/libuci2/description
-UCI2 is a C library that provides an alternative UCI parser with an Abstract
-Syntax Tree (AST) representation of configuration files.
+  UCI2 is a C library that provides an alternative UCI parser with an
+  Abstract Syntax Tree (AST) representation of configuration files.
 endef
 
 CMAKE_OPTIONS += \
        -DENABLE_TESTS=OFF
 
-define Build/InstallDev
-       $(INSTALL_DIR) $(1)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/{libuci2,uci2_ast}.h $(1)/usr/include/
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuci2.so $(1)/usr/lib/
-endef
-
 define Package/libuci2/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuci2.so $(1)/usr/lib/