set PKG_RELEASE to PKG_SOURCE_VERSION on a few packages using git

[openwrt.git] / package / libubox / Makefile

diff --git a/package/libubox/Makefile b/package/libubox/Makefile
index a2b3a9c..ccfe838 100644 (file)
--- a/package/libubox/Makefile
+++ b/package/libubox/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libubox
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libubox

-PKG_VERSION:=2010-02-07
-PKG_RELEASE:=1
+PKG_VERSION:=2011-02-11
+PKG_RELEASE=$(PKG_SOURCE_VERSION)

 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://nbd.name/luci2/libubox.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://nbd.name/luci2/libubox.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

-PKG_SOURCE_VERSION:=e44dbfb1029829dbd6c5e1ca11e461d9a89027b9
+PKG_SOURCE_VERSION:=83037e345dd702f2a013322139ef0b7bab7e170f

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 CMAKE_INSTALL:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 CMAKE_INSTALL:=1
 


@@ -18,7 +18,7 @@ define Package/libubox
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Basic utility library
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Basic utility library

-  DEPENDS:=+libjson
+  DEPENDS:=

 endef
 
 
 endef
 
 


@@ -34,8 +34,14 @@ TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
 
 define Package/libubox/install
        $(INSTALL_DIR) $(1)/lib/
 
 define Package/libubox/install
        $(INSTALL_DIR) $(1)/lib/

-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.so $(1)/lib/
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libubox.so $(1)/lib/
+endef
+
+define Package/libblobmsg-json/install
+       $(INSTALL_DIR) $(1)/lib/
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libblobmsg_json.so $(1)/lib/

 endef
 
 $(eval $(call BuildPackage,libubox))
 endef
 
 $(eval $(call BuildPackage,libubox))

+$(eval $(call BuildPackage,libblobmsg-json))