summaryrefslogtreecommitdiff
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:09:20 +0100
commit87dcaf2094baf9a7b7993c2ff1f60db73f4248f4 (patch)
treef9c2a03c641cc13e37bf83db7644f208bf296ec7 /meta/recipes-devtools/mtd/mtd-utils/0001-Fix-build-with-musl.patch
parentca5d1273432e20059ab66d721a9eb314a54e81e7 (diff)
downloadopenembedded-core-87dcaf2094baf9a7b7993c2ff1f60db73f4248f4.tar.gz
openembedded-core-87dcaf2094baf9a7b7993c2ff1f60db73f4248f4.tar.bz2
openembedded-core-87dcaf2094baf9a7b7993c2ff1f60db73f4248f4.zip
mtd-utils: refresh patches now merged upstream
Update Upstream-Status tags and apply 010-fix-rpmatch.patch unconditionally, since it's merged unconditionally upstream. 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 @@
-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>
Date: Tue, 6 Oct 2015 23:51:34 +0000
Subject: [PATCH] Fix build with musl
-Upstream-Status: Pending
+Upstream-Status: Backport
Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
---
- mkfs.jffs2.c | 44 ++++++++++++++++++++++++++++++++++++++++++--
- recv_image.c | 1 -
- serve_image.c | 1 -
- 3 files changed, 42 insertions(+), 4 deletions(-)
+ jffsX-utils/mkfs.jffs2.c | 1 +
+ 1 file changed, 1 insertion(+)
-diff --git a/mkfs.jffs2.c b/mkfs.jffs2.c
-index f09c0b2..ed2dc43 100644
+diff --git a/jffsX-utils/mkfs.jffs2.c b/jffsX-utils/mkfs.jffs2.c
+index 5446a16..ca5e0d5 100644
--- a/jffsX-utils/mkfs.jffs2.c
+++ b/jffsX-utils/mkfs.jffs2.c
@@ -72,6 +72,7 @@