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>
This commit is contained in:
parent
3df7ee4755
commit
31a293d0dc
|
@ -1,19 +1,18 @@
|
||||||
From e16fa28bc57c29923ab60af2ac343da83e1992d8 Mon Sep 17 00:00:00 2001
|
From 4dab9bed1033f797ef9b482c77342fe3fe26d0be Mon Sep 17 00:00:00 2001
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
Date: Tue, 6 Oct 2015 23:51:34 +0000
|
Date: Tue, 6 Oct 2015 23:51:34 +0000
|
||||||
Subject: [PATCH] Fix build with musl
|
Subject: [PATCH] Fix build with musl
|
||||||
|
|
||||||
Upstream-Status: Pending
|
Upstream-Status: Backport
|
||||||
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
|
||||||
---
|
---
|
||||||
mkfs.jffs2.c | 44 ++++++++++++++++++++++++++++++++++++++++++--
|
jffsX-utils/mkfs.jffs2.c | 1 +
|
||||||
recv_image.c | 1 -
|
1 file changed, 1 insertion(+)
|
||||||
serve_image.c | 1 -
|
|
||||||
3 files changed, 42 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/mkfs.jffs2.c b/mkfs.jffs2.c
|
diff --git a/jffsX-utils/mkfs.jffs2.c b/jffsX-utils/mkfs.jffs2.c
|
||||||
index f09c0b2..ed2dc43 100644
|
index 5446a16..ca5e0d5 100644
|
||||||
--- a/jffsX-utils/mkfs.jffs2.c
|
--- a/jffsX-utils/mkfs.jffs2.c
|
||||||
+++ b/jffsX-utils/mkfs.jffs2.c
|
+++ b/jffsX-utils/mkfs.jffs2.c
|
||||||
@@ -72,6 +72,7 @@
|
@@ -72,6 +72,7 @@
|
||||||
|
|
|
@ -1,11 +1,48 @@
|
||||||
Replace rpmatch() usage with checking first character of line
|
From 82839c3c0371ca2a1643a99d7d01f5bc1c850b28 Mon Sep 17 00:00:00 2001
|
||||||
|
From: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
|
||||||
|
Date: Thu, 2 Mar 2017 11:40:36 +0100
|
||||||
|
Subject: [PATCH] Replace rpmatch() usage with checking first character of line
|
||||||
|
|
||||||
|
This is based on the patch from Khem Raj used by openembedded. In
|
||||||
|
addition to the original patch, this also removes the fallback
|
||||||
|
implementation that was provided for C libraries that don't implement
|
||||||
|
rpmatch.
|
||||||
|
|
||||||
|
Upstream-Status: Backport
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
|
||||||
|
---
|
||||||
|
include/common.h | 25 ++++++-------------------
|
||||||
|
1 file changed, 6 insertions(+), 19 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/include/common.h b/include/common.h
|
||||||
|
index d0c706d..d609257 100644
|
||||||
--- a/include/common.h
|
--- a/include/common.h
|
||||||
+++ b/include/common.h
|
+++ b/include/common.h
|
||||||
@@ -122,10 +122,12 @@
|
@@ -129,21 +129,6 @@ extern "C" {
|
||||||
|
fprintf(stderr, "%s: warning!: " fmt "\n", PROGRAM_NAME, ##__VA_ARGS__); \
|
||||||
|
} while(0)
|
||||||
|
|
||||||
|
-/* uClibc versions before 0.9.34 and musl don't have rpmatch() */
|
||||||
|
-#if defined(__UCLIBC__) && \
|
||||||
|
- (__UCLIBC_MAJOR__ == 0 && \
|
||||||
|
- (__UCLIBC_MINOR__ < 9 || \
|
||||||
|
- (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ < 34))) || \
|
||||||
|
- !defined(__GLIBC__)
|
||||||
|
-#undef rpmatch
|
||||||
|
-#define rpmatch __rpmatch
|
||||||
|
-static inline int __rpmatch(const char *resp)
|
||||||
|
-{
|
||||||
|
- return (resp[0] == 'y' || resp[0] == 'Y') ? 1 :
|
||||||
|
- (resp[0] == 'n' || resp[0] == 'N') ? 0 : -1;
|
||||||
|
-}
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
/**
|
||||||
|
* prompt the user for confirmation
|
||||||
|
*/
|
||||||
|
@@ -164,10 +149,12 @@ static inline bool prompt(const char *msg, bool def)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strcmp("\n", line) != 0) {
|
if (strcmp("\n", line) != 0) {
|
||||||
|
@ -22,3 +59,5 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
puts("unknown response; please try again");
|
puts("unknown response; please try again");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
--
|
||||||
|
2.6.1
|
||||||
|
|
|
@ -1,16 +1,25 @@
|
||||||
Upstream-Status: Pending
|
From 7d026a85946a08b8167dcd792ea6660bf6a49e08 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Yuanjie Huang <Yuanjie.Huang@windriver.com>
|
||||||
|
Date: Thu, 2 Mar 2017 10:43:56 +0100
|
||||||
|
Subject: [PATCH] Fix alignment trap triggered by NEON instructions
|
||||||
|
|
||||||
NEON instruction VLD1.64 was used to copy 64 bits data after type
|
NEON instruction VLD1.64 was used to copy 64 bits data after type
|
||||||
casting, and they will trigger alignment trap.
|
casting, and they will trigger alignment trap.
|
||||||
This patch uses memcpy to avoid alignment problem.
|
This patch uses memcpy to avoid alignment problem.
|
||||||
|
|
||||||
Signed-off-by: Yuanjie Huang <Yuanjie.Huang@windriver.com>
|
Upstream-Status: Backport
|
||||||
|
|
||||||
diff --git a/mkfs.ubifs/key.h b/mkfs.ubifs/key.h
|
Signed-off-by: Yuanjie Huang <Yuanjie.Huang@windriver.com>
|
||||||
index d3a02d4..e7e9218 100644
|
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
|
||||||
|
---
|
||||||
|
ubifs-utils/mkfs.ubifs/key.h | 16 ++++++++++------
|
||||||
|
1 file changed, 10 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/ubifs-utils/mkfs.ubifs/key.h b/ubifs-utils/mkfs.ubifs/key.h
|
||||||
|
index 39379fd..118858b 100644
|
||||||
--- a/ubifs-utils/mkfs.ubifs/key.h
|
--- a/ubifs-utils/mkfs.ubifs/key.h
|
||||||
+++ b/ubifs-utils/mkfs.ubifs/key.h
|
+++ b/ubifs-utils/mkfs.ubifs/key.h
|
||||||
@@ -141,10 +141,12 @@ static inline void data_key_init(union ubifs_key *key, ino_t inum,
|
@@ -159,10 +159,12 @@ static inline void data_key_init(union ubifs_key *key, ino_t inum,
|
||||||
*/
|
*/
|
||||||
static inline void key_write(const union ubifs_key *from, void *to)
|
static inline void key_write(const union ubifs_key *from, void *to)
|
||||||
{
|
{
|
||||||
|
@ -26,7 +35,7 @@ index d3a02d4..e7e9218 100644
|
||||||
memset(to + 8, 0, UBIFS_MAX_KEY_LEN - 8);
|
memset(to + 8, 0, UBIFS_MAX_KEY_LEN - 8);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -156,10 +158,12 @@ static inline void key_write(const union ubifs_key *from, void *to)
|
@@ -174,10 +176,12 @@ static inline void key_write(const union ubifs_key *from, void *to)
|
||||||
*/
|
*/
|
||||||
static inline void key_write_idx(const union ubifs_key *from, void *to)
|
static inline void key_write_idx(const union ubifs_key *from, void *to)
|
||||||
{
|
{
|
||||||
|
@ -42,3 +51,5 @@ index d3a02d4..e7e9218 100644
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
--
|
||||||
|
2.6.1
|
||||||
|
|
|
@ -17,10 +17,9 @@ SRC_URI = "git://git.infradead.org/mtd-utils.git \
|
||||||
file://fix-armv7-neon-alignment.patch \
|
file://fix-armv7-neon-alignment.patch \
|
||||||
file://mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch \
|
file://mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch \
|
||||||
file://0001-Fix-build-with-musl.patch \
|
file://0001-Fix-build-with-musl.patch \
|
||||||
|
file://010-fix-rpmatch.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI_append_libc-musl = " file://010-fix-rpmatch.patch "
|
|
||||||
|
|
||||||
S = "${WORKDIR}/git/"
|
S = "${WORKDIR}/git/"
|
||||||
|
|
||||||
# xattr support creates an additional compile-time dependency on acl because
|
# xattr support creates an additional compile-time dependency on acl because
|
||||||
|
|
Loading…
Reference in New Issue