ubox: fix extroot/extoverlay mounting by label and support mounting by device name

[openwrt.git] / package / system / ubox / Makefile

diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile
index e964506..c913231 100644 (file)
--- a/package/system/ubox/Makefile
+++ b/package/system/ubox/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ubox
-PKG_VERSION:=2013-07-02
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_VERSION:=2013-11-07.1
+PKG_RELEASE=$(PKG_SOURCE_VERSION)-1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://nbd.name/luci2/ubox.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=267dd987b1aec750f8839d1d8d8c2f80d9f1107e
+PKG_SOURCE_VERSION:=0588218d4bc58b0e099272338decbe4734f5678b
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 CMAKE_INSTALL:=1
 
@@ -33,7 +33,6 @@ define Package/block-mount
   CATEGORY:=Base system
   TITLE:=Block device mounting and checking
   DEPENDS:=+ubox +libubox +libuci
-  MENU:=1
 endef
 
 define Package/ubox/install
@@ -43,8 +42,11 @@ define Package/ubox/install
        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/lsmod
+       ln -s /sbin/kmodloader $(1)/usr/sbin/rmmod
+       ln -s /sbin/kmodloader $(1)/usr/sbin/insmod
+       ln -s /sbin/kmodloader $(1)/usr/sbin/lsmod
        ln -s /sbin/kmodloader $(1)/usr/sbin/modinfo
+       ln -s /sbin/kmodloader $(1)/usr/sbin/modprobe
 endef
 
 define Package/block-mount/install