Merge pull request #378 from advancedtelematic/bugfix/lshw-libp11-openssl-etc-sumo

Bugfix/lshw libp11 openssl etc sumo

5 files changed, 8 insertions, 8 deletions

diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index 5af36e9..b8105a0 100755
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -26,7 +26,7 @@ SRC_URI = " \
   file://aktualizr-secondary.socket \
   file://aktualizr-serialcan.service \
   "
-SRCREV = "a94a15e31f3b973966b1afc9081fc1b17a3b9d48"
+SRCREV = "062ab7756c375ee2c913d3197cafe4ee2f97ef2a"
 BRANCH ?= "master"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-support/libp11/files/0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch b/recipes-support/libp11/files/0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch
index 902352c..55f2ed3 100644
--- a/recipes-support/libp11/files/0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch
+++ b/recipes-support/libp11/files/0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch
@@ -17,7 +17,7 @@ index 45d5ad3..75625e6 100644
  
 -#if OPENSSL_VERSION_NUMBER < 0x100020d0L || defined(LIBRESSL_VERSION_NUMBER)
 -static void EVP_PKEY_meth_get_sign(EVP_PKEY_METHOD *pmeth,
-+#if OPENSSL_VERSION_NUMBER < 0x10002100L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10002110L || defined(LIBRESSL_VERSION_NUMBER)
 +
 +#  if (OPENSSL_VERSION_NUMBER & 0xFFFFFFF0) == 0x100020d0L
 +#    undef EVP_PKEY_meth_get_sign
diff --git a/recipes-support/lshw/files/ldflags.patch b/recipes-support/lshw/files/ldflags.patch
index 83e0410..d95699d 100644
--- a/recipes-support/lshw/files/ldflags.patch
+++ b/recipes-support/lshw/files/ldflags.patch
@@ -1,6 +1,6 @@
-diff -Naur /home/anton/lshw-old/src/Makefile lshw-B.02.16/src/Makefile
+diff -Naur /home/anton/lshw-old/src/Makefile lshw-B.02.17/src/Makefile
 --- /home/anton/lshw-old/src/Makefile   2017-02-07 16:21:52.554738182 +0100
-+++ lshw-B.02.16/src/Makefile   2017-02-07 16:22:45.578588072 +0100
++++ lshw-B.02.17/src/Makefile   2017-02-07 16:22:45.578588072 +0100
 @@ -25,9 +25,9 @@
  ifeq ($(SQLITE), 1)
         CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
diff --git a/recipes-support/lshw/lshw_02.16.bb b/recipes-support/lshw/lshw_02.17.bb
index 99901ff..1ecc4c1 100644
--- a/recipes-support/lshw/lshw_02.16.bb
+++ b/recipes-support/lshw/lshw_02.17.bb
@@ -9,7 +9,7 @@ SUMMARY = "Hardware lister"
 HOMEPAGE = "http://ezix.org/project/wiki/HardwareLiSter"
 SECTION = "console/tools"
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS = "pciutils \
     usbutils"
 COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
@@ -19,8 +19,8 @@ SRC_URI="http://ezix.org/software/files/lshw-B.${PV}.tar.gz \
     file://ldflags.patch \
     "
 
-SRC_URI[md5sum] = "67479167add605e8f001097c30e96d0d"
-SRC_URI[sha256sum] = "809882429555b93259785cc261dbff04c16c93d064db5f445a51945bc47157cb"
+SRC_URI[md5sum] = "a5feb796cb302850eaf5b4530888e3ed"
+SRC_URI[sha256sum] = "eb9cc053fa0f1e78685cb695596e73931bfb55d2377e3bc3b8b94aff4c5a489c"
 
 S="${WORKDIR}/lshw-B.${PV}"
 
diff --git a/scripts/qemucommand.py b/scripts/qemucommand.py
index 4918314..86362f7 100644
--- a/scripts/qemucommand.py
+++ b/scripts/qemucommand.py
@@ -115,7 +115,7 @@ class QemuCommand(object):
         else:
             cmdline.append('-nographic')
         if self.kvm:
-            cmdline.append('-enable-kvm')
+            cmdline += ['-enable-kvm', '-cpu', 'host']
         else:
             cmdline += ['-cpu', 'Haswell']
         if self.overlay: