aboutsummaryrefslogtreecommitdiffstats
path: root/package/utils
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-06-06 09:34:47 +0000
committerJohn Crispin <john@openwrt.org>2014-06-06 09:34:47 +0000
commitb757deecadf9faaeddbbbb57a3ca2f4f61d70824 (patch)
treeda87cb36dcc109b72cffc050724b47c278611c36 /package/utils
parent1352b866279930f5ba0e30aa6d2f50b2e69e8e1d (diff)
downloadupstream-b757deecadf9faaeddbbbb57a3ca2f4f61d70824.tar.gz
upstream-b757deecadf9faaeddbbbb57a3ca2f4f61d70824.tar.bz2
upstream-b757deecadf9faaeddbbbb57a3ca2f4f61d70824.zip
ubi-utils: bump to version 1.5.1 for ubiblock support
ubiblock allows creating and removing read-only block devices on top of ubi volumes. Signed-off-by: Daniel Golle <daniel@makrotopia.org> SVN-Revision: 41033
Diffstat (limited to 'package/utils')
-rw-r--r--package/utils/ubi-utils/Makefile7
-rw-r--r--package/utils/ubi-utils/patches/130-lzma_jffs2.patch8
2 files changed, 8 insertions, 7 deletions
diff --git a/package/utils/ubi-utils/Makefile b/package/utils/ubi-utils/Makefile
index d009139246..fd41da0647 100644
--- a/package/utils/ubi-utils/Makefile
+++ b/package/utils/ubi-utils/Makefile
@@ -8,9 +8,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=mtd-utils
-PKG_REV:=ab8c6fb93ce9db0f09401c4b819b0b277dc00340
-PKG_VERSION:=1.5.0
-PKG_RELEASE:=2
+PKG_REV:=7d2839b8dede3ae368780364b4a07473d2303219
+PKG_VERSION:=1.5.1
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=git://git.infradead.org/mtd-utils.git
@@ -33,6 +33,7 @@ include $(INCLUDE_DIR)/package.mk
FILES:= \
ubiattach \
ubicrc32 \
+ ubiblock \
ubidetach \
ubiformat \
ubimkvol \
diff --git a/package/utils/ubi-utils/patches/130-lzma_jffs2.patch b/package/utils/ubi-utils/patches/130-lzma_jffs2.patch
index a40199eb6b..c788f25d29 100644
--- a/package/utils/ubi-utils/patches/130-lzma_jffs2.patch
+++ b/package/utils/ubi-utils/patches/130-lzma_jffs2.patch
@@ -2,10 +2,10 @@
+++ b/Makefile
@@ -3,7 +3,7 @@
- VERSION = 1.5.0
+ VERSION = 1.5.1
--CPPFLAGS += -D_GNU_SOURCE -I./include -I$(BUILDDIR)/include -I./ubi-utils/include $(ZLIBCPPFLAGS) $(LZOCPPFLAGS)
-+CPPFLAGS += -D_GNU_SOURCE -I./include -I$(BUILDDIR)/include -I./ubi-utils/include $(ZLIBCPPFLAGS) $(LZOCPPFLAGS) -I./include/linux/lzma
+-CPPFLAGS += -D_GNU_SOURCE -I./include -I$(BUILDDIR)/include -I./ubi-utils/include $(ZLIBCPPFLAGS) $(LZOCPPFLAGS) $(UUIDCPPFLAGS)
++CPPFLAGS += -D_GNU_SOURCE -I./include -I$(BUILDDIR)/include -I./ubi-utils/include $(ZLIBCPPFLAGS) $(LZOCPPFLAGS) $(UUIDCPPFLAGS) -I./include/linux/lzma
ifeq ($(WITHOUT_XATTR), 1)
CPPFLAGS += -DWITHOUT_XATTR
@@ -5011,7 +5011,7 @@
+}
--- a/mkfs.jffs2.c
+++ b/mkfs.jffs2.c
-@@ -1658,11 +1658,11 @@ int main(int argc, char **argv)
+@@ -1659,11 +1659,11 @@ int main(int argc, char **argv)
}
erase_block_size *= units;