From 12dbe3116ed539767ca5d283dd558b565e864a2c Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Tue, 16 Jul 2019 17:23:02 +0200 Subject: Include a valgrind fix for Openssl 1.1.1c Signed-off-by: Laurent Bonnans --- .../0001-Fix-broken-change-from-b3d113e.patch | 29 ++++++++++++++++++++++ .../openssl/openssl_1.1.1c.bbappend | 4 +++ 2 files changed, 33 insertions(+) create mode 100644 recipes-connectivity/openssl/files/0001-Fix-broken-change-from-b3d113e.patch create mode 100644 recipes-connectivity/openssl/openssl_1.1.1c.bbappend diff --git a/recipes-connectivity/openssl/files/0001-Fix-broken-change-from-b3d113e.patch b/recipes-connectivity/openssl/files/0001-Fix-broken-change-from-b3d113e.patch new file mode 100644 index 0000000..b176cc7 --- /dev/null +++ b/recipes-connectivity/openssl/files/0001-Fix-broken-change-from-b3d113e.patch @@ -0,0 +1,29 @@ +From 711a161f03ef9ed7cd149a22bf1203700c103e96 Mon Sep 17 00:00:00 2001 +From: Pauli +Date: Fri, 29 Mar 2019 09:24:07 +1000 +Subject: [PATCH] Fix broken change from b3d113e. + +Reviewed-by: Tim Hudson +(Merged from https://github.com/openssl/openssl/pull/8606) +--- + crypto/rand/rand_lib.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c +index 23abbde156..a298b7515b 100644 +--- a/crypto/rand/rand_lib.c ++++ b/crypto/rand/rand_lib.c +@@ -235,8 +235,9 @@ size_t rand_drbg_get_nonce(RAND_DRBG *drbg, + struct { + void * instance; + int count; +- } data = { NULL, 0 }; ++ } data; + ++ memset(&data, 0, sizeof(data)); + pool = rand_pool_new(0, min_len, max_len); + if (pool == NULL) + return 0; +-- +2.20.1 + diff --git a/recipes-connectivity/openssl/openssl_1.1.1c.bbappend b/recipes-connectivity/openssl/openssl_1.1.1c.bbappend new file mode 100644 index 0000000..85fca9b --- /dev/null +++ b/recipes-connectivity/openssl/openssl_1.1.1c.bbappend @@ -0,0 +1,4 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +# from https://github.com/openssl/openssl/pull/8606 +SRC_URI += "file://0001-Fix-broken-change-from-b3d113e.patch" -- cgit v1.2.3-54-g00ecf From a37f956db2de6a86083ccefa579717a636d1f03c Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Tue, 16 Jul 2019 17:24:10 +0200 Subject: Bump aktualizr with some ptest fixes Signed-off-by: Laurent Bonnans --- recipes-sota/aktualizr/aktualizr_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 5de341e..341e3b4 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb @@ -31,7 +31,7 @@ SRC_URI = " \ SRC_URI[md5sum] = "e104ccd4f32e52571a5fc0e5042db050" SRC_URI[sha256sum] = "c590be1a57523bfe097af82279eda5c97cf40ae47fb27162cf33c469702c8a9b" -SRCREV = "9c592cf9d8dfcd995d47753f2be7bd1a2b56c7da" +SRCREV = "17c3713fb3085fe5459ac0e8244a2047d55cb7ec" BRANCH ?= "master" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf From a206b343583748e05674e6cc9bbcbf8dc4a1c21c Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Tue, 16 Jul 2019 17:36:41 +0200 Subject: Also install net-tools on target for ptest Signed-off-by: Laurent Bonnans --- recipes-sota/aktualizr/aktualizr_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 341e3b4..e9efa35 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb @@ -10,7 +10,7 @@ DEPENDS_append = "${@bb.utils.contains('PTEST_ENABLED', '1', ' coreutils-native RDEPENDS_${PN}_class-target = "aktualizr-configs lshw" RDEPENDS_${PN}-host-tools = "aktualizr aktualizr-repo aktualizr-cert-provider ${@bb.utils.contains('PACKAGECONFIG', 'sota-tools', 'garage-deploy garage-push', '', d)}" -RDEPENDS_${PN}-ptest += "bash cmake curl python3-misc python3-modules openssl-bin sqlite3 valgrind" +RDEPENDS_${PN}-ptest += "bash cmake curl net-tools python3-misc python3-modules openssl-bin sqlite3 valgrind" PV = "1.0+git${SRCPV}" PR = "7" -- cgit v1.2.3-54-g00ecf From 7d7f5ac05e595d97eda1faf7f1c709ce4a05c12b Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Wed, 17 Jul 2019 09:39:52 +0200 Subject: Avoid unicode decode error in ptest The full suite logs often contains invalid utf8 sequences. Signed-off-by: Laurent Bonnans --- lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py b/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py index e9a1a65..6b300f7 100644 --- a/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py +++ b/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py @@ -41,7 +41,7 @@ class PtestTests(OESelftestTestCase): if has_failure: print("Full test suite log:") stdout, _, _ = self.qemu_command('cat /tmp/aktualizr-ptest.log || cat /tmp/aktualizr-ptest.log.tmp', timeout=None) - print(stdout.decode()) + print(stdout.decode(errors='replace')) self.assertEqual(retcode, 0) self.assertFalse(has_failure) -- cgit v1.2.3-54-g00ecf From 8ef25f5d832f0e990fede9e554c04de3a6f7a839 Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Wed, 17 Jul 2019 10:37:37 +0200 Subject: Give 768M of ram to ptest Signed-off-by: Laurent Bonnans --- lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py b/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py index 6b300f7..d20a9f0 100644 --- a/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py +++ b/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py @@ -21,7 +21,7 @@ class PtestTests(OESelftestTestCase): self.append_config('PTEST_ENABLED_pn-aktualizr = "1"') self.append_config('IMAGE_INSTALL_append += "aktualizr-ptest ptest-runner "') self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"') - self.qemu, self.s = qemu_launch(machine='qemux86-64', mem="256M") + self.qemu, self.s = qemu_launch(machine='qemux86-64', mem="768M") def tearDownLocal(self): qemu_terminate(self.s) -- cgit v1.2.3-54-g00ecf From 63fbf879cf47cc2bc159071fe31e4e40763d10c9 Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Wed, 17 Jul 2019 14:07:36 +0200 Subject: Fix raspberrypi selftest gitlab definition Signed-off-by: Laurent Bonnans --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3682753..4b22e20 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -77,7 +77,7 @@ Oe-selftest rpi: stage: test variables: TEST_BUILD_DIR: 'build-oe-rpi' - OE_SELFTESTS: 'updater_rpi' + OE_SELFTESTS: 'updater_raspberrypi' except: - pushes only: -- cgit v1.2.3-54-g00ecf