diff options
author | John Crispin <blogic@openwrt.org> | 2014-04-07 15:10:07 +0000 |
---|---|---|
committer | John Crispin <blogic@openwrt.org> | 2014-04-07 15:10:07 +0000 |
commit | 43562719f08fc80a1596da0af297345a754e025d (patch) | |
tree | 288e463e2462dbbb9c1bf07dcf16ae88dc7cf690 /package/system/fstools/Makefile | |
parent | 403613a2fa96dbc6e277a0b3d2031e9e9dfb42df (diff) | |
download | master-187ad058-43562719f08fc80a1596da0af297345a754e025d.tar.gz master-187ad058-43562719f08fc80a1596da0af297345a754e025d.tar.bz2 master-187ad058-43562719f08fc80a1596da0af297345a754e025d.zip |
fstools: update to latest git HEAD
this adds the /sbin/ubi tool that can be used for sysupgrading ubi volumes
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40415 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/system/fstools/Makefile')
-rw-r--r-- | package/system/fstools/Makefile | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile index f7e37bc919..9672ee1da5 100644 --- a/package/system/fstools/Makefile +++ b/package/system/fstools/Makefile @@ -1,14 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fstools -PKG_VERSION:=2014-04-01 +PKG_VERSION:=2014-04-07 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=git://nbd.name/fstools.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=4e3268f90ae97ccb047c47a78b83bcebeb9593cd +PKG_SOURCE_VERSION:=a1f48fc0444f5c3c44ee6ef1005cd8da65decefd PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz CMAKE_INSTALL:=1 @@ -29,6 +29,12 @@ define Package/fstools TITLE:=OpenWrt filesystem tools endef +define Package/ubi-flash + SECTION:=base + CATEGORY:=Base system + TITLE:=OpenWrt ubi flashing tool +endef + define Package/block-mount SECTION:=base CATEGORY:=Base system @@ -37,25 +43,34 @@ define Package/block-mount endef define Package/fstools/install - $(INSTALL_DIR) $(1)/sbin + $(INSTALL_DIR) $(1)/sbin $(1)/lib - $(INSTALL_BIN) ./files/{jffs2reset,jffs2mark,mount_root} $(1)/sbin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/fs-state $(1)/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{mount_root,jffs2reset,snapshot_tool} $(1)/sbin/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libfstools.so $(1)/lib/ $(INSTALL_BIN) ./files/snapshot $(1)/sbin/ + ln -s /sbin/jffs2reset $(1)/sbin/jffs2mark +endef + +define Package/ubi-flash/install + $(INSTALL_DIR) $(1)/sbin $(1)/lib + + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ubi $(1)/sbin/ 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_DIR) $(1)/sbin $(1)/lib $(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/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libblkid-tiny.so $(1)/lib/ ln -s /sbin/block $(1)/usr/sbin/swapon ln -s /sbin/block $(1)/usr/sbin/swapoff endef $(eval $(call BuildPackage,fstools)) +$(eval $(call BuildPackage,ubi-flash)) $(eval $(call BuildPackage,block-mount)) |