diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-12-26 20:12:50 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-12-26 20:13:58 +0100 |
| commit | 5b3904201d47a523709cfae7c89027970623bed5 (patch) | |
| tree | 73d2c56d65324b23bc76921610329274d705a617 /package/mtd-utils | |
| parent | 3b2031d96e38090cf5ba2e9efc78cce38376ef8d (diff) | |
mtd-utils: update to latest, patch from buildroot
Diffstat (limited to 'package/mtd-utils')
| -rw-r--r-- | package/mtd-utils/Makefile | 4 | ||||
| -rw-r--r-- | package/mtd-utils/patches/patch-mkfs_ubifs_hashtable_hashtable_itr_c | 21 | ||||
| -rw-r--r-- | package/mtd-utils/patches/patch-mkfs_ubifs_hashtable_hashtable_itr_h | 20 |
3 files changed, 43 insertions, 2 deletions
diff --git a/package/mtd-utils/Makefile b/package/mtd-utils/Makefile index 2fbc56f06..7e995ae89 100644 --- a/package/mtd-utils/Makefile +++ b/package/mtd-utils/Makefile @@ -4,8 +4,8 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= mtd-utils -PKG_VERSION:= 1.5.0 -PKG_RELEASE:= 2 +PKG_VERSION:= 1.5.2 +PKG_RELEASE:= 1 PKG_HASH:= e76c379fdd77818686a221b9642b12540e6060285aa58d6f7d016774c24d5503 PKG_DESCR:= flash filesystem utilities PKG_SECTION:= sys/fs 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 new file mode 100644 index 000000000..3888e85ba --- /dev/null +++ b/package/mtd-utils/patches/patch-mkfs_ubifs_hashtable_hashtable_itr_c @@ -0,0 +1,21 @@ +--- 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 new file mode 100644 index 000000000..6f50fbb6c --- /dev/null +++ b/package/mtd-utils/patches/patch-mkfs_ubifs_hashtable_hashtable_itr_h @@ -0,0 +1,20 @@ +--- 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; |