diff options
-rw-r--r-- | README.adoc | 10 | ||||
-rw-r--r-- | classes/image_types_ostree.bbclass | 8 | ||||
-rw-r--r-- | classes/image_types_ota.bbclass | 2 | ||||
-rw-r--r-- | classes/sota_qemux86-64.bbclass | 2 | ||||
-rw-r--r-- | classes/sota_raspberrypi.bbclass | 1 | ||||
-rw-r--r-- | conf/include/bblayers/sota.inc | 1 | ||||
-rw-r--r-- | conf/include/bblayers/sota_qemux86-64.inc | 1 | ||||
-rw-r--r-- | conf/include/bblayers/sota_raspberrypi2.inc | 1 | ||||
-rw-r--r-- | conf/include/bblayers/sota_raspberrypi3.inc | 1 | ||||
l--------- | lib/oeqa/selftest/cases/qemucommand.py | 1 | ||||
-rw-r--r-- | lib/oeqa/selftest/cases/updater.py (renamed from lib/oeqa/selftest/updater.py) | 25 | ||||
l--------- | lib/oeqa/selftest/qemucommand.py | 1 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot_2016.11.bb | 22 | ||||
-rw-r--r-- | recipes-sota/ostree/ostree_git.bb | 1 | ||||
-rw-r--r-- | recipes-support/libp11/files/0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch | 42 | ||||
-rw-r--r-- | recipes-support/libp11/libp11_0.4.7.bb | 3 | ||||
-rw-r--r-- | recipes-support/util-linux/util-linux_%.bbappend | 3 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/otaimage.py | 2 | ||||
-rw-r--r-- | scripts/qemucommand.py | 4 |
19 files changed, 83 insertions, 48 deletions
diff --git a/README.adoc b/README.adoc index fbd3239..403e0f8 100644 --- a/README.adoc +++ b/README.adoc | |||
@@ -44,6 +44,16 @@ and get as a result an "ostree_repo" folder in your images directory (tmp/deploy | |||
44 | 44 | ||
45 | Although aglsetup.sh hooks provide reasonable defaults for SOTA-related variables, you may want to tune some of them. | 45 | Although aglsetup.sh hooks provide reasonable defaults for SOTA-related variables, you may want to tune some of them. |
46 | 46 | ||
47 | === Build problems | ||
48 | |||
49 | Multilib systems may require adding this line to `local.conf`: | ||
50 | |||
51 | .... | ||
52 | HOSTTOOLS += "x86_64-linux-gnu-gcc" | ||
53 | .... | ||
54 | |||
55 | Ubuntu users that encounter an error due to missing `Python.h` should install `libpython2.7-dev` on their host machine. | ||
56 | |||
47 | == Supported boards | 57 | == Supported boards |
48 | 58 | ||
49 | Currently supported platforms are | 59 | Currently supported platforms are |
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index cf2e52f..f350449 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | inherit image | 3 | inherit image |
4 | 4 | ||
5 | IMAGE_DEPENDS_ostree = "ostree-native:do_populate_sysroot \ | 5 | do_image_ostree[depends] += "ostree-native:do_populate_sysroot \ |
6 | openssl-native:do_populate_sysroot \ | 6 | openssl-native:do_populate_sysroot \ |
7 | coreutils-native:do_populate_sysroot \ | 7 | coreutils-native:do_populate_sysroot \ |
8 | unzip-native:do_populate_sysroot \ | 8 | unzip-native:do_populate_sysroot \ |
@@ -162,7 +162,7 @@ IMAGE_CMD_ostree () { | |||
162 | } | 162 | } |
163 | 163 | ||
164 | IMAGE_TYPEDEP_ostreepush = "ostree" | 164 | IMAGE_TYPEDEP_ostreepush = "ostree" |
165 | IMAGE_DEPENDS_ostreepush = "aktualizr-native:do_populate_sysroot ca-certificates-native:do_populate_sysroot " | 165 | do_image_ostreepush[depends] += "aktualizr-native:do_populate_sysroot ca-certificates-native:do_populate_sysroot" |
166 | IMAGE_CMD_ostreepush () { | 166 | IMAGE_CMD_ostreepush () { |
167 | # Print warnings if credetials are not set or if the file has not been found. | 167 | # Print warnings if credetials are not set or if the file has not been found. |
168 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then | 168 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then |
@@ -180,7 +180,7 @@ IMAGE_CMD_ostreepush () { | |||
180 | } | 180 | } |
181 | 181 | ||
182 | IMAGE_TYPEDEP_garagesign = "ostreepush" | 182 | IMAGE_TYPEDEP_garagesign = "ostreepush" |
183 | IMAGE_DEPENDS_garagesign = "aktualizr-native:do_populate_sysroot" | 183 | do_image_garage_sign[depends] += "aktualizr-native:do_populate_sysroot" |
184 | IMAGE_CMD_garagesign () { | 184 | IMAGE_CMD_garagesign () { |
185 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then | 185 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then |
186 | # if credentials are issued by a server that doesn't support offline signing, exit silently | 186 | # if credentials are issued by a server that doesn't support offline signing, exit silently |
@@ -225,7 +225,7 @@ IMAGE_CMD_garagesign () { | |||
225 | } | 225 | } |
226 | 226 | ||
227 | IMAGE_TYPEDEP_garagecheck = "ostreepush garagesign" | 227 | IMAGE_TYPEDEP_garagecheck = "ostreepush garagesign" |
228 | IMAGE_DEPENDS_garagecheck = "aktualizr-native:do_populate_sysroot" | 228 | do_image_garagecheck[depends] += "aktualizr-native:do_populate_sysroot" |
229 | IMAGE_CMD_garagecheck () { | 229 | IMAGE_CMD_garagecheck () { |
230 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then | 230 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then |
231 | # if credentials are issued by a server that doesn't support offline signing, exit silently | 231 | # if credentials are issued by a server that doesn't support offline signing, exit silently |
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass index 5dc4811..b827444 100644 --- a/classes/image_types_ota.bbclass +++ b/classes/image_types_ota.bbclass | |||
@@ -11,7 +11,7 @@ inherit image | |||
11 | 11 | ||
12 | OSTREE_BOOTLOADER ??= 'u-boot' | 12 | OSTREE_BOOTLOADER ??= 'u-boot' |
13 | 13 | ||
14 | IMAGE_DEPENDS_otaimg = "e2fsprogs-native:do_populate_sysroot \ | 14 | do_image_otaimg[depends] += "e2fsprogs-native:do_populate_sysroot \ |
15 | ${@'grub:do_populate_sysroot' if d.getVar('OSTREE_BOOTLOADER', True) == 'grub' else ''} \ | 15 | ${@'grub:do_populate_sysroot' if d.getVar('OSTREE_BOOTLOADER', True) == 'grub' else ''} \ |
16 | ${@'virtual/bootloader:do_deploy' if d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot' else ''}" | 16 | ${@'virtual/bootloader:do_deploy' if d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot' else ''}" |
17 | 17 | ||
diff --git a/classes/sota_qemux86-64.bbclass b/classes/sota_qemux86-64.bbclass index 53e0026..666ad6b 100644 --- a/classes/sota_qemux86-64.bbclass +++ b/classes/sota_qemux86-64.bbclass | |||
@@ -4,7 +4,7 @@ PREFERRED_VERSION_linux-yocto_qemux86-64_sota = "4.4%" | |||
4 | IMAGE_FSTYPES_remove = "wic" | 4 | IMAGE_FSTYPES_remove = "wic" |
5 | 5 | ||
6 | # U-Boot support for SOTA | 6 | # U-Boot support for SOTA |
7 | PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot-ota" | 7 | PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot" |
8 | UBOOT_MACHINE_sota = "qemu-x86_defconfig" | 8 | UBOOT_MACHINE_sota = "qemu-x86_defconfig" |
9 | OSTREE_BOOTLOADER ?= "u-boot" | 9 | OSTREE_BOOTLOADER ?= "u-boot" |
10 | 10 | ||
diff --git a/classes/sota_raspberrypi.bbclass b/classes/sota_raspberrypi.bbclass index f8e7347..2c69ea0 100644 --- a/classes/sota_raspberrypi.bbclass +++ b/classes/sota_raspberrypi.bbclass | |||
@@ -1,3 +1,4 @@ | |||
1 | RPI_USE_U_BOOT_sota = "1" | ||
1 | KERNEL_IMAGETYPE_sota = "uImage" | 2 | KERNEL_IMAGETYPE_sota = "uImage" |
2 | PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot" | 3 | PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot" |
3 | UBOOT_MACHINE_raspberrypi2_sota ?= "rpi_2_defconfig" | 4 | UBOOT_MACHINE_raspberrypi2_sota ?= "rpi_2_defconfig" |
diff --git a/conf/include/bblayers/sota.inc b/conf/include/bblayers/sota.inc index 97edecb..b1fd28a 100644 --- a/conf/include/bblayers/sota.inc +++ b/conf/include/bblayers/sota.inc | |||
@@ -1,4 +1,3 @@ | |||
1 | |||
2 | BBLAYERS += "${METADIR}/meta-updater" | 1 | BBLAYERS += "${METADIR}/meta-updater" |
3 | BBLAYERS += "${METADIR}/meta-openembedded/meta-filesystems" | 2 | BBLAYERS += "${METADIR}/meta-openembedded/meta-filesystems" |
4 | BBLAYERS += "${METADIR}/meta-openembedded/meta-oe" | 3 | BBLAYERS += "${METADIR}/meta-openembedded/meta-oe" |
diff --git a/conf/include/bblayers/sota_qemux86-64.inc b/conf/include/bblayers/sota_qemux86-64.inc index 22ace81..12d32ff 100644 --- a/conf/include/bblayers/sota_qemux86-64.inc +++ b/conf/include/bblayers/sota_qemux86-64.inc | |||
@@ -1,2 +1 @@ | |||
1 | |||
2 | BBLAYERS += " ${METADIR}/meta-updater-qemux86-64 " | BBLAYERS += " ${METADIR}/meta-updater-qemux86-64 " | |
diff --git a/conf/include/bblayers/sota_raspberrypi2.inc b/conf/include/bblayers/sota_raspberrypi2.inc index 11ede20..cc26679 100644 --- a/conf/include/bblayers/sota_raspberrypi2.inc +++ b/conf/include/bblayers/sota_raspberrypi2.inc | |||
@@ -1,2 +1,3 @@ | |||
1 | BBLAYERS += " ${METADIR}/meta-openembedded/meta-python " | ||
1 | 2 | ||
2 | BBLAYERS += " ${METADIR}/meta-updater-raspberrypi ${METADIR}/meta-raspberrypi " | 3 | BBLAYERS += " ${METADIR}/meta-updater-raspberrypi ${METADIR}/meta-raspberrypi " |
diff --git a/conf/include/bblayers/sota_raspberrypi3.inc b/conf/include/bblayers/sota_raspberrypi3.inc index 11ede20..cc26679 100644 --- a/conf/include/bblayers/sota_raspberrypi3.inc +++ b/conf/include/bblayers/sota_raspberrypi3.inc | |||
@@ -1,2 +1,3 @@ | |||
1 | BBLAYERS += " ${METADIR}/meta-openembedded/meta-python " | ||
1 | 2 | ||
2 | BBLAYERS += " ${METADIR}/meta-updater-raspberrypi ${METADIR}/meta-raspberrypi " | 3 | BBLAYERS += " ${METADIR}/meta-updater-raspberrypi ${METADIR}/meta-raspberrypi " |
diff --git a/lib/oeqa/selftest/cases/qemucommand.py b/lib/oeqa/selftest/cases/qemucommand.py new file mode 120000 index 0000000..075cdb8 --- /dev/null +++ b/lib/oeqa/selftest/cases/qemucommand.py | |||
@@ -0,0 +1 @@ | |||
../../../../scripts/qemucommand.py \ No newline at end of file | |||
diff --git a/lib/oeqa/selftest/updater.py b/lib/oeqa/selftest/cases/updater.py index f28349f..9264616 100644 --- a/lib/oeqa/selftest/updater.py +++ b/lib/oeqa/selftest/cases/updater.py | |||
@@ -1,18 +1,19 @@ | |||
1 | import unittest | ||
2 | import os | 1 | import os |
3 | import logging | 2 | import logging |
4 | import subprocess | 3 | import subprocess |
5 | import time | 4 | import time |
5 | import unittest | ||
6 | 6 | ||
7 | from oeqa.selftest.base import oeSelfTest | 7 | from oeqa.selftest.case import OESelftestTestCase |
8 | from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars | 8 | from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars |
9 | from oeqa.selftest.qemucommand import QemuCommand | 9 | from qemucommand import QemuCommand |
10 | 10 | ||
11 | 11 | ||
12 | class SotaToolsTests(oeSelfTest): | 12 | class SotaToolsTests(OESelftestTestCase): |
13 | 13 | ||
14 | @classmethod | 14 | @classmethod |
15 | def setUpClass(cls): | 15 | def setUpClass(cls): |
16 | super(SotaToolsTests, cls).setUpClass() | ||
16 | logger = logging.getLogger("selftest") | 17 | logger = logging.getLogger("selftest") |
17 | logger.info('Running bitbake to build aktualizr-native tools') | 18 | logger.info('Running bitbake to build aktualizr-native tools') |
18 | bitbake('aktualizr-native') | 19 | bitbake('aktualizr-native') |
@@ -38,14 +39,15 @@ class SotaToolsTests(oeSelfTest): | |||
38 | result = runCmd('%s --help' % p, ignore_status=True) | 39 | result = runCmd('%s --help' % p, ignore_status=True) |
39 | self.assertEqual(result.status, 0, "Status not equal to 0. output: %s" % result.output) | 40 | self.assertEqual(result.status, 0, "Status not equal to 0. output: %s" % result.output) |
40 | 41 | ||
41 | class HsmTests(oeSelfTest): | 42 | |
43 | class HsmTests(OESelftestTestCase): | ||
42 | 44 | ||
43 | def test_hsm(self): | 45 | def test_hsm(self): |
44 | self.write_config('SOTA_CLIENT_FEATURES="hsm"') | 46 | self.write_config('SOTA_CLIENT_FEATURES="hsm"') |
45 | bitbake('core-image-minimal') | 47 | bitbake('core-image-minimal') |
46 | 48 | ||
47 | 49 | ||
48 | class GeneralTests(oeSelfTest): | 50 | class GeneralTests(OESelftestTestCase): |
49 | 51 | ||
50 | def test_feature_sota(self): | 52 | def test_feature_sota(self): |
51 | result = get_bb_var('DISTRO_FEATURES').find('sota') | 53 | result = get_bb_var('DISTRO_FEATURES').find('sota') |
@@ -104,10 +106,11 @@ class GeneralTests(oeSelfTest): | |||
104 | self.assertNotEqual(size1, size2, "Image sizes are identical; image was not rebuilt.") | 106 | self.assertNotEqual(size1, size2, "Image sizes are identical; image was not rebuilt.") |
105 | 107 | ||
106 | 108 | ||
107 | class QemuTests(oeSelfTest): | 109 | class QemuTests(OESelftestTestCase): |
108 | 110 | ||
109 | @classmethod | 111 | @classmethod |
110 | def setUpClass(cls): | 112 | def setUpClass(cls): |
113 | super(QemuTests, cls).setUpClass() | ||
111 | cls.qemu, cls.s = qemu_launch(machine='qemux86-64') | 114 | cls.qemu, cls.s = qemu_launch(machine='qemux86-64') |
112 | 115 | ||
113 | @classmethod | 116 | @classmethod |
@@ -133,12 +136,13 @@ class QemuTests(oeSelfTest): | |||
133 | self.assertEqual(err, b'', 'Error: ' + err.decode()) | 136 | self.assertEqual(err, b'', 'Error: ' + err.decode()) |
134 | print(value.decode()) | 137 | print(value.decode()) |
135 | 138 | ||
136 | class GrubTests(oeSelfTest): | 139 | |
140 | class GrubTests(OESelftestTestCase): | ||
137 | 141 | ||
138 | def setUpLocal(self): | 142 | def setUpLocal(self): |
139 | # This is a bit of a hack but I can't see a better option. | 143 | # This is a bit of a hack but I can't see a better option. |
140 | path = os.path.abspath(os.path.dirname(__file__)) | 144 | path = os.path.abspath(os.path.dirname(__file__)) |
141 | metadir = path + "/../../../../" | 145 | metadir = path + "/../../../../../" |
142 | grub_config = 'OSTREE_BOOTLOADER = "grub"\nMACHINE = "intel-corei7-64"' | 146 | grub_config = 'OSTREE_BOOTLOADER = "grub"\nMACHINE = "intel-corei7-64"' |
143 | self.append_config(grub_config) | 147 | self.append_config(grub_config) |
144 | self.meta_intel = metadir + "meta-intel" | 148 | self.meta_intel = metadir + "meta-intel" |
@@ -161,7 +165,8 @@ class GrubTests(oeSelfTest): | |||
161 | # Strip off line ending. | 165 | # Strip off line ending. |
162 | value_str = value.decode()[:-1] | 166 | value_str = value.decode()[:-1] |
163 | self.assertEqual(value_str, machine, | 167 | self.assertEqual(value_str, machine, |
164 | 'MACHINE does not match hostname: ' + machine + ', ' + value_str) | 168 | 'MACHINE does not match hostname: ' + machine + ', ' + value_str + |
169 | '\nIs tianocore ovmf installed?') | ||
165 | print(value_str) | 170 | print(value_str) |
166 | 171 | ||
167 | 172 | ||
diff --git a/lib/oeqa/selftest/qemucommand.py b/lib/oeqa/selftest/qemucommand.py deleted file mode 120000 index bc06dde..0000000 --- a/lib/oeqa/selftest/qemucommand.py +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | ../../../scripts/qemucommand.py \ No newline at end of file | ||
diff --git a/recipes-bsp/u-boot/u-boot_2016.11.bb b/recipes-bsp/u-boot/u-boot_2016.11.bb deleted file mode 100644 index acd4bb8..0000000 --- a/recipes-bsp/u-boot/u-boot_2016.11.bb +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | require recipes-bsp/u-boot/u-boot.inc | ||
2 | |||
3 | HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome" | ||
4 | SECTION = "bootloaders" | ||
5 | |||
6 | LICENSE = "GPLv2+" | ||
7 | LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" | ||
8 | PE = "1" | ||
9 | |||
10 | DEPENDS += "dtc-native" | ||
11 | |||
12 | SRCREV = "5ea3e51fc481613a8dee8c02848d1b42c81ad892" | ||
13 | SRC_URI = "git://git.denx.de/u-boot.git" | ||
14 | S = "${WORKDIR}/git" | ||
15 | |||
16 | PV = "v2016.11+git${SRCPV}" | ||
17 | |||
18 | #This patch is not compliant with u-boot 2016.11 | ||
19 | #Version of u-boot from yocto 2.2 Morty is 2016.03 from: | ||
20 | # meta/recipes-bsp/u-boot/u-boot_2016.03.bb | ||
21 | SRC_URI_remove_raspberrypi3 = "file://0003-Include-lowlevel_init.o-for-rpi2.patch" | ||
22 | SRC_URI_remove_raspberrypi2 = "file://0003-Include-lowlevel_init.o-for-rpi2.patch" | ||
diff --git a/recipes-sota/ostree/ostree_git.bb b/recipes-sota/ostree/ostree_git.bb index 00559b6..ad85775 100644 --- a/recipes-sota/ostree/ostree_git.bb +++ b/recipes-sota/ostree/ostree_git.bb | |||
@@ -11,6 +11,7 @@ SRC_URI = "gitsm://github.com/ostreedev/ostree.git;branch=master" | |||
11 | SRCREV="854a823e05d6fe8b610c02c2a71eaeb2bf1e98a6" | 11 | SRCREV="854a823e05d6fe8b610c02c2a71eaeb2bf1e98a6" |
12 | 12 | ||
13 | PV = "v2017.13" | 13 | PV = "v2017.13" |
14 | PR = "1" | ||
14 | 15 | ||
15 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
16 | 17 | ||
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 new file mode 100644 index 0000000..0538eff --- /dev/null +++ b/recipes-support/libp11/files/0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From ccab5ce63dd5d3dbb4bd02998d21d34407e550f2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anton Gerasimov <anton.gerasimov@here.com> | ||
3 | Date: Fri, 19 Jan 2018 12:44:27 +0100 | ||
4 | Subject: [PATCH] Workaround for a buggy version of openssl (1.0.2m) | ||
5 | |||
6 | --- | ||
7 | src/p11_pkey.c | 12 +++++++++--- | ||
8 | 1 file changed, 9 insertions(+), 3 deletions(-) | ||
9 | |||
10 | diff --git a/src/p11_pkey.c b/src/p11_pkey.c | ||
11 | index 45d5ad3..75625e6 100644 | ||
12 | --- a/src/p11_pkey.c | ||
13 | +++ b/src/p11_pkey.c | ||
14 | @@ -139,8 +139,14 @@ static void EVP_PKEY_meth_copy(EVP_PKEY_METHOD *dst, const EVP_PKEY_METHOD *src) | ||
15 | |||
16 | #endif | ||
17 | |||
18 | -#if OPENSSL_VERSION_NUMBER < 0x100020d0L || defined(LIBRESSL_VERSION_NUMBER) | ||
19 | -static void EVP_PKEY_meth_get_sign(EVP_PKEY_METHOD *pmeth, | ||
20 | +#if OPENSSL_VERSION_NUMBER <= 0x100020e0L || defined(LIBRESSL_VERSION_NUMBER) | ||
21 | + | ||
22 | +# if (OPENSSL_VERSION_NUMBER & 0xFFFFFFF0) == 0x100020d0L | ||
23 | +# undef EVP_PKEY_meth_get_sign | ||
24 | +# undef EVP_PKEY_meth_get_decrypt | ||
25 | +# endif | ||
26 | + | ||
27 | +void EVP_PKEY_meth_get_sign(EVP_PKEY_METHOD *pmeth, | ||
28 | int (**psign_init) (EVP_PKEY_CTX *ctx), | ||
29 | int (**psign) (EVP_PKEY_CTX *ctx, | ||
30 | unsigned char *sig, size_t *siglen, | ||
31 | @@ -152,7 +158,7 @@ static void EVP_PKEY_meth_get_sign(EVP_PKEY_METHOD *pmeth, | ||
32 | *psign = pmeth->sign; | ||
33 | } | ||
34 | |||
35 | -static void EVP_PKEY_meth_get_decrypt(EVP_PKEY_METHOD *pmeth, | ||
36 | +void EVP_PKEY_meth_get_decrypt(EVP_PKEY_METHOD *pmeth, | ||
37 | int (**pdecrypt_init) (EVP_PKEY_CTX *ctx), | ||
38 | int (**pdecrypt) (EVP_PKEY_CTX *ctx, | ||
39 | unsigned char *out, | ||
40 | -- | ||
41 | 2.15.1 | ||
42 | |||
diff --git a/recipes-support/libp11/libp11_0.4.7.bb b/recipes-support/libp11/libp11_0.4.7.bb index 7d77e90..7a93102 100644 --- a/recipes-support/libp11/libp11_0.4.7.bb +++ b/recipes-support/libp11/libp11_0.4.7.bb | |||
@@ -8,7 +8,8 @@ LICENSE = "LGPLv2+" | |||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" |
9 | DEPENDS = "libtool openssl" | 9 | DEPENDS = "libtool openssl" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/OpenSC/libp11.git" | 11 | SRC_URI = "git://github.com/OpenSC/libp11.git \ |
12 | file://0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch" | ||
12 | SRCREV = "da725ab727342083478150a203a3c80c4551feb4" | 13 | SRCREV = "da725ab727342083478150a203a3c80c4551feb4" |
13 | 14 | ||
14 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
diff --git a/recipes-support/util-linux/util-linux_%.bbappend b/recipes-support/util-linux/util-linux_%.bbappend deleted file mode 100644 index d653bb2..0000000 --- a/recipes-support/util-linux/util-linux_%.bbappend +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | PACKAGES_append_class-native = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ' util-linux-agetty-native util-linux-fdisk-native util-linux-cfdisk-native util-linux-sfdisk-native util-linux-swaponoff-native util-linux-losetup-native util-linux-umount-native util-linux-mount-native util-linux-readprofile-native util-linux-uuidd-native util-linux-uuidgen-native util-linux-lscpu-native util-linux-fsck-native util-linux-blkid util-linux-mkfs-native util-linux-mcookie-native util-linux-reset-native util-linux-mkfs.cramfs-native util-linux-fsck.cramfs-native util-linux-fstrim-native util-linux-partx-native ${PN}-bash-completion-native util-linux-hwclock util-linux-findfs-native util-linux-getopt-native util-linux-sulogin-native', ' ', d)}" | ||
2 | |||
3 | PACKAGES_append_class-native = "${@' util-linux-pylibmount-native' if bb.utils.contains('DISTRO_FEATURES', 'sota', True, False, d) and bb.utils.contains('PACKAGECONFIG', 'pylibmount', True, False, d) else ' '}" | ||
diff --git a/scripts/lib/wic/plugins/source/otaimage.py b/scripts/lib/wic/plugins/source/otaimage.py index 26cfb10..ee8088b 100644 --- a/scripts/lib/wic/plugins/source/otaimage.py +++ b/scripts/lib/wic/plugins/source/otaimage.py | |||
@@ -20,7 +20,7 @@ import os | |||
20 | import sys | 20 | import sys |
21 | 21 | ||
22 | from wic.plugins.source.rawcopy import RawCopyPlugin | 22 | from wic.plugins.source.rawcopy import RawCopyPlugin |
23 | from wic.utils.misc import get_bitbake_var | 23 | from wic.misc import get_bitbake_var |
24 | 24 | ||
25 | logger = logging.getLogger('wic') | 25 | logger = logging.getLogger('wic') |
26 | 26 | ||
diff --git a/scripts/qemucommand.py b/scripts/qemucommand.py index 9a893d8..6b1106d 100644 --- a/scripts/qemucommand.py +++ b/scripts/qemucommand.py | |||
@@ -73,7 +73,7 @@ class QemuCommand(object): | |||
73 | try: | 73 | try: |
74 | check_output(['kvm-ok']) | 74 | check_output(['kvm-ok']) |
75 | self.kvm = True | 75 | self.kvm = True |
76 | except CalledProcessError: | 76 | except Exception: |
77 | self.kvm = False | 77 | self.kvm = False |
78 | else: | 78 | else: |
79 | self.kvm = args.kvm | 79 | self.kvm = args.kvm |
@@ -96,7 +96,7 @@ class QemuCommand(object): | |||
96 | "-serial", "tcp:127.0.0.1:%d,server,nowait" % self.serial_port, | 96 | "-serial", "tcp:127.0.0.1:%d,server,nowait" % self.serial_port, |
97 | "-m", "1G", | 97 | "-m", "1G", |
98 | "-usb", | 98 | "-usb", |
99 | "-usbdevice", "tablet", | 99 | "-device", "usb-tablet", |
100 | "-show-cursor", | 100 | "-show-cursor", |
101 | "-vga", "std", | 101 | "-vga", "std", |
102 | "-net", netuser, | 102 | "-net", netuser, |