X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=package%2Fsystem%2Fubox%2FMakefile;h=de35d5839267a5b4486be66cab67ea385031d563;hp=c913231505b457a2d58d3139354b56da800b94ec;hb=4451d319e6e16343ce716db27624208bea746ce1;hpb=d310e34d5f3a1ce650bf872d719a9aa143889394

diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile
index c913231505..de35d58392 100644
--- a/package/system/ubox/Makefile
+++ b/package/system/ubox/Makefile
@@ -1,17 +1,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ubox
-PKG_VERSION:=2013-11-07.1
-PKG_RELEASE=$(PKG_SOURCE_VERSION)-1
+PKG_VERSION:=2014-10-06
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://nbd.name/luci2/ubox.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=0588218d4bc58b0e099272338decbe4734f5678b
+PKG_SOURCE_VERSION:=0b274c16a3f9d235735a4b84215071e1e004caa9
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 CMAKE_INSTALL:=1
+PKG_CHECK_FORMAT_SECURITY:=0
 
-PKG_LICENSE:=GPLv2
+PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=
 
 PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
@@ -24,24 +25,17 @@ TARGET_LDFLAGS += $(if $(CONFIG_USE_EGLIBC),-lrt)
 define Package/ubox
   SECTION:=base
   CATEGORY:=Base system
-  DEPENDS:=+libubox +ubusd +ubus +libuci +USE_EGLIBC:librt
+  DEPENDS:=+libubox +ubusd +ubus +libubus +libuci +USE_EGLIBC:librt
   TITLE:=OpenWrt system helper toolbox
 endef
 
-define Package/block-mount
-  SECTION:=base
-  CATEGORY:=Base system
-  TITLE:=Block device mounting and checking
-  DEPENDS:=+ubox +libubox +libuci
-endef
-
 define Package/ubox/install
-	$(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(1)/lib/ $(1)/etc/init.d/
+
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{kmodloader,logd,logread,validate_data} $(1)/sbin/
+	$(INSTALL_BIN) ./files/log.init $(1)/etc/init.d/log
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libvalidate.so $(1)/lib
 
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{mount_root,kmodloader} $(1)/sbin/
-	ln -s /sbin/mount_root $(1)/sbin/switch2jffs
-	ln -s /sbin/mount_root $(1)/sbin/jffs2reset
-	ln -s /sbin/mount_root $(1)/sbin/jffs2mark
 	ln -s /sbin/kmodloader $(1)/usr/sbin/rmmod
 	ln -s /sbin/kmodloader $(1)/usr/sbin/insmod
 	ln -s /sbin/kmodloader $(1)/usr/sbin/lsmod
@@ -49,18 +43,4 @@ define Package/ubox/install
 	ln -s /sbin/kmodloader $(1)/usr/sbin/modprobe
 endef
 
-define Package/block-mount/install
-	$(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(1)/etc/hotplug.d/block $(1)/etc/init.d/ $(1)/etc/uci-defaults/
-
-	$(INSTALL_BIN) ./files/fstab.init $(1)/etc/init.d/fstab
-	$(INSTALL_DATA) ./files/fstab.default $(1)/etc/uci-defaults/10-fstab
-	$(INSTALL_DATA) ./files/mount.hotplug $(1)/etc/hotplug.d/block/10-mount
-
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/block $(1)/sbin/
-	ln -s /sbin/block $(1)/usr/sbin/swapon
-	ln -s /sbin/block $(1)/usr/sbin/swapoff
-
-endef
-
 $(eval $(call BuildPackage,ubox))
-$(eval $(call BuildPackage,block-mount))