summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2017-04-06 15:43:53 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-11 18:10:18 +0100
commit31a293d0dc3c6cd6515ded5c00bd2089c3e1826c (patch)
tree9ccf83eaa8cdbb2905c8a45caac9fb38f2c43c21
parent3df7ee4755653f3783a9eaa81b019abf6be7a29a (diff)
downloadpoky-31a293d0dc3c6cd6515ded5c00bd2089c3e1826c.tar.gz
mtd-utils: refresh patches now merged upstream
Update Upstream-Status tags and apply 010-fix-rpmatch.patch unconditionally, since it's merged unconditionally upstream. (From OE-Core rev: 87dcaf2094baf9a7b7993c2ff1f60db73f4248f4) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/mtd/mtd-utils/0001-Fix-build-with-musl.patch15
-rw-r--r--meta/recipes-devtools/mtd/mtd-utils/010-fix-rpmatch.patch45
-rw-r--r--meta/recipes-devtools/mtd/mtd-utils/fix-armv7-neon-alignment.patch21
-rw-r--r--meta/recipes-devtools/mtd/mtd-utils_git.bb3
4 files changed, 66 insertions, 18 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 6a9bd1c1d8..bf3f98f14d 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
@@ -1,19 +1,18 @@
1From e16fa28bc57c29923ab60af2ac343da83e1992d8 Mon Sep 17 00:00:00 2001 1From 4dab9bed1033f797ef9b482c77342fe3fe26d0be Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 6 Oct 2015 23:51:34 +0000 3Date: Tue, 6 Oct 2015 23:51:34 +0000
4Subject: [PATCH] Fix build with musl 4Subject: [PATCH] Fix build with musl
5 5
6Upstream-Status: Pending 6Upstream-Status: Backport
7 7
8Signed-off-by: Khem Raj <raj.khem@gmail.com> 8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
9--- 10---
10 mkfs.jffs2.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 11 jffsX-utils/mkfs.jffs2.c | 1 +
11 recv_image.c | 1 - 12 1 file changed, 1 insertion(+)
12 serve_image.c | 1 -
13 3 files changed, 42 insertions(+), 4 deletions(-)
14 13
15diff --git a/mkfs.jffs2.c b/mkfs.jffs2.c 14diff --git a/jffsX-utils/mkfs.jffs2.c b/jffsX-utils/mkfs.jffs2.c
16index f09c0b2..ed2dc43 100644 15index 5446a16..ca5e0d5 100644
17--- a/jffsX-utils/mkfs.jffs2.c 16--- a/jffsX-utils/mkfs.jffs2.c
18+++ b/jffsX-utils/mkfs.jffs2.c 17+++ b/jffsX-utils/mkfs.jffs2.c
19@@ -72,6 +72,7 @@ 18@@ -72,6 +72,7 @@
diff --git a/meta/recipes-devtools/mtd/mtd-utils/010-fix-rpmatch.patch b/meta/recipes-devtools/mtd/mtd-utils/010-fix-rpmatch.patch
index 7d783e7a5c..853de6af98 100644
--- a/meta/recipes-devtools/mtd/mtd-utils/010-fix-rpmatch.patch
+++ b/meta/recipes-devtools/mtd/mtd-utils/010-fix-rpmatch.patch
@@ -1,11 +1,48 @@
1Replace rpmatch() usage with checking first character of line 1From 82839c3c0371ca2a1643a99d7d01f5bc1c850b28 Mon Sep 17 00:00:00 2001
2From: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
3Date: Thu, 2 Mar 2017 11:40:36 +0100
4Subject: [PATCH] Replace rpmatch() usage with checking first character of line
5
6This is based on the patch from Khem Raj used by openembedded. In
7addition to the original patch, this also removes the fallback
8implementation that was provided for C libraries that don't implement
9rpmatch.
10
11Upstream-Status: Backport
2 12
3Upstream-Status: Pending
4Signed-off-by: Khem Raj <raj.khem@gmail.com> 13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
15---
16 include/common.h | 25 ++++++-------------------
17 1 file changed, 6 insertions(+), 19 deletions(-)
5 18
19diff --git a/include/common.h b/include/common.h
20index d0c706d..d609257 100644
6--- a/include/common.h 21--- a/include/common.h
7+++ b/include/common.h 22+++ b/include/common.h
8@@ -122,10 +122,12 @@ 23@@ -129,21 +129,6 @@ extern "C" {
24 fprintf(stderr, "%s: warning!: " fmt "\n", PROGRAM_NAME, ##__VA_ARGS__); \
25 } while(0)
26
27-/* uClibc versions before 0.9.34 and musl don't have rpmatch() */
28-#if defined(__UCLIBC__) && \
29- (__UCLIBC_MAJOR__ == 0 && \
30- (__UCLIBC_MINOR__ < 9 || \
31- (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ < 34))) || \
32- !defined(__GLIBC__)
33-#undef rpmatch
34-#define rpmatch __rpmatch
35-static inline int __rpmatch(const char *resp)
36-{
37- return (resp[0] == 'y' || resp[0] == 'Y') ? 1 :
38- (resp[0] == 'n' || resp[0] == 'N') ? 0 : -1;
39-}
40-#endif
41-
42 /**
43 * prompt the user for confirmation
44 */
45@@ -164,10 +149,12 @@ static inline bool prompt(const char *msg, bool def)
9 } 46 }
10 47
11 if (strcmp("\n", line) != 0) { 48 if (strcmp("\n", line) != 0) {
@@ -22,3 +59,5 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
22 puts("unknown response; please try again"); 59 puts("unknown response; please try again");
23 continue; 60 continue;
24 } 61 }
62--
632.6.1
diff --git a/meta/recipes-devtools/mtd/mtd-utils/fix-armv7-neon-alignment.patch b/meta/recipes-devtools/mtd/mtd-utils/fix-armv7-neon-alignment.patch
index a279d84c4e..6fc594f00b 100644
--- a/meta/recipes-devtools/mtd/mtd-utils/fix-armv7-neon-alignment.patch
+++ b/meta/recipes-devtools/mtd/mtd-utils/fix-armv7-neon-alignment.patch
@@ -1,16 +1,25 @@
1Upstream-Status: Pending 1From 7d026a85946a08b8167dcd792ea6660bf6a49e08 Mon Sep 17 00:00:00 2001
2From: Yuanjie Huang <Yuanjie.Huang@windriver.com>
3Date: Thu, 2 Mar 2017 10:43:56 +0100
4Subject: [PATCH] Fix alignment trap triggered by NEON instructions
2 5
3NEON instruction VLD1.64 was used to copy 64 bits data after type 6NEON instruction VLD1.64 was used to copy 64 bits data after type
4casting, and they will trigger alignment trap. 7casting, and they will trigger alignment trap.
5This patch uses memcpy to avoid alignment problem. 8This patch uses memcpy to avoid alignment problem.
6 9
10Upstream-Status: Backport
11
7Signed-off-by: Yuanjie Huang <Yuanjie.Huang@windriver.com> 12Signed-off-by: Yuanjie Huang <Yuanjie.Huang@windriver.com>
13Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
14---
15 ubifs-utils/mkfs.ubifs/key.h | 16 ++++++++++------
16 1 file changed, 10 insertions(+), 6 deletions(-)
8 17
9diff --git a/mkfs.ubifs/key.h b/mkfs.ubifs/key.h 18diff --git a/ubifs-utils/mkfs.ubifs/key.h b/ubifs-utils/mkfs.ubifs/key.h
10index d3a02d4..e7e9218 100644 19index 39379fd..118858b 100644
11--- a/ubifs-utils/mkfs.ubifs/key.h 20--- a/ubifs-utils/mkfs.ubifs/key.h
12+++ b/ubifs-utils/mkfs.ubifs/key.h 21+++ b/ubifs-utils/mkfs.ubifs/key.h
13@@ -141,10 +141,12 @@ static inline void data_key_init(union ubifs_key *key, ino_t inum, 22@@ -159,10 +159,12 @@ static inline void data_key_init(union ubifs_key *key, ino_t inum,
14 */ 23 */
15 static inline void key_write(const union ubifs_key *from, void *to) 24 static inline void key_write(const union ubifs_key *from, void *to)
16 { 25 {
@@ -26,7 +35,7 @@ index d3a02d4..e7e9218 100644
26 memset(to + 8, 0, UBIFS_MAX_KEY_LEN - 8); 35 memset(to + 8, 0, UBIFS_MAX_KEY_LEN - 8);
27 } 36 }
28 37
29@@ -156,10 +158,12 @@ static inline void key_write(const union ubifs_key *from, void *to) 38@@ -174,10 +176,12 @@ static inline void key_write(const union ubifs_key *from, void *to)
30 */ 39 */
31 static inline void key_write_idx(const union ubifs_key *from, void *to) 40 static inline void key_write_idx(const union ubifs_key *from, void *to)
32 { 41 {
@@ -42,3 +51,5 @@ index d3a02d4..e7e9218 100644
42 } 51 }
43 52
44 /** 53 /**
54--
552.6.1
diff --git a/meta/recipes-devtools/mtd/mtd-utils_git.bb b/meta/recipes-devtools/mtd/mtd-utils_git.bb
index 30cf13c0dd..4fbc54f8f4 100644
--- a/meta/recipes-devtools/mtd/mtd-utils_git.bb
+++ b/meta/recipes-devtools/mtd/mtd-utils_git.bb
@@ -17,10 +17,9 @@ SRC_URI = "git://git.infradead.org/mtd-utils.git \
17 file://fix-armv7-neon-alignment.patch \ 17 file://fix-armv7-neon-alignment.patch \
18 file://mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch \ 18 file://mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch \
19 file://0001-Fix-build-with-musl.patch \ 19 file://0001-Fix-build-with-musl.patch \
20 file://010-fix-rpmatch.patch \
20" 21"
21 22
22SRC_URI_append_libc-musl = " file://010-fix-rpmatch.patch "
23
24S = "${WORKDIR}/git/" 23S = "${WORKDIR}/git/"
25 24
26# xattr support creates an additional compile-time dependency on acl because 25# xattr support creates an additional compile-time dependency on acl because