summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/mtd/mtd-utils/0001-Fix-build-with-musl.patch
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 /meta/recipes-devtools/mtd/mtd-utils/0001-Fix-build-with-musl.patch
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>
Diffstat (limited to 'meta/recipes-devtools/mtd/mtd-utils/0001-Fix-build-with-musl.patch')
-rw-r--r--meta/recipes-devtools/mtd/mtd-utils/0001-Fix-build-with-musl.patch15
1 files changed, 7 insertions, 8 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 @@