summaryrefslogtreecommitdiffstats
path: root/poky
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2019-03-06 19:05:14 -0600
committerAndrew Geissler <geissonator@yahoo.com>2019-03-06 19:05:15 -0600
commitef7893b26574be01a98bbc52cb453067e9bd7658 (patch)
tree45ca879b9496b6eface4bd43c1347d13ee01c1eb /poky
parent889dcc3da248b1fe6d841f249f1afc5f5a164b49 (diff)
downloadtalos-openbmc-ef7893b26574be01a98bbc52cb453067e9bd7658.tar.gz
talos-openbmc-ef7893b26574be01a98bbc52cb453067e9bd7658.zip
poky: refresh thud: 7c76c5d78b..f5a57e939e
Update poky to thud HEAD. Denys Dmytriyenko (1): openssl10: Fix mutliple include assumptions for des.h in opensslconf.h Hongxu Jia (1): rng-tools: Fix crazy defaults Ross Burton (1): mesa: ship /etc/drirc in mesa-megadriver Change-Id: Ia0e006f99bd56df0a2fa09fc6fffc5c8347e1288 Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky')
-rw-r--r--poky/meta/recipes-connectivity/openssl/openssl10/0001-Fix-DES_LONG-breakage.patch35
-rw-r--r--poky/meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb1
-rw-r--r--poky/meta/recipes-graphics/mesa/mesa.inc6
-rw-r--r--poky/meta/recipes-support/rng-tools/rng-tools/rngd.service2
4 files changed, 39 insertions, 5 deletions
diff --git a/poky/meta/recipes-connectivity/openssl/openssl10/0001-Fix-DES_LONG-breakage.patch b/poky/meta/recipes-connectivity/openssl/openssl10/0001-Fix-DES_LONG-breakage.patch
new file mode 100644
index 000000000..7243fb417
--- /dev/null
+++ b/poky/meta/recipes-connectivity/openssl/openssl10/0001-Fix-DES_LONG-breakage.patch
@@ -0,0 +1,35 @@
+From 1aec49cc45e7cf5ebc059a77081ac3ea2a5aff7b Mon Sep 17 00:00:00 2001
+From: Denys Dmytriyenko <denys@ti.com>
+Date: Fri, 1 Mar 2019 13:14:56 -0500
+Subject: [PATCH] Fix DES_LONG breakage
+
+Mimic previous BN_LLONG fix by Khem Raj here. Re-use its description:
+
+opensslconf.h is defining DES_LONG only when included from des.h which
+is not robust at all, especially when include guards are used and
+multiple inclusions of a given header is not allowed. so lets take out
+the nesting constraint and add OPENSSL_SYS_UEFI constraint instead
+
+Upstream-Status: Inappropriate [ fixed differently with OpenSSL 1.1+ ]
+
+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
+---
+ crypto/opensslconf.h.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/crypto/opensslconf.h.in b/crypto/opensslconf.h.in
+index a10c10f..0147a4d 100644
+--- a/crypto/opensslconf.h.in
++++ b/crypto/opensslconf.h.in
+@@ -48,7 +48,7 @@
+ #endif
+ #endif
+
+-#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
++#if !defined(OPENSSL_SYS_UEFI) && !defined(DES_LONG)
+ /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
+ * %20 speed up (longs are 8 bytes, int's are 4). */
+ #ifndef DES_LONG
+--
+2.7.4
+
diff --git a/poky/meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb b/poky/meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb
index 355dbdcc6..54af100f9 100644
--- a/poky/meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb
+++ b/poky/meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb
@@ -41,6 +41,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
file://0001-openssl-force-soft-link-to-avoid-rare-race.patch \
file://0001-allow-manpages-to-be-disabled.patch \
file://0001-Fix-BN_LLONG-breakage.patch \
+ file://0001-Fix-DES_LONG-breakage.patch \
"
SRC_URI_append_class-target = " \
diff --git a/poky/meta/recipes-graphics/mesa/mesa.inc b/poky/meta/recipes-graphics/mesa/mesa.inc
index 0cc0a82de..f47f1aa20 100644
--- a/poky/meta/recipes-graphics/mesa/mesa.inc
+++ b/poky/meta/recipes-graphics/mesa/mesa.inc
@@ -141,8 +141,6 @@ do_install_append () {
rm -f ${D}${libdir}/gallium-pipe/*.la
rm -f ${D}${libdir}/gbm/*.la
- # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used
- rm -f ${D}${sysconfdir}/drirc
chrpath --delete ${D}${libdir}/dri/*_dri.so || true
# libwayland-egl has been moved to wayland 1.15+
@@ -209,8 +207,8 @@ PACKAGESPLITFUNCS_prepend = "mesa_populate_packages "
PACKAGES_DYNAMIC += "^mesa-driver-.*"
-FILES_${PN} += "${sysconfdir}/drirc"
-FILES_mesa-megadriver = "${libdir}/dri/*"
+FILES_${PN} = ""
+FILES_mesa-megadriver = "${libdir}/dri/* ${sysconfdir}"
FILES_mesa-vulkan-drivers = "${libdir}/libvulkan_*.so ${datadir}/vulkan"
FILES_libegl-mesa = "${libdir}/libEGL.so.*"
FILES_libgbm = "${libdir}/libgbm.so.*"
diff --git a/poky/meta/recipes-support/rng-tools/rng-tools/rngd.service b/poky/meta/recipes-support/rng-tools/rng-tools/rngd.service
index cb8102442..f0355db14 100644
--- a/poky/meta/recipes-support/rng-tools/rng-tools/rngd.service
+++ b/poky/meta/recipes-support/rng-tools/rng-tools/rngd.service
@@ -5,7 +5,7 @@ After=systemd-udev-settle.service
Before=sysinit.target
[Service]
-ExecStart=@SBINDIR@/rngd -f -r /dev/urandom
+ExecStart=@SBINDIR@/rngd -f -r /dev/hwrng
SuccessExitStatus=66
[Install]
OpenPOWER on IntegriCloud