diff options
| author | John Crispin <john@openwrt.org> | 2013-06-21 16:53:03 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2013-06-21 16:53:03 +0000 |
| commit | 5ee45b4a756ccbd08d8d7f749fc628912af056ef (patch) | |
| tree | 8649da23765840dda35bf9bbc346abb689b7ee9c | |
| parent | d55316af38d76fc62d5354b9f444d474406f801d (diff) | |
| download | upstream-5ee45b4a756ccbd08d8d7f749fc628912af056ef.tar.gz upstream-5ee45b4a756ccbd08d8d7f749fc628912af056ef.tar.bz2 upstream-5ee45b4a756ccbd08d8d7f749fc628912af056ef.zip | |
ubox: update to latest git version
add block mount / extroot support
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 36989
| -rw-r--r-- | package/ubox/Makefile | 26 | ||||
| -rw-r--r-- | package/ubox/files/mount.hotplug | 1 |
2 files changed, 22 insertions, 5 deletions
diff --git a/package/ubox/Makefile b/package/ubox/Makefile index 939127d291..3db0632077 100644 --- a/package/ubox/Makefile +++ b/package/ubox/Makefile @@ -1,13 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ubox -PKG_VERSION:=2013-06-04 +PKG_VERSION:=2013-06-20 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:=d6e6825c4697513d201fc3b146fb167c61404a04 +PKG_SOURCE_VERSION:=1b19fc217e33e9b2fc2fab6f9552da740d03a98a PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz CMAKE_INSTALL:=1 @@ -24,19 +24,35 @@ TARGET_LDFLAGS += $(if $(CONFIG_USE_EGLIBC),-lrt) define Package/ubox SECTION:=base CATEGORY:=Base system - DEPENDS:=+ubusd +ubus +USE_EGLIBC:librt + DEPENDS:=+ubusd +ubus +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 + MENU:=1 +endef + define Package/ubox/install $(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(CP) $(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/jffs2reset - ln -s /sbin/mount_root $(1)/sbin/jffs2mark ln -s /sbin/kmodloader $(1)/usr/sbin/lsmod ln -s /sbin/kmodloader $(1)/usr/sbin/modinfo endef +define Package/block-mount/install + $(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(1)/etc/hotplug.d/block + + $(CP) ./files/mount.hotplug $(1)/etc/hotplug.d/block/10-mount + $(CP) $(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)) diff --git a/package/ubox/files/mount.hotplug b/package/ubox/files/mount.hotplug new file mode 100644 index 0000000000..946924e351 --- /dev/null +++ b/package/ubox/files/mount.hotplug @@ -0,0 +1 @@ +/sbin/block hotplug |