summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2015-12-10 14:04:48 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-16 12:12:17 +0000
commitf065766508e6cc966d0f11e22fb60ef10d9d8fe6 (patch)
tree16da374ba58ddf36f75907660a5c177cb206c70f
parent5d32aebe36281790e43af5434fb7eb4137d7d05d (diff)
downloadpoky-f065766508e6cc966d0f11e22fb60ef10d9d8fe6.tar.gz
mtd-utils: update to 1.5.2
Drop 0001-hashtable-Remove-duplicate-hashtable_iterator_value-.patch, the problem has been fixed upstream. Drop backported 0001-mtd-utils-libfec-use-standard-C-type-instead-of-u_lo.patch Rebase 0001-Fix-build-with-musl.patch (2 out of 3 fixes have been made upstream) (From OE-Core rev: 3fba41e7f58ba68bb2e215b6f0bc21bae47ca035) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/mtd/mtd-utils/0001-Fix-build-with-musl.patch24
-rw-r--r--meta/recipes-devtools/mtd/mtd-utils/0001-hashtable-Remove-duplicate-hashtable_iterator_value-.patch64
-rw-r--r--meta/recipes-devtools/mtd/mtd-utils/0001-mtd-utils-libfec-use-standard-C-type-instead-of-u_lo.patch56
-rw-r--r--meta/recipes-devtools/mtd/mtd-utils_git.bb6
4 files changed, 2 insertions, 148 deletions
diff --git a/meta/recipes-devtools/mtd/mtd-utils/0001-Fix-build-with-musl.patch b/meta/recipes-devtools/mtd/mtd-utils/0001-Fix-build-with-musl.patch
index d3699c65d6..305be5215d 100644
--- a/meta/recipes-devtools/mtd/mtd-utils/0001-Fix-build-with-musl.patch
+++ b/meta/recipes-devtools/mtd/mtd-utils/0001-Fix-build-with-musl.patch
@@ -24,30 +24,6 @@ index f09c0b2..ed2dc43 100644
24 24
25 #include "rbtree.h" 25 #include "rbtree.h"
26 #include "common.h" 26 #include "common.h"
27diff --git a/recv_image.c b/recv_image.c
28index 26a8361..0093831 100644
29--- a/recv_image.c
30+++ b/recv_image.c
31@@ -4,7 +4,6 @@
32 #define _BSD_SOURCE /* struct ip_mreq */
33
34 #include <errno.h>
35-#include <error.h>
36 #include <stdio.h>
37 #include <netdb.h>
38 #include <stdlib.h>
39diff --git a/serve_image.c b/serve_image.c
40index 38549a1..4f0e946 100644
41--- a/serve_image.c
42+++ b/serve_image.c
43@@ -3,7 +3,6 @@
44
45 #include <time.h>
46 #include <errno.h>
47-#include <error.h>
48 #include <netdb.h>
49 #include <stdio.h>
50 #include <stdlib.h>
51-- 27--
522.6.1 282.6.1
53 29
diff --git a/meta/recipes-devtools/mtd/mtd-utils/0001-hashtable-Remove-duplicate-hashtable_iterator_value-.patch b/meta/recipes-devtools/mtd/mtd-utils/0001-hashtable-Remove-duplicate-hashtable_iterator_value-.patch
deleted file mode 100644
index 2d36158f54..0000000000
--- a/meta/recipes-devtools/mtd/mtd-utils/0001-hashtable-Remove-duplicate-hashtable_iterator_value-.patch
+++ /dev/null
@@ -1,64 +0,0 @@
1From b856ff35c20124ceae40bbc4d32584df47618c96 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 25 Feb 2015 09:28:26 +0000
4Subject: [PATCH] hashtable: Remove duplicate hashtable_iterator_value/hashtable_iterator_key
5
6gcc5 is defaulting to gnu11 instead of gnu89 like previous versions
7as a result the semantics of 'extern inline' changes where in gnu89 for 'extern inline' no external
8visible function is generated,in c99 'external inline' generates externally visible function
9there is no equivalent in c99+ because redefinitions arent allowed
10but 'static inline' remains same for for c89 and c99+, thats why we change the semantics
11so we make the functions static inline, and achieve the same effect
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14Upstream-Status: pending
15
16---
17 mkfs.ubifs/hashtable/hashtable_itr.c | 12 ------------
18 1 file changed, 12 deletions(-)
19
20Index: git/mkfs.ubifs/hashtable/hashtable_itr.h
21===================================================================
22--- git.orig/mkfs.ubifs/hashtable/hashtable_itr.h
23+++ git/mkfs.ubifs/hashtable/hashtable_itr.h
24@@ -28,7 +28,7 @@ hashtable_iterator(struct hashtable *h);
25 /* hashtable_iterator_key
26 * - return the value of the (key,value) pair at the current position */
27
28-extern inline void *
29+static inline void *
30 hashtable_iterator_key(struct hashtable_itr *i)
31 {
32 return i->e->k;
33@@ -37,7 +37,7 @@ hashtable_iterator_key(struct hashtable_
34 /*****************************************************************************/
35 /* value - return the value of the (key,value) pair at the current position */
36
37-extern inline void *
38+static inline void *
39 hashtable_iterator_value(struct hashtable_itr *i)
40 {
41 return i->e->v;
42Index: git/mkfs.ubifs/hashtable/hashtable_itr.c
43===================================================================
44--- git.orig/mkfs.ubifs/hashtable/hashtable_itr.c
45+++ git/mkfs.ubifs/hashtable/hashtable_itr.c
46@@ -35,18 +35,6 @@ hashtable_iterator(struct hashtable *h)
47 }
48
49 /*****************************************************************************/
50-/* key - return the key of the (key,value) pair at the current position */
51-/* value - return the value of the (key,value) pair at the current position */
52-
53-void *
54-hashtable_iterator_key(struct hashtable_itr *i)
55-{ return i->e->k; }
56-
57-void *
58-hashtable_iterator_value(struct hashtable_itr *i)
59-{ return i->e->v; }
60-
61-/*****************************************************************************/
62 /* advance - advance the iterator to the next element
63 * returns zero if advanced to end of table */
64
diff --git a/meta/recipes-devtools/mtd/mtd-utils/0001-mtd-utils-libfec-use-standard-C-type-instead-of-u_lo.patch b/meta/recipes-devtools/mtd/mtd-utils/0001-mtd-utils-libfec-use-standard-C-type-instead-of-u_lo.patch
deleted file mode 100644
index 46ed956d0e..0000000000
--- a/meta/recipes-devtools/mtd/mtd-utils/0001-mtd-utils-libfec-use-standard-C-type-instead-of-u_lo.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1From 26cc709291fc6c5d2e45b26c602407706d9142df Mon Sep 17 00:00:00 2001
2From: Imre Kaloz <kaloz@openwrt.org>
3Date: Mon, 4 May 2015 15:36:34 +0200
4Subject: [PATCH] mtd-utils: libfec: use standard C type instead of u_long
5
6Fixes compilation on hosts with the musl C library.
7Also drops the unused u_short typedef.
8
9Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
10Signed-off-by: Brian Norris <computersforpeace@gmail.com>
11---
12Upstream-Status: Backport
13
14 lib/libfec.c | 8 +++-----
15 1 file changed, 3 insertions(+), 5 deletions(-)
16
17diff --git a/lib/libfec.c b/lib/libfec.c
18index ff5a127..bf68381 100644
19--- a/lib/libfec.c
20+++ b/lib/libfec.c
21@@ -61,8 +61,6 @@ struct timeval {
22 };
23 #define gettimeofday(x, dummy) { (x)->ticks = clock() ; }
24 #define DIFF_T(a,b) (1+ 1000000*(a.ticks - b.ticks) / CLOCKS_PER_SEC )
25-typedef unsigned long u_long ;
26-typedef unsigned short u_short ;
27 #else /* typically, unix systems */
28 #include <sys/time.h>
29 #define DIFF_T(a,b) \
30@@ -75,12 +73,12 @@ typedef unsigned short u_short ;
31 t = x.tv_usec + 1000000* (x.tv_sec & 0xff ) ; \
32 }
33 #define TOCK(t) \
34- { u_long t1 ; TICK(t1) ; \
35+ { unsigned long t1 ; TICK(t1) ; \
36 if (t1 < t) t = 256000000 + t1 - t ; \
37 else t = t1 - t ; \
38 if (t == 0) t = 1 ;}
39
40-u_long ticks[10]; /* vars for timekeeping */
41+unsigned long ticks[10]; /* vars for timekeeping */
42 #else
43 #define DEB(x)
44 #define DDB(x)
45@@ -625,7 +623,7 @@ init_fec(void)
46 #define FEC_MAGIC 0xFECC0DEC
47
48 struct fec_parms {
49- u_long magic ;
50+ unsigned long magic ;
51 int k, n ; /* parameters of the code */
52 gf *enc_matrix ;
53 } ;
54--
552.6.0
56
diff --git a/meta/recipes-devtools/mtd/mtd-utils_git.bb b/meta/recipes-devtools/mtd/mtd-utils_git.bb
index bc15ddd82c..cd9ae06cec 100644
--- a/meta/recipes-devtools/mtd/mtd-utils_git.bb
+++ b/meta/recipes-devtools/mtd/mtd-utils_git.bb
@@ -7,16 +7,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
7 7
8DEPENDS = "zlib lzo e2fsprogs util-linux" 8DEPENDS = "zlib lzo e2fsprogs util-linux"
9 9
10PV = "1.5.1+git${SRCPV}" 10PV = "1.5.2"
11 11
12SRCREV = "9f107132a6a073cce37434ca9cda6917dd8d866b" 12SRCREV = "aea36417067dade75192bafa03af70b6eb2677b1"
13SRC_URI = "git://git.infradead.org/mtd-utils.git \ 13SRC_URI = "git://git.infradead.org/mtd-utils.git \
14 file://add-exclusion-to-mkfs-jffs2-git-2.patch \ 14 file://add-exclusion-to-mkfs-jffs2-git-2.patch \
15 file://fix-armv7-neon-alignment.patch \ 15 file://fix-armv7-neon-alignment.patch \
16 file://0001-hashtable-Remove-duplicate-hashtable_iterator_value-.patch \
17 file://mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch \ 16 file://mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch \
18 file://0001-Fix-build-with-musl.patch \ 17 file://0001-Fix-build-with-musl.patch \
19 file://0001-mtd-utils-libfec-use-standard-C-type-instead-of-u_lo.patch \
20" 18"
21 19
22SRC_URI_append_libc-musl = " file://010-fix-rpmatch.patch " 20SRC_URI_append_libc-musl = " file://010-fix-rpmatch.patch "