diff options
author | Denys Dmytriyenko <denys@ti.com> | 2019-06-17 21:28:06 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-19 12:46:43 +0100 |
commit | e164dc4184e98c2cacf182cd2e304554cd2ca581 (patch) | |
tree | e8cb3678a72852c8904783621199da182fae4642 /meta/recipes-devtools/mtd/mtd-utils_git.bb | |
parent | 7b077cedc715e2f627efce3e1a8a6afd665f8869 (diff) | |
download | poky-e164dc4184e98c2cacf182cd2e304554cd2ca581.tar.gz |
mtd-utils: upgrade 2.0.2 -> 2.1.0+
* 0001-Revert-Return-correct-error-number-in-ubi_get_vol_in.patch is upstreamed
* Add "crypto" PACKAGECONFIG for UBIFS crypto features
* One extra commit after 2.1.0 release tag is pulled in to fix openssl error
when "crypto" PACKAGECONFIG is not enabled:
| In file included from ../git/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c:25:
| ../git/ubifs-utils/mkfs.ubifs/mkfs.ubifs.h:49:10: fatal error: openssl/rand.h: No such file or directory
| #include <openssl/rand.h>
| ^~~~~~~~~~~~~~~~
| compilation terminated.
| Makefile:3457: recipe for target 'ubifs-utils/mkfs.ubifs/mkfs_ubifs-mkfs.ubifs.o' failed
| make: *** [ubifs-utils/mkfs.ubifs/mkfs_ubifs-mkfs.ubifs.o] Error 1
(From OE-Core rev: 917050ccb750d01a793c053d4b2e0e59723d2e07)
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/mtd/mtd-utils_git.bb')
-rw-r--r-- | meta/recipes-devtools/mtd/mtd-utils_git.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-devtools/mtd/mtd-utils_git.bb b/meta/recipes-devtools/mtd/mtd-utils_git.bb index 9ffac2ed3a..6415fffe61 100644 --- a/meta/recipes-devtools/mtd/mtd-utils_git.bb +++ b/meta/recipes-devtools/mtd/mtd-utils_git.bb | |||
@@ -10,12 +10,11 @@ inherit autotools pkgconfig update-alternatives | |||
10 | DEPENDS = "zlib e2fsprogs util-linux" | 10 | DEPENDS = "zlib e2fsprogs util-linux" |
11 | RDEPENDS_mtd-utils-tests += "bash" | 11 | RDEPENDS_mtd-utils-tests += "bash" |
12 | 12 | ||
13 | PV = "2.0.2+${SRCPV}" | 13 | PV = "2.1.0+${SRCPV}" |
14 | 14 | ||
15 | SRCREV = "bc63d36e39f389c8c17f6a8e9db47f2acc884659" | 15 | SRCREV = "b5027be5f470830ac9543db3c52e076b13abd313" |
16 | SRC_URI = "git://git.infradead.org/mtd-utils.git \ | 16 | SRC_URI = "git://git.infradead.org/mtd-utils.git \ |
17 | file://add-exclusion-to-mkfs-jffs2-git-2.patch \ | 17 | file://add-exclusion-to-mkfs-jffs2-git-2.patch \ |
18 | file://0001-Revert-Return-correct-error-number-in-ubi_get_vol_in.patch \ | ||
19 | " | 18 | " |
20 | 19 | ||
21 | S = "${WORKDIR}/git/" | 20 | S = "${WORKDIR}/git/" |
@@ -28,6 +27,7 @@ EXTRA_OECONF += "--enable-install-tests" | |||
28 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)} lzo" | 27 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)} lzo" |
29 | PACKAGECONFIG[lzo] = "--with-lzo,--without-lzo,lzo" | 28 | PACKAGECONFIG[lzo] = "--with-lzo,--without-lzo,lzo" |
30 | PACKAGECONFIG[xattr] = "--with-xattr,--without-xattr,acl" | 29 | PACKAGECONFIG[xattr] = "--with-xattr,--without-xattr,acl" |
30 | PACKAGECONFIG[crypto] = "--with-crypto,--without-crypto,openssl" | ||
31 | 31 | ||
32 | CPPFLAGS_append_riscv64 = " -pthread -D_REENTRANT" | 32 | CPPFLAGS_append_riscv64 = " -pthread -D_REENTRANT" |
33 | 33 | ||