summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMike Crowe <mac@mcrowe.com>2017-01-04 19:28:46 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-09 13:39:12 +0000
commit780033d5c4355ca9d4a30dff9f1147e890a5e845 (patch)
treea272b206542713d713d52e6bfcc084a05fc82473 /meta
parent1da4d59ec713d148980138d7fdd054549107344f (diff)
downloadpoky-780033d5c4355ca9d4a30dff9f1147e890a5e845.tar.gz
mtd-utils: Upgrade to 2.0.0
Upstream has started using automake which means that the recipe must now inherit from autotools and pkgconfig. The source tree has been reorganised too which requires the paths in the patches to be modified. None of the patches appear to have been applied upstream. (From OE-Core rev: dacf6ab5aaf8cc588280b92d64db2e28c6c07a22) Signed-off-by: Mike Crowe <mac@mcrowe.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/mtd/mtd-utils/0001-Fix-build-with-musl.patch4
-rw-r--r--meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git-2.patch2
-rw-r--r--meta/recipes-devtools/mtd/mtd-utils/fix-armv7-neon-alignment.patch4
-rw-r--r--meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch4
-rw-r--r--meta/recipes-devtools/mtd/mtd-utils_git.bb6
5 files changed, 11 insertions, 9 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 305be5215d..6a9bd1c1d8 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
@@ -14,8 +14,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 14
15diff --git a/mkfs.jffs2.c b/mkfs.jffs2.c 15diff --git a/mkfs.jffs2.c b/mkfs.jffs2.c
16index f09c0b2..ed2dc43 100644 16index f09c0b2..ed2dc43 100644
17--- a/mkfs.jffs2.c 17--- a/jffsX-utils/mkfs.jffs2.c
18+++ b/mkfs.jffs2.c 18+++ b/jffsX-utils/mkfs.jffs2.c
19@@ -72,6 +72,7 @@ 19@@ -72,6 +72,7 @@
20 #include <byteswap.h> 20 #include <byteswap.h>
21 #include <crc32.h> 21 #include <crc32.h>
diff --git a/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git-2.patch b/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git-2.patch
index 57d6a30d82..0e3776af04 100644
--- a/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git-2.patch
+++ b/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git-2.patch
@@ -1,7 +1,7 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3--- /tmp/mkfs.jffs2.c 2009-01-11 15:28:41.000000000 +0100 3--- /tmp/mkfs.jffs2.c 2009-01-11 15:28:41.000000000 +0100
4+++ git/mkfs.jffs2.c 2009-01-11 15:59:29.000000000 +0100 4+++ git/jffsX-utils/mkfs.jffs2.c 2009-01-11 15:59:29.000000000 +0100
5@@ -100,6 +100,11 @@ 5@@ -100,6 +100,11 @@
6 struct rb_node hardlink_rb; 6 struct rb_node hardlink_rb;
7 }; 7 };
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 05f1629d58..a279d84c4e 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
@@ -8,8 +8,8 @@ Signed-off-by: Yuanjie Huang <Yuanjie.Huang@windriver.com>
8 8
9diff --git a/mkfs.ubifs/key.h b/mkfs.ubifs/key.h 9diff --git a/mkfs.ubifs/key.h b/mkfs.ubifs/key.h
10index d3a02d4..e7e9218 100644 10index d3a02d4..e7e9218 100644
11--- a/mkfs.ubifs/key.h 11--- a/ubifs-utils/mkfs.ubifs/key.h
12+++ b/mkfs.ubifs/key.h 12+++ 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, 13@@ -141,10 +141,12 @@ static inline void data_key_init(union ubifs_key *key, ino_t inum,
14 */ 14 */
15 static inline void key_write(const union ubifs_key *from, void *to) 15 static inline void key_write(const union ubifs_key *from, void *to)
diff --git a/meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch b/meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch
index 7207cfcb3a..0f42e73e9a 100644
--- a/meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch
+++ b/meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch
@@ -49,8 +49,8 @@ v2 : get length of availble freeoob bytes from oobinfo information,
49 49
50diff --git a/flash_erase.c b/flash_erase.c 50diff --git a/flash_erase.c b/flash_erase.c
51index 933373a..4b9d84b 100644 51index 933373a..4b9d84b 100644
52--- a/flash_erase.c 52--- a/misc-utils/flash_erase.c
53+++ b/flash_erase.c 53+++ b/misc-utils/flash_erase.c
54@@ -99,6 +99,7 @@ int main(int argc, char *argv[]) 54@@ -99,6 +99,7 @@ int main(int argc, char *argv[])
55 bool isNAND; 55 bool isNAND;
56 int error = 0; 56 int error = 0;
diff --git a/meta/recipes-devtools/mtd/mtd-utils_git.bb b/meta/recipes-devtools/mtd/mtd-utils_git.bb
index 8a3afaf62b..d09ac841ec 100644
--- a/meta/recipes-devtools/mtd/mtd-utils_git.bb
+++ b/meta/recipes-devtools/mtd/mtd-utils_git.bb
@@ -5,11 +5,13 @@ LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ 5LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
6 file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c" 6 file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c"
7 7
8inherit autotools pkgconfig
9
8DEPENDS = "zlib lzo e2fsprogs util-linux" 10DEPENDS = "zlib lzo e2fsprogs util-linux"
9 11
10PV = "1.5.2" 12PV = "2.0.0"
11 13
12SRCREV = "aea36417067dade75192bafa03af70b6eb2677b1" 14SRCREV = "1bfee8660131fca7a18f68e9548a18ca6b3378a0"
13SRC_URI = "git://git.infradead.org/mtd-utils.git \ 15SRC_URI = "git://git.infradead.org/mtd-utils.git \
14 file://add-exclusion-to-mkfs-jffs2-git-2.patch \ 16 file://add-exclusion-to-mkfs-jffs2-git-2.patch \
15 file://fix-armv7-neon-alignment.patch \ 17 file://fix-armv7-neon-alignment.patch \