domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ubox: update to latest git revision

Browse Source 
* add pivot root support
* add back a /etc/init.d/fstab
* add "block mount/umount" support
* add anonymous swap/mount support
* add auto swap/mount support
* fix superflous error when inserting modules
* add back jffs2reset/jffs2mark

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 37057
This commit is contained in:
John Crispin
2013-06-28 11:22:05 +00:00
parent c4f5b5d0d5
commit b1318530e3
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
package/system/ubox/Makefile
View File

@@ -1,13 +1,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=ubox PKG_NAME:=ubox
PKG_VERSION:=2013-06-20 PKG_VERSION:=2013-06-27
PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=git://nbd.name/luci2/ubox.git PKG_SOURCE_URL:=git://nbd.name/luci2/ubox.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=1b19fc217e33e9b2fc2fab6f9552da740d03a98a PKG_SOURCE_VERSION:=725444ad8dd42a6441499fae5a3e92dc99939cc1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
CMAKE_INSTALL:=1 CMAKE_INSTALL:=1
@@ -39,19 +39,24 @@ endef
define Package/ubox/install define Package/ubox/install
$(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/{mount_root,kmodloader,lsbloader,board} $(1)/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{mount_root,kmodloader,lsbloader,board} $(1)/sbin/
ln -s /sbin/mount_root $(1)/sbin/switch2jffs 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/lsmod
ln -s /sbin/kmodloader $(1)/usr/sbin/modinfo ln -s /sbin/kmodloader $(1)/usr/sbin/modinfo
endef endef
define Package/block-mount/install define Package/block-mount/install
$(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(1)/etc/hotplug.d/block $(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(1)/etc/hotplug.d/block $(1)/etc/init.d/
$(CP) ./files/mount.hotplug $(1)/etc/hotplug.d/block/10-mount $(INSTALL_BIN) ./files/fstab.init $(1)/etc/init.d/fstab
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/block $(1)/sbin/ $(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/swapon
ln -s /sbin/block $(1)/usr/sbin/swapoff ln -s /sbin/block $(1)/usr/sbin/swapoff
endef endef
$(eval $(call BuildPackage,ubox)) $(eval $(call BuildPackage,ubox))

14
package/system/ubox/files/fstab.init Normal file
View File

@@ -0,0 +1,14 @@
#!/bin/sh /etc/rc.common
# (C) 2013 openwrt.org
START=40
start() {
echo "this file has been obseleted. please call \"/sbin/block mount\" directly"
/sbin/block mount
}
stop() {
echo "this file has been obseleted. please call \"/sbin/block umount\" directly"
/sbin/block umount
}