diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
tree | 38caf00263451b5036435cdc36e035b25d32e623 /meta-openembedded/meta-oe/recipes-crypto | |
parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz |
meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-crypto')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.14.0.bb (renamed from meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.13.0.bb) | 9 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.1.bb (renamed from meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.2.bb) | 4 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.26.bb (renamed from meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.25.1.bb) | 6 |
3 files changed, 11 insertions, 8 deletions
diff --git a/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.13.0.bb b/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.14.0.bb index 0854bd672..42e89f639 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.13.0.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.14.0.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://license.txt;md5=a02e03c8fa2c5e7b9b3fcc1b9811fd3b" SECTION = "libs" SRC_URI = "https://botan.randombit.net/releases/Botan-${PV}.tar.xz" -SRC_URI[md5sum] = "9f90c7d523778be5f23f3ce79046ba35" -SRC_URI[sha256sum] = "f57ae42a41e1091bca58f44f41addebd9a390b651603952c881ec89d50187e90" +SRC_URI[md5sum] = "ebc68c08b99bbc4b4fc9bdbfad398b02" +SRC_URI[sha256sum] = "0c10f12b424a40ee19bde00292098e201d7498535c062d8d5b586d07861a54b5" S = "${WORKDIR}/Botan-${PV}" @@ -19,14 +19,15 @@ CPU_armv7ve = "armv7" do_configure() { python3 ${S}/configure.py \ - --prefix="${D}${prefix}" \ + --prefix="${D}${exec_prefix}" \ + --libdir="${D}${libdir}" \ --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-sysroot-dir=${STAGING_DIR_HOST} \ --with-build-dir="${B}" \ --optimize-for-size \ --with-stack-protector \ diff --git a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.2.bb b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.1.bb index 479b9eb37..ec375fed9 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.2.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.1.bb @@ -21,8 +21,8 @@ RDEPENDS_${PN} = " \ " SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz" -SRC_URI[md5sum] = "2b64ca9ea16e823df359eacf9c02414b" -SRC_URI[sha256sum] = "2af0ec9551ab9c870074cae9d3f68d82cab004f4095fa89db0e4413713424a46" +SRC_URI[md5sum] = "cef482c0579f34d9524311ac70c0875f" +SRC_URI[sha256sum] = "92aba4d559a2cf7043faed92e0f22c5addea36bd63f8c039ba5a8f3a159fe7d2" inherit autotools gettext pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.25.1.bb b/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.26.bb index 271f2eaa3..9b6e7ccbe 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.25.1.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.26.bb @@ -18,8 +18,10 @@ LIC_FILES_CHKSUM = " \ SRC_URI = "git://github.com/OpenSC/${BPN}.git" S = "${WORKDIR}/git" -# v1.25.1 -SRCREV = "2713cb09dcd90104cb7bceb5f14cd6f90834f7b1" +# v1.26 +SRCREV = "c7a0cfa08ddc75d963a835d3588170af0e5f1115" + +UPSTREAM_CHECK_GITTAGREGEX = "pkcs11-helper-(?P<pver>\d+(\.\d+)+)" DEPENDS = "zlib nettle gnutls gmp openssl nss nspr" |