mtd-utils: update to 2.0.0

package/mtd-utils/Makefile

@@ -4,18 +4,17 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		mtd-utils
-PKG_VERSION:=		1.5.2
+PKG_VERSION:=		2.0.0
 PKG_RELEASE:=		1
-PKG_HASH:=		e76c379fdd77818686a221b9642b12540e6060285aa58d6f7d016774c24d5503
+PKG_HASH:=		20a377aa86af4c102e930b0d0bb9859e3a10aeb16445f6a1273989b206a717c8
 PKG_DESCR:=		flash filesystem utilities
 PKG_SECTION:=		sys/fs
 PKG_BUILDDEP:=		zlib
 HOST_BUILDDEP:=		liblzo-host
 PKG_URL:=		http://www.linux-mtd.infradead.org
-PKG_SITES:=		http://git.infradead.org/mtd-utils.git/snapshot/
+PKG_SITES:=		ftp://ftp.infradead.org/pub/mtd-utils/
 
-DISTFILES:=             ca39eb1d98e736109c64ff9c1aa2a6ecca222d8f.tar.gz
-WRKDIST=		${WRKDIR}/mtd-utils-ca39eb1
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
 PKG_SUBPKGS:=		MTD_UTILS NANDWRITE NANDDUMP NANDTEST FLASH_ERASE FLASH_OTP_INFO FLASH_OTP_DUMP FLASH_LOCK
 PKGSD_NANDWRITE:=	mtd-utils nandwrite utility
@@ -60,7 +59,6 @@ mtd-utils-hostinstall:
 	${INSTALL_BIN} ${WRKBUILD}/mkfs.jffs2 \
 		${STAGING_HOST_DIR}/usr/bin
 
-CONFIG_STYLE:=		manual
 XAKE_FLAGS+=		WITHOUT_XATTR=1
 ifneq (${ADK_PACKAGE_MTD_UTILS_WITH_LZO},y)
 XAKE_FLAGS+=		WITHOUT_LZO=1

package/mtd-utils/patches/patch-Makefile

@@ -1,32 +0,0 @@
-	- allow disabling ubifs tools
-	- drop the tests
---- mtd-utils-ca39eb1.orig/Makefile	2012-05-07 09:19:39.000000000 +0200
-+++ mtd-utils-ca39eb1/Makefile	2014-06-02 23:39:37.857504666 +0200
-@@ -14,7 +14,7 @@ else
-   LZOLDLIBS = -llzo2
- endif
- 
--TESTS = tests
-+#TESTS = tests
- 
- MTD_BINS = \
- 	ftl_format flash_erase nanddump doc_loadbios \
-@@ -30,13 +30,16 @@ UBI_BINS = \
- 	ubidetach ubinize ubiformat ubirename mtdinfo ubirsvol
- 
- BINS = $(MTD_BINS)
--BINS += mkfs.ubifs/mkfs.ubifs
--BINS += $(addprefix ubi-utils/,$(UBI_BINS))
- SCRIPTS = flash_eraseall
- 
- TARGETS = $(BINS)
- TARGETS += lib/libmtd.a
-+
-+ifneq ($(WITHOUT_UBI), 1)
-+BINS += mkfs.ubifs/mkfs.ubifs
-+BINS += $(addprefix ubi-utils/,$(UBI_BINS))
- TARGETS += ubi-utils/libubi.a
-+endif
- 
- OBJDEPS = $(BUILDDIR)/include/version.h
- 

package/mtd-utils/patches/patch-common_mk

@@ -1,11 +0,0 @@
---- mtd-utils-1.5.0.orig/common.mk	2012-05-07 09:19:39.000000000 +0200
-+++ mtd-utils-1.5.0/common.mk	2014-03-30 15:49:26.000000000 +0200
-@@ -13,8 +13,6 @@ WFLAGS := -Wall \
- 	$(call cc-option,-Wwrite-strings) \
- 	$(call cc-option,-Wno-sign-compare)
- CFLAGS += $(WFLAGS)
--SECTION_CFLAGS := $(call cc-option,-ffunction-sections -fdata-sections -Wl$(comma)--gc-sections)
--CFLAGS += $(SECTION_CFLAGS)
- 
- ifneq ($(WITHOUT_LARGEFILE), 1)
-   CPPFLAGS += -D_FILE_OFFSET_BITS=64

package/mtd-utils/patches/patch-compr_c

@@ -1,21 +0,0 @@
---- mtd-utils-1.5.0.orig/compr.c	2012-05-07 09:19:39.000000000 +0200
-+++ mtd-utils-1.5.0/compr.c	2014-03-30 15:49:30.000000000 +0200
-@@ -517,9 +517,6 @@ int jffs2_compressors_init(void)
- #ifdef CONFIG_JFFS2_RTIME
- 	jffs2_rtime_init();
- #endif
--#ifdef CONFIG_JFFS2_LZO
--	jffs2_lzo_init();
--#endif
- 	return 0;
- }
- 
-@@ -531,8 +528,5 @@ int jffs2_compressors_exit(void)
- #ifdef CONFIG_JFFS2_ZLIB
- 	jffs2_zlib_exit();
- #endif
--#ifdef CONFIG_JFFS2_LZO
--	jffs2_lzo_exit();
--#endif
- 	return 0;
- }

package/mtd-utils/patches/patch-compr_lzo_c

@@ -1,10 +0,0 @@
---- mtd-utils-1.5.0.orig/compr_lzo.c	2012-05-07 09:19:39.000000000 +0200
-+++ mtd-utils-1.5.0/compr_lzo.c	2014-03-30 15:49:26.000000000 +0200
-@@ -26,7 +26,6 @@
- #include <string.h>
- 
- #ifndef WITHOUT_LZO
--#include <asm/types.h>
- #include <linux/jffs2.h>
- #include <lzo/lzo1x.h>
- #include "compr.h"

package/mtd-utils/patches/patch-compr_zlib_c

@@ -1,10 +0,0 @@
---- mtd-utils-1.5.0.orig/compr_zlib.c	2012-05-07 09:19:39.000000000 +0200
-+++ mtd-utils-1.5.0/compr_zlib.c	2014-03-30 15:49:26.000000000 +0200
-@@ -39,7 +39,6 @@
- #include <zlib.h>
- #undef crc32
- #include <stdio.h>
--#include <asm/types.h>
- #include <linux/jffs2.h>
- #include "common.h"
- #include "compr.h"

package/mtd-utils/patches/patch-include_mtd_jffs2-user_h

@@ -1,16 +0,0 @@
---- mtd-utils-1.5.0.orig/include/mtd/jffs2-user.h	2012-05-07 09:19:39.000000000 +0200
-+++ mtd-utils-1.5.0/include/mtd/jffs2-user.h	2014-03-30 15:49:26.000000000 +0200
-@@ -9,8 +9,13 @@
- 
- /* This file is blessed for inclusion by userspace */
- #include <linux/jffs2.h>
-+#if defined(__APPLE__)
-+#include "endian.h"
-+#include "byteswap.h"
-+#else
- #include <endian.h>
- #include <byteswap.h>
-+#endif
- 
- #undef cpu_to_je16
- #undef cpu_to_je32

package/mtd-utils/patches/patch-include_mtd_mtd-abi_h

@@ -1,14 +0,0 @@
---- mtd-utils-1.5.0.orig/include/mtd/mtd-abi.h	2012-05-07 09:19:39.000000000 +0200
-+++ mtd-utils-1.5.0/include/mtd/mtd-abi.h	2014-03-30 15:49:26.000000000 +0200
-@@ -171,9 +171,9 @@ struct otp_info {
- /* Get info about OOB modes (e.g., RAW, PLACE, AUTO) - legacy interface */
- #define MEMGETOOBSEL		_IOR('M', 10, struct nand_oobinfo)
- /* Check if an eraseblock is bad */
--#define MEMGETBADBLOCK		_IOW('M', 11, __kernel_loff_t)
-+#define MEMGETBADBLOCK		_IOW('M', 11, off_t)
- /* Mark an eraseblock as bad */
--#define MEMSETBADBLOCK		_IOW('M', 12, __kernel_loff_t)
-+#define MEMSETBADBLOCK		_IOW('M', 12, off_t)
- /* Set OTP (One-Time Programmable) mode (factory vs. user) */
- #define OTPSELECT		_IOR('M', 13, int)
- /* Get number of OTP (One-Time Programmable) regions */

package/mtd-utils/patches/patch-include_mtd_ubi-media_h

@@ -1,18 +0,0 @@
---- mtd-utils-1.5.0.orig/include/mtd/ubi-media.h	2012-05-07 09:19:39.000000000 +0200
-+++ mtd-utils-1.5.0/include/mtd/ubi-media.h	2014-03-30 15:49:26.000000000 +0200
-@@ -30,7 +30,15 @@
- #ifndef __UBI_MEDIA_H__
- #define __UBI_MEDIA_H__
- 
-+#ifdef __linux__
- #include <asm/byteorder.h>
-+#else
-+#include <stdint.h> 
-+typedef uint8_t __u8; 
-+typedef uint16_t __be16; 
-+typedef uint32_t __be32; 
-+typedef uint64_t __be64; 
-+#endif
- 
- /* The version of UBI images supported by this implementation */
- #define UBI_VERSION 1

package/mtd-utils/patches/patch-lib_libfec_c

@@ -1,20 +0,0 @@
---- mtd-utils-1.5.0.orig/lib/libfec.c	2012-05-07 09:19:39.000000000 +0200
-+++ mtd-utils-1.5.0/lib/libfec.c	2014-03-30 15:49:26.000000000 +0200
-@@ -61,8 +61,6 @@ struct timeval {
- };
- #define gettimeofday(x, dummy) { (x)->ticks = clock() ; }
- #define DIFF_T(a,b) (1+ 1000000*(a.ticks - b.ticks) / CLOCKS_PER_SEC )
--typedef unsigned long u_long ;
--typedef unsigned short u_short ;
- #else /* typically, unix systems */
- #include <sys/time.h>
- #define DIFF_T(a,b) \
-@@ -625,7 +623,7 @@ init_fec(void)
- #define FEC_MAGIC	0xFECC0DEC
- 
- struct fec_parms {
--    u_long magic ;
-+    unsigned long magic ;
-     int k, n ;		/* parameters of the code */
-     gf *enc_matrix ;
- } ;

package/mtd-utils/patches/patch-lib_libmtd_c

@@ -1,38 +0,0 @@
---- mtd-utils-1.5.0.orig/lib/libmtd.c	2012-05-07 09:19:39.000000000 +0200
-+++ mtd-utils-1.5.0/lib/libmtd.c	2014-03-30 15:49:26.000000000 +0200
-@@ -1006,7 +1006,7 @@ out:
- int mtd_is_bad(const struct mtd_dev_info *mtd, int fd, int eb)
- {
- 	int ret;
--	loff_t seek;
-+	off_t seek;
- 
- 	ret = mtd_valid_erase_block(mtd, eb);
- 	if (ret)
-@@ -1015,7 +1015,7 @@ int mtd_is_bad(const struct mtd_dev_info
- 	if (!mtd->bb_allowed)
- 		return 0;
- 
--	seek = (loff_t)eb * mtd->eb_size;
-+	seek = (off_t)eb * mtd->eb_size;
- 	ret = ioctl(fd, MEMGETBADBLOCK, &seek);
- 	if (ret == -1)
- 		return mtd_ioctl_error(mtd, eb, "MEMGETBADBLOCK");
-@@ -1025,7 +1025,7 @@ int mtd_is_bad(const struct mtd_dev_info
- int mtd_mark_bad(const struct mtd_dev_info *mtd, int fd, int eb)
- {
- 	int ret;
--	loff_t seek;
-+	off_t seek;
- 
- 	if (!mtd->bb_allowed) {
- 		errno = EINVAL;
-@@ -1036,7 +1036,7 @@ int mtd_mark_bad(const struct mtd_dev_in
- 	if (ret)
- 		return ret;
- 
--	seek = (loff_t)eb * mtd->eb_size;
-+	seek = (off_t)eb * mtd->eb_size;
- 	ret = ioctl(fd, MEMSETBADBLOCK, &seek);
- 	if (ret == -1)
- 		return mtd_ioctl_error(mtd, eb, "MEMSETBADBLOCK");

package/mtd-utils/patches/patch-lib_libmtd_legacy_c

@@ -1,11 +0,0 @@
---- mtd-utils-1.5.0.orig/lib/libmtd_legacy.c	2012-05-07 09:19:39.000000000 +0200
-+++ mtd-utils-1.5.0/lib/libmtd_legacy.c	2014-03-30 15:49:26.000000000 +0200
-@@ -234,7 +234,7 @@ int legacy_get_dev_info(const char *node
- 	struct stat st;
- 	struct mtd_info_user ui;
- 	int fd, ret;
--	loff_t offs = 0;
-+	off_t offs = 0;
- 	struct proc_parse_info pi;
- 
- 	if (stat(node, &st)) {

package/mtd-utils/patches/patch-mkfs_jffs2_c

@@ -1,15 +0,0 @@
---- mtd-utils-1.5.0.orig/mkfs.jffs2.c	2012-05-07 09:19:39.000000000 +0200
-+++ mtd-utils-1.5.0/mkfs.jffs2.c	2014-03-30 15:49:26.000000000 +0200
-@@ -70,7 +70,12 @@
- #include <sys/xattr.h>
- #include <sys/acl.h>
- #endif
-+#if defined(__APPLE__)
-+#include "endian.h"
-+#include "byteswap.h"
-+#else
- #include <byteswap.h>
-+#endif
- #include <crc32.h>
- #include <inttypes.h>
- 

package/mtd-utils/patches/patch-mkfs_ubifs_hashtable_hashtable_itr_c

@@ -1,21 +0,0 @@
---- mtd-utils-ca39eb1.orig/mkfs.ubifs/hashtable/hashtable_itr.c	2012-05-07 09:19:39.000000000 +0200
-+++ mtd-utils-ca39eb1/mkfs.ubifs/hashtable/hashtable_itr.c	2015-12-25 23:30:04.000000000 +0100
-@@ -35,18 +35,6 @@ hashtable_iterator(struct hashtable *h)
- }
- 
- /*****************************************************************************/
--/* key      - return the key of the (key,value) pair at the current position */
--/* value    - return the value of the (key,value) pair at the current position */
--
--void *
--hashtable_iterator_key(struct hashtable_itr *i)
--{ return i->e->k; }
--
--void *
--hashtable_iterator_value(struct hashtable_itr *i)
--{ return i->e->v; }
--
--/*****************************************************************************/
- /* advance - advance the iterator to the next element
-  *           returns zero if advanced to end of table */
- 

package/mtd-utils/patches/patch-mkfs_ubifs_hashtable_hashtable_itr_h

@@ -1,20 +0,0 @@
---- mtd-utils-ca39eb1.orig/mkfs.ubifs/hashtable/hashtable_itr.h	2012-05-07 09:19:39.000000000 +0200
-+++ mtd-utils-ca39eb1/mkfs.ubifs/hashtable/hashtable_itr.h	2015-12-25 23:30:23.000000000 +0100
-@@ -28,7 +28,7 @@ hashtable_iterator(struct hashtable *h);
- /* hashtable_iterator_key
-  * - return the value of the (key,value) pair at the current position */
- 
--extern inline void *
-+static inline void *
- hashtable_iterator_key(struct hashtable_itr *i)
- {
-     return i->e->k;
-@@ -37,7 +37,7 @@ hashtable_iterator_key(struct hashtable_
- /*****************************************************************************/
- /* value - return the value of the (key,value) pair at the current position */
- 
--extern inline void *
-+static inline void *
- hashtable_iterator_value(struct hashtable_itr *i)
- {
-     return i->e->v;

package/mtd-utils/patches/patch-rbtree_h

@@ -1,12 +0,0 @@
---- mtd-utils-1.5.0.orig/rbtree.h	2012-05-07 09:19:39.000000000 +0200
-+++ mtd-utils-1.5.0/rbtree.h	2014-03-30 15:49:26.000000000 +0200
-@@ -94,8 +94,7 @@ static inline struct page * rb_insert_pa
- #ifndef	_LINUX_RBTREE_H
- #define	_LINUX_RBTREE_H
- 
--#include <linux/kernel.h>
--#include <linux/stddef.h>
-+#include <stddef.h>
- 
- struct rb_node
- {