BB: fstools: cumulative backport
- Adds support for /dev/vd* virtual io - Adds support for overlayfs v23 - Fixes overlayfs mount on 3.18 - Make the block tool ignore case when comparing uuid strings - Fixes sysupgrade on linux 3.18 - Support extroot/ubi - Allows using UBIFS volume as overlay and adds support for Btrfs - Fix exit code of uci-defaults script - Support external overlays on non-MTD systems again - Account for new directory structure of overlayfs partitions (additional upper/ component) - Support executing block from either overlay or rom - Support loading fstab from either overlay or rom - Log extroot failures to dmesg Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> Backport of r42812, r42890, r43090, r43368, r43480, r43485, r43717, r43868, r44180, r44535 git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@44537 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
dfcbb3563e
commit
8d49c6d438
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# Copyright (C) 2014 OpenWrt.org
|
# Copyright (C) 2014-2015 OpenWrt.org
|
||||||
#
|
#
|
||||||
# This is free software, licensed under the GNU General Public License v2.
|
# This is free software, licensed under the GNU General Public License v2.
|
||||||
# See /LICENSE for more information.
|
# See /LICENSE for more information.
|
||||||
|
@ -8,14 +8,14 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=fstools
|
PKG_NAME:=fstools
|
||||||
PKG_VERSION:=2014-06-22
|
PKG_VERSION:=2015-02-25
|
||||||
|
|
||||||
PKG_RELEASE=$(PKG_SOURCE_VERSION)
|
PKG_RELEASE=$(PKG_SOURCE_VERSION)
|
||||||
|
|
||||||
PKG_SOURCE_PROTO:=git
|
PKG_SOURCE_PROTO:=git
|
||||||
PKG_SOURCE_URL:=git://nbd.name/fstools.git
|
PKG_SOURCE_URL:=git://nbd.name/fstools.git
|
||||||
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
||||||
PKG_SOURCE_VERSION:=e0430f5c62f367e5a8e02755412977b02c3fc45e
|
PKG_SOURCE_VERSION:=4b68e9f9ea894bf58d31e26ca5ed92c81b1a115e
|
||||||
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
|
||||||
PKG_CHECK_FORMAT_SECURITY:=0
|
PKG_CHECK_FORMAT_SECURITY:=0
|
||||||
|
@ -31,12 +31,24 @@ include $(INCLUDE_DIR)/package.mk
|
||||||
include $(INCLUDE_DIR)/cmake.mk
|
include $(INCLUDE_DIR)/cmake.mk
|
||||||
|
|
||||||
TARGET_LDFLAGS += $(if $(CONFIG_USE_EGLIBC),-lrt)
|
TARGET_LDFLAGS += $(if $(CONFIG_USE_EGLIBC),-lrt)
|
||||||
|
CMAKE_OPTIONS += $(if $(CONFIG_FSTOOLS_UBIFS_EXTROOT),-DCMAKE_UBIFS_EXTROOT=y)
|
||||||
|
|
||||||
define Package/fstools
|
define Package/fstools
|
||||||
SECTION:=base
|
SECTION:=base
|
||||||
CATEGORY:=Base system
|
CATEGORY:=Base system
|
||||||
DEPENDS:=+ubox +USE_EGLIBC:librt +NAND_SUPPORT:ubi-utils
|
DEPENDS:=+ubox +USE_EGLIBC:librt +NAND_SUPPORT:ubi-utils
|
||||||
TITLE:=OpenWrt filesystem tools
|
TITLE:=OpenWrt filesystem tools
|
||||||
|
MENU:=1
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Package/fstools/config
|
||||||
|
config FSTOOLS_UBIFS_EXTROOT
|
||||||
|
depends on PACKAGE_fstools
|
||||||
|
depends on NAND_SUPPORT
|
||||||
|
bool "Support extroot functionality with UBIFS"
|
||||||
|
default y
|
||||||
|
help
|
||||||
|
This option makes it possible to use extroot functionality if the root filesystem resides on an UBIFS partition
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/block-mount
|
define Package/block-mount
|
||||||
|
|
|
@ -1 +1,2 @@
|
||||||
[ ! -f /etc/config/fstab ] && ( block detect > /etc/config/fstab )
|
[ ! -f /etc/config/fstab ] && ( block detect > /etc/config/fstab )
|
||||||
|
exit 0
|
||||||
|
|
Loading…
Reference in New Issue