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>
This commit is contained in:
Denys Dmytriyenko
2019-06-17 21:28:06 -04:00
committed by Richard Purdie
parent 7b077cedc7
commit e164dc4184
2 changed files with 3 additions and 95 deletions

View File

@@ -10,12 +10,11 @@ inherit autotools pkgconfig update-alternatives
DEPENDS = "zlib e2fsprogs util-linux"
RDEPENDS_mtd-utils-tests += "bash"
PV = "2.0.2+${SRCPV}"
PV = "2.1.0+${SRCPV}"
SRCREV = "bc63d36e39f389c8c17f6a8e9db47f2acc884659"
SRCREV = "b5027be5f470830ac9543db3c52e076b13abd313"
SRC_URI = "git://git.infradead.org/mtd-utils.git \
file://add-exclusion-to-mkfs-jffs2-git-2.patch \
file://0001-Revert-Return-correct-error-number-in-ubi_get_vol_in.patch \
"
S = "${WORKDIR}/git/"
@@ -28,6 +27,7 @@ EXTRA_OECONF += "--enable-install-tests"
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)} lzo"
PACKAGECONFIG[lzo] = "--with-lzo,--without-lzo,lzo"
PACKAGECONFIG[xattr] = "--with-xattr,--without-xattr,acl"
PACKAGECONFIG[crypto] = "--with-crypto,--without-crypto,openssl"
CPPFLAGS_append_riscv64 = " -pthread -D_REENTRANT"