From 551b2495a0dd1d4640a6787574add9e982263779 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 26 Dec 2016 08:26:29 +0100 Subject: mtd-utils: update to 2.0.0 --- package/mtd-utils/Makefile | 10 +++--- package/mtd-utils/patches/patch-Makefile | 32 ------------------ package/mtd-utils/patches/patch-common_mk | 11 ------- package/mtd-utils/patches/patch-compr_c | 21 ------------ package/mtd-utils/patches/patch-compr_lzo_c | 10 ------ package/mtd-utils/patches/patch-compr_zlib_c | 10 ------ .../patches/patch-include_mtd_jffs2-user_h | 16 --------- .../mtd-utils/patches/patch-include_mtd_mtd-abi_h | 14 -------- .../patches/patch-include_mtd_ubi-media_h | 18 ---------- package/mtd-utils/patches/patch-lib_libfec_c | 20 ------------ package/mtd-utils/patches/patch-lib_libmtd_c | 38 ---------------------- .../mtd-utils/patches/patch-lib_libmtd_legacy_c | 11 ------- package/mtd-utils/patches/patch-mkfs_jffs2_c | 15 --------- .../patch-mkfs_ubifs_hashtable_hashtable_itr_c | 21 ------------ .../patch-mkfs_ubifs_hashtable_hashtable_itr_h | 20 ------------ package/mtd-utils/patches/patch-rbtree_h | 12 ------- 16 files changed, 4 insertions(+), 275 deletions(-) delete mode 100644 package/mtd-utils/patches/patch-Makefile delete mode 100644 package/mtd-utils/patches/patch-common_mk delete mode 100644 package/mtd-utils/patches/patch-compr_c delete mode 100644 package/mtd-utils/patches/patch-compr_lzo_c delete mode 100644 package/mtd-utils/patches/patch-compr_zlib_c delete mode 100644 package/mtd-utils/patches/patch-include_mtd_jffs2-user_h delete mode 100644 package/mtd-utils/patches/patch-include_mtd_mtd-abi_h delete mode 100644 package/mtd-utils/patches/patch-include_mtd_ubi-media_h delete mode 100644 package/mtd-utils/patches/patch-lib_libfec_c delete mode 100644 package/mtd-utils/patches/patch-lib_libmtd_c delete mode 100644 package/mtd-utils/patches/patch-lib_libmtd_legacy_c delete mode 100644 package/mtd-utils/patches/patch-mkfs_jffs2_c delete mode 100644 package/mtd-utils/patches/patch-mkfs_ubifs_hashtable_hashtable_itr_c delete mode 100644 package/mtd-utils/patches/patch-mkfs_ubifs_hashtable_hashtable_itr_h delete mode 100644 package/mtd-utils/patches/patch-rbtree_h (limited to 'package/mtd-utils') diff --git a/package/mtd-utils/Makefile b/package/mtd-utils/Makefile index 04d5e5e26..7bde06104 100644 --- a/package/mtd-utils/Makefile +++ b/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 diff --git a/package/mtd-utils/patches/patch-Makefile b/package/mtd-utils/patches/patch-Makefile deleted file mode 100644 index 89a07af54..000000000 --- a/package/mtd-utils/patches/patch-Makefile +++ /dev/null @@ -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 - diff --git a/package/mtd-utils/patches/patch-common_mk b/package/mtd-utils/patches/patch-common_mk deleted file mode 100644 index 6881db87e..000000000 --- a/package/mtd-utils/patches/patch-common_mk +++ /dev/null @@ -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 diff --git a/package/mtd-utils/patches/patch-compr_c b/package/mtd-utils/patches/patch-compr_c deleted file mode 100644 index c69e133b9..000000000 --- a/package/mtd-utils/patches/patch-compr_c +++ /dev/null @@ -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; - } diff --git a/package/mtd-utils/patches/patch-compr_lzo_c b/package/mtd-utils/patches/patch-compr_lzo_c deleted file mode 100644 index 98f235c5b..000000000 --- a/package/mtd-utils/patches/patch-compr_lzo_c +++ /dev/null @@ -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 - - #ifndef WITHOUT_LZO --#include - #include - #include - #include "compr.h" diff --git a/package/mtd-utils/patches/patch-compr_zlib_c b/package/mtd-utils/patches/patch-compr_zlib_c deleted file mode 100644 index 200bb55ce..000000000 --- a/package/mtd-utils/patches/patch-compr_zlib_c +++ /dev/null @@ -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 - #undef crc32 - #include --#include - #include - #include "common.h" - #include "compr.h" diff --git a/package/mtd-utils/patches/patch-include_mtd_jffs2-user_h b/package/mtd-utils/patches/patch-include_mtd_jffs2-user_h deleted file mode 100644 index 1373b66f2..000000000 --- a/package/mtd-utils/patches/patch-include_mtd_jffs2-user_h +++ /dev/null @@ -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 -+#if defined(__APPLE__) -+#include "endian.h" -+#include "byteswap.h" -+#else - #include - #include -+#endif - - #undef cpu_to_je16 - #undef cpu_to_je32 diff --git a/package/mtd-utils/patches/patch-include_mtd_mtd-abi_h b/package/mtd-utils/patches/patch-include_mtd_mtd-abi_h deleted file mode 100644 index 9a95c4127..000000000 --- a/package/mtd-utils/patches/patch-include_mtd_mtd-abi_h +++ /dev/null @@ -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 */ diff --git a/package/mtd-utils/patches/patch-include_mtd_ubi-media_h b/package/mtd-utils/patches/patch-include_mtd_ubi-media_h deleted file mode 100644 index 33feabf92..000000000 --- a/package/mtd-utils/patches/patch-include_mtd_ubi-media_h +++ /dev/null @@ -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 -+#else -+#include -+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 diff --git a/package/mtd-utils/patches/patch-lib_libfec_c b/package/mtd-utils/patches/patch-lib_libfec_c deleted file mode 100644 index 7b198d0fb..000000000 --- a/package/mtd-utils/patches/patch-lib_libfec_c +++ /dev/null @@ -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 - #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 ; - } ; diff --git a/package/mtd-utils/patches/patch-lib_libmtd_c b/package/mtd-utils/patches/patch-lib_libmtd_c deleted file mode 100644 index af0f9a837..000000000 --- a/package/mtd-utils/patches/patch-lib_libmtd_c +++ /dev/null @@ -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"); diff --git a/package/mtd-utils/patches/patch-lib_libmtd_legacy_c b/package/mtd-utils/patches/patch-lib_libmtd_legacy_c deleted file mode 100644 index bcd66374f..000000000 --- a/package/mtd-utils/patches/patch-lib_libmtd_legacy_c +++ /dev/null @@ -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)) { diff --git a/package/mtd-utils/patches/patch-mkfs_jffs2_c b/package/mtd-utils/patches/patch-mkfs_jffs2_c deleted file mode 100644 index 766e2204a..000000000 --- a/package/mtd-utils/patches/patch-mkfs_jffs2_c +++ /dev/null @@ -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 - #include - #endif -+#if defined(__APPLE__) -+#include "endian.h" -+#include "byteswap.h" -+#else - #include -+#endif - #include - #include - diff --git a/package/mtd-utils/patches/patch-mkfs_ubifs_hashtable_hashtable_itr_c b/package/mtd-utils/patches/patch-mkfs_ubifs_hashtable_hashtable_itr_c deleted file mode 100644 index 3888e85ba..000000000 --- a/package/mtd-utils/patches/patch-mkfs_ubifs_hashtable_hashtable_itr_c +++ /dev/null @@ -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 */ - diff --git a/package/mtd-utils/patches/patch-mkfs_ubifs_hashtable_hashtable_itr_h b/package/mtd-utils/patches/patch-mkfs_ubifs_hashtable_hashtable_itr_h deleted file mode 100644 index 6f50fbb6c..000000000 --- a/package/mtd-utils/patches/patch-mkfs_ubifs_hashtable_hashtable_itr_h +++ /dev/null @@ -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; diff --git a/package/mtd-utils/patches/patch-rbtree_h b/package/mtd-utils/patches/patch-rbtree_h deleted file mode 100644 index b7d34b937..000000000 --- a/package/mtd-utils/patches/patch-rbtree_h +++ /dev/null @@ -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 --#include -+#include - - struct rb_node - { -- cgit v1.2.3