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. Signed-off-by: Mike Crowe <m...@mcrowe.com> --- meta/recipes-devtools/mtd/mtd-utils/0001-Fix-build-with-musl.patch | 4 ++-- .../mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git-2.patch | 2 +- meta/recipes-devtools/mtd/mtd-utils/fix-armv7-neon-alignment.patch | 4 ++-- ...-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch | 4 ++-- meta/recipes-devtools/mtd/mtd-utils_git.bb | 6 ++++-- 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 305be52..6a9bd1c 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.k...@gmail.com> diff --git a/mkfs.jffs2.c b/mkfs.jffs2.c index f09c0b2..ed2dc43 100644 ---- a/mkfs.jffs2.c -+++ b/mkfs.jffs2.c +--- a/jffsX-utils/mkfs.jffs2.c ++++ b/jffsX-utils/mkfs.jffs2.c @@ -72,6 +72,7 @@ #include <byteswap.h> #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 57d6a30..0e3776a 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 @@ Upstream-Status: Pending --- /tmp/mkfs.jffs2.c 2009-01-11 15:28:41.000000000 +0100 -+++ git/mkfs.jffs2.c 2009-01-11 15:59:29.000000000 +0100 ++++ git/jffsX-utils/mkfs.jffs2.c 2009-01-11 15:59:29.000000000 +0100 @@ -100,6 +100,11 @@ struct rb_node hardlink_rb; }; 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 05f1629..a279d84 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.hu...@windriver.com> diff --git a/mkfs.ubifs/key.h b/mkfs.ubifs/key.h index d3a02d4..e7e9218 100644 ---- a/mkfs.ubifs/key.h -+++ b/mkfs.ubifs/key.h +--- a/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, */ 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 7207cfc..0f42e73 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, diff --git a/flash_erase.c b/flash_erase.c index 933373a..4b9d84b 100644 ---- a/flash_erase.c -+++ b/flash_erase.c +--- a/misc-utils/flash_erase.c ++++ b/misc-utils/flash_erase.c @@ -99,6 +99,7 @@ int main(int argc, char *argv[]) bool isNAND; int error = 0; diff --git a/meta/recipes-devtools/mtd/mtd-utils_git.bb b/meta/recipes-devtools/mtd/mtd-utils_git.bb index 8a3afaf..d09ac84 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+" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c" +inherit autotools pkgconfig + DEPENDS = "zlib lzo e2fsprogs util-linux" -PV = "1.5.2" +PV = "2.0.0" -SRCREV = "aea36417067dade75192bafa03af70b6eb2677b1" +SRCREV = "1bfee8660131fca7a18f68e9548a18ca6b3378a0" SRC_URI = "git://git.infradead.org/mtd-utils.git \ file://add-exclusion-to-mkfs-jffs2-git-2.patch \ file://fix-armv7-neon-alignment.patch \ -- 2.1.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core