summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py4
-rw-r--r--recipes-connectivity/openssl/files/0001-Fix-broken-change-from-b3d113e.patch29
-rw-r--r--recipes-connectivity/openssl/openssl_1.1.1c.bbappend4
-rw-r--r--recipes-sota/aktualizr/aktualizr_git.bb4
5 files changed, 38 insertions, 5 deletions
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:
77 stage: test 77 stage: test
78 variables: 78 variables:
79 TEST_BUILD_DIR: 'build-oe-rpi' 79 TEST_BUILD_DIR: 'build-oe-rpi'
80 OE_SELFTESTS: 'updater_rpi' 80 OE_SELFTESTS: 'updater_raspberrypi'
81 except: 81 except:
82 - pushes 82 - pushes
83 only: 83 only:
diff --git a/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py b/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py
index e9a1a65..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):
21 self.append_config('PTEST_ENABLED_pn-aktualizr = "1"') 21 self.append_config('PTEST_ENABLED_pn-aktualizr = "1"')
22 self.append_config('IMAGE_INSTALL_append += "aktualizr-ptest ptest-runner "') 22 self.append_config('IMAGE_INSTALL_append += "aktualizr-ptest ptest-runner "')
23 self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"') 23 self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"')
24 self.qemu, self.s = qemu_launch(machine='qemux86-64', mem="256M") 24 self.qemu, self.s = qemu_launch(machine='qemux86-64', mem="768M")
25 25
26 def tearDownLocal(self): 26 def tearDownLocal(self):
27 qemu_terminate(self.s) 27 qemu_terminate(self.s)
@@ -41,7 +41,7 @@ class PtestTests(OESelftestTestCase):
41 if has_failure: 41 if has_failure:
42 print("Full test suite log:") 42 print("Full test suite log:")
43 stdout, _, _ = self.qemu_command('cat /tmp/aktualizr-ptest.log || cat /tmp/aktualizr-ptest.log.tmp', timeout=None) 43 stdout, _, _ = self.qemu_command('cat /tmp/aktualizr-ptest.log || cat /tmp/aktualizr-ptest.log.tmp', timeout=None)
44 print(stdout.decode()) 44 print(stdout.decode(errors='replace'))
45 45
46 self.assertEqual(retcode, 0) 46 self.assertEqual(retcode, 0)
47 self.assertFalse(has_failure) 47 self.assertFalse(has_failure)
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 @@
1From 711a161f03ef9ed7cd149a22bf1203700c103e96 Mon Sep 17 00:00:00 2001
2From: Pauli <paul.dale@oracle.com>
3Date: Fri, 29 Mar 2019 09:24:07 +1000
4Subject: [PATCH] Fix broken change from b3d113e.
5
6Reviewed-by: Tim Hudson <tjh@openssl.org>
7(Merged from https://github.com/openssl/openssl/pull/8606)
8---
9 crypto/rand/rand_lib.c | 3 ++-
10 1 file changed, 2 insertions(+), 1 deletion(-)
11
12diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
13index 23abbde156..a298b7515b 100644
14--- a/crypto/rand/rand_lib.c
15+++ b/crypto/rand/rand_lib.c
16@@ -235,8 +235,9 @@ size_t rand_drbg_get_nonce(RAND_DRBG *drbg,
17 struct {
18 void * instance;
19 int count;
20- } data = { NULL, 0 };
21+ } data;
22
23+ memset(&data, 0, sizeof(data));
24 pool = rand_pool_new(0, min_len, max_len);
25 if (pool == NULL)
26 return 0;
27--
282.20.1
29
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 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
2
3# from https://github.com/openssl/openssl/pull/8606
4SRC_URI += "file://0001-Fix-broken-change-from-b3d113e.patch"
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index 5de341e..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
10RDEPENDS_${PN}_class-target = "aktualizr-configs lshw" 10RDEPENDS_${PN}_class-target = "aktualizr-configs lshw"
11RDEPENDS_${PN}-host-tools = "aktualizr aktualizr-repo aktualizr-cert-provider ${@bb.utils.contains('PACKAGECONFIG', 'sota-tools', 'garage-deploy garage-push', '', d)}" 11RDEPENDS_${PN}-host-tools = "aktualizr aktualizr-repo aktualizr-cert-provider ${@bb.utils.contains('PACKAGECONFIG', 'sota-tools', 'garage-deploy garage-push', '', d)}"
12 12
13RDEPENDS_${PN}-ptest += "bash cmake curl python3-misc python3-modules openssl-bin sqlite3 valgrind" 13RDEPENDS_${PN}-ptest += "bash cmake curl net-tools python3-misc python3-modules openssl-bin sqlite3 valgrind"
14 14
15PV = "1.0+git${SRCPV}" 15PV = "1.0+git${SRCPV}"
16PR = "7" 16PR = "7"
@@ -31,7 +31,7 @@ SRC_URI = " \
31SRC_URI[md5sum] = "e104ccd4f32e52571a5fc0e5042db050" 31SRC_URI[md5sum] = "e104ccd4f32e52571a5fc0e5042db050"
32SRC_URI[sha256sum] = "c590be1a57523bfe097af82279eda5c97cf40ae47fb27162cf33c469702c8a9b" 32SRC_URI[sha256sum] = "c590be1a57523bfe097af82279eda5c97cf40ae47fb27162cf33c469702c8a9b"
33 33
34SRCREV = "9c592cf9d8dfcd995d47753f2be7bd1a2b56c7da" 34SRCREV = "17c3713fb3085fe5459ac0e8244a2047d55cb7ec"
35BRANCH ?= "master" 35BRANCH ?= "master"
36 36
37S = "${WORKDIR}/git" 37S = "${WORKDIR}/git"