diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-oe/recipes-crypto | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-crypto')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.7.0.bb | 55 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.4.bb (renamed from meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb) | 12 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-crypto/engine-pkcs11/engine-pkcs11_0.2.2.bb | 31 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_git.bb | 28 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb | 3 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.25.1.bb (renamed from meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.11.bb) | 9 |
6 files changed, 97 insertions, 41 deletions
diff --git a/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.7.0.bb b/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.7.0.bb new file mode 100644 index 000000000..92853d00e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.7.0.bb @@ -0,0 +1,55 @@ +# Copyright (C) 2018 Khem Raj <raj.khem@gmail.com> +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "Crypto and TLS for C++11" +HOMEPAGE = "https://botan.randombit.net" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://license.txt;md5=bf361fc63df3fa25652ee82c43b7601a" +SECTION = "libs" + + +#v2.7.0 +SRCREV = "5874000d42c338ec95a7ff24cdc0c64e70f967b5" +SRC_URI = "git://github.com/randombit/botan.git" + +S = "${WORKDIR}/git" + +inherit python3native siteinfo lib_package + +CPU ?= "${TARGET_ARCH}" +CPU_x86 = "x86_32" +CPU_armv7a = "armv7" +CPU_armv7ve = "armv7" + +do_configure() { + python3 ${S}/configure.py \ + --prefix="${D}${prefix}" \ + --cpu="${CPU}" \ + --cc-bin="${CXX}" \ + --cxxflags="${CXXFLAGS}" \ + --ldflags="${LDFLAGS}" \ + --with-endian=${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \ + ${@bb.utils.contains("TUNE_FEATURES","neon","","--disable-neon",d)} \ + --with-sysroot-dir=${STAGING_DIR_TARGET} \ + --with-build-dir="${B}" \ + --optimize-for-size \ + --with-stack-protector \ + --enable-shared-library \ + --with-python-versions=3 \ + ${EXTRA_OECONF} +} + +do_compile() { + oe_runmake +} +do_install() { + oe_runmake install + sed -i -e "s|${D}||g" ${D}${libdir}/pkgconfig/botan-2.pc +} + +PACKAGES += "${PN}-python3" + +FILES_${PN}-python3 = "${libdir}/python3" + +RDEPENDS_${PN}-python3 += "python3" + diff --git a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.4.bb index c13b764f7..cc7bc6e01 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.4.bb @@ -4,16 +4,16 @@ device-mapper mappings. These include plain dm-crypt volumes and \ LUKS volumes. The difference is that LUKS uses a metadata header \ and can hence offer more features than plain dm-crypt. On the other \ hand, the header is visible and vulnerable to damage." -HOMEPAGE = "http://code.google.com/p/cryptsetup/" +HOMEPAGE = "https://gitlab.com/cryptsetup/cryptsetup" SECTION = "console" LICENSE = "GPL-2.0-with-OpenSSL-exception" LIC_FILES_CHKSUM = "file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326" -DEPENDS = "util-linux libdevmapper popt libgcrypt" +DEPENDS = "util-linux libdevmapper popt libgcrypt json-c" -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v1.7/${BP}.tar.xz" -SRC_URI[md5sum] = "058ed35c5b776032c2a036838f9e22a7" -SRC_URI[sha256sum] = "7ccf893ef79a38fb92d61f03c17b964982119f5319cdaa85a1335b8558cca016" +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v2.0/${BP}.tar.xz" +SRC_URI[md5sum] = "ed42b31f67d05b05e392d1943d467b8d" +SRC_URI[sha256sum] = "9d3a3c7033293e0c97f0ad0501fd5b4d4913ae497cbf70cca06633ccc54b5734" inherit autotools gettext pkgconfig @@ -33,4 +33,6 @@ RRECOMMENDS_${PN} = "kernel-module-aes-generic \ EXTRA_OECONF = "--enable-static" +FILES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/cryptsetup.conf', '', d)}" + BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-crypto/engine-pkcs11/engine-pkcs11_0.2.2.bb b/meta-openembedded/meta-oe/recipes-crypto/engine-pkcs11/engine-pkcs11_0.2.2.bb deleted file mode 100644 index bc79f356b..000000000 --- a/meta-openembedded/meta-oe/recipes-crypto/engine-pkcs11/engine-pkcs11_0.2.2.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "A PKCS" -DESCRIPTION = "\ -Engine_pkcs11 is an implementation of an engine for OpenSSL. It can be \ -loaded using code, config file or command line and will pass any function \ -call by openssl to a PKCS cards and software for using smart cards in PKCS" -HOMEPAGE = "https://github.com/OpenSC/engine_pkcs11" -SECTION = "Development/Libraries" -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://src/engine_pkcs11.h;beginline=1;endline=26;md5=973a19f8a6105de047f2adfbbfc04c33" -DEPENDS = "openssl libp11" - -SRC_URI = "git://github.com/OpenSC/engine_pkcs11.git" -SRCREV = "132fcf2c8b319f9f4b2ebdc8dcb54ff496dc0519" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -EXTRA_OECONF = "\ - --disable-static \ - --libdir ${libdir}/engines \ -" - -do_install_append () { - rm -f ${D}${libdir}/engines/libpkcs11.la -} - -FILES_${PN} += "${libdir}/engines/libpkcs11${SOLIBSDEV}" -FILES_${PN}-dbg += "${libdir}/engines/.debug/" - -RDEPENDS_${PN} += "openssl libp11 opensc" diff --git a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_git.bb b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_git.bb new file mode 100644 index 000000000..a93ddc823 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_git.bb @@ -0,0 +1,28 @@ +SUMMARY = "Linux Kernel Crypto API User Space Interface Library" +HOMEPAGE = "http://www.chronox.de/libkcapi.html" +LICENSE = "BSD | GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=d0421cf231423bda10cea691b613e866" + +DEPENDS = "libtool" + +S = "${WORKDIR}/git" +# Use v1.1.3 with changes on top for building in OE +SRCREV = "1c736c43eb71fbb5640d00efaf34a1edf1972c49" +PV = "1.1.3+git${SRCPV}" +SRC_URI = " \ + git://github.com/smuellerDD/libkcapi.git \ +" + +inherit autotools + +PACKAGECONFIG ??= "" +PACKAGECONFIG[testapp] = "--enable-kcapi-test,,," +PACKAGECONFIG[apps] = "--enable-kcapi-speed --enable-kcapi-hasher --enable-kcapi-rngapp --enable-kcapi-encapp --enable-kcapi-dgstapp,,," + +do_install_append() { + # bindir contains testapp and apps. However it is always created, even + # when no binaries are installed (empty bin_PROGRAMS in Makefile.am), + rmdir --ignore-fail-on-non-empty ${D}${bindir} +} + +CPPFLAGS_append_libc-musl_toolchain-clang = " -Wno-error=sign-compare" diff --git a/meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb b/meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb index 2a133c69a..be413a1c7 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb @@ -9,4 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/mcrypt/Libmcrypt/${PV}/libmcrypt-${PV}. SRC_URI[md5sum] = "0821830d930a86a5c69110837c55b7da" SRC_URI[sha256sum] = "e4eb6c074bbab168ac47b947c195ff8cef9d51a211cdd18ca9c9ef34d27a373e" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/mcrypt/files/Libmcrypt/" +UPSTREAM_CHECK_REGEX = "Libmcrypt/(?P<pver>\d+(\.\d+)+)/" + inherit autotools-brokensep gettext binconfig diff --git a/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.11.bb b/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.25.1.bb index db71bd03b..271f2eaa3 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.11.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.25.1.bb @@ -11,16 +11,15 @@ SECTION = "Development/Libraries" LICENSE = "GPLv2 & BSD" LIC_FILES_CHKSUM = " \ - file://COPYING;md5=4948810631bcac142af53d32df5b6ee1 \ + file://COPYING;md5=30f10d22cfb1ba98ccd714a41ad3311a \ file://COPYING.GPL;md5=8a71d0475d08eee76d8b6d0c6dbec543 \ - file://COPYING.BSD;md5=f79f90ea7a106796af80b5d05f1f8da1 \ + file://COPYING.BSD;md5=66b7a37c3c10483c1fd86007726104d7 \ " SRC_URI = "git://github.com/OpenSC/${BPN}.git" -SRC_URI[md5sum] = "9f62af9f475901b89355266141306673" -SRC_URI[sha256sum] = "494ec59c93e7c56c528f335d9353849e2e7c94a6b1b41c89604694e738113386" S = "${WORKDIR}/git" -SRCREV = "e7adf8f35be232a4f04c53b4ac409be52792093e" +# v1.25.1 +SRCREV = "2713cb09dcd90104cb7bceb5f14cd6f90834f7b1" DEPENDS = "zlib nettle gnutls gmp openssl nss nspr" |