From cf36fad0b1f2542f04d1b4800c0a4cd593c51dcf Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Tue, 22 May 2018 17:53:08 +0200 Subject: Include fix for qemu in sota_qemux86-64.bbclass --- README.adoc | 6 ------ classes/sota_qemux86-64.bbclass | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/README.adoc b/README.adoc index c47dd1d..75ee9ae 100644 --- a/README.adoc +++ b/README.adoc @@ -53,12 +53,6 @@ Although `aglsetup.sh` hooks provide reasonable defaults for SOTA-related variab === Build problems -Multilib systems may require adding this line to `local.conf`: - -.... -HOSTTOOLS += "x86_64-linux-gnu-gcc" -.... - Ubuntu users that encounter an error due to missing `Python.h` should install `libpython2.7-dev` on their host machine. == Supported boards diff --git a/classes/sota_qemux86-64.bbclass b/classes/sota_qemux86-64.bbclass index 15b2043..82efe52 100644 --- a/classes/sota_qemux86-64.bbclass +++ b/classes/sota_qemux86-64.bbclass @@ -9,3 +9,6 @@ OSTREE_INITRAMFS_FSTYPES ?= "ext4.gz" OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/hda" IMAGE_ROOTFS_EXTRA_SPACE = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', '65536', '', d)}" + +# fix for u-boot/swig build issue +HOSTTOOLS_NONFATAL += "x86_64-linux-gnu-gcc" -- cgit v1.2.3-54-g00ecf From a1fbc691aefbc2b29476b5561bd2e7220217235b Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Wed, 23 May 2018 14:49:02 +0200 Subject: ostree: Don't use autotools-brokensep. The only reason we needed it was because of a relative path that I've now made absolute. --- recipes-sota/ostree/ostree_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-sota/ostree/ostree_git.bb b/recipes-sota/ostree/ostree_git.bb index cdcb485..bfe16e9 100644 --- a/recipes-sota/ostree/ostree_git.bb +++ b/recipes-sota/ostree/ostree_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Tool for managing bootable, immutable, versioned filesystem trees" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" -inherit autotools-brokensep pkgconfig systemd gobject-introspection +inherit autotools pkgconfig systemd gobject-introspection INHERIT_remove_class-native = "systemd" @@ -49,7 +49,7 @@ export STAGING_LIBDIR do_configure() { unset docdir - NOCONFIGURE=1 ./autogen.sh + NOCONFIGURE=1 "${S}/autogen.sh" oe_runconf } -- cgit v1.2.3-54-g00ecf From b5f6bf2b9cf52a49f485898ff4956b93ff5bf597 Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Thu, 31 May 2018 17:10:40 +0200 Subject: ca-certificates: Remove upstreamed patch. --- recipes-support/ca-certificates/ca-certificates_%.bbappend | 1 - 1 file changed, 1 deletion(-) delete mode 100644 recipes-support/ca-certificates/ca-certificates_%.bbappend diff --git a/recipes-support/ca-certificates/ca-certificates_%.bbappend b/recipes-support/ca-certificates/ca-certificates_%.bbappend deleted file mode 100644 index cc95a68..0000000 --- a/recipes-support/ca-certificates/ca-certificates_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -SYSROOT_DIRS += "${sysconfdir}" -- cgit v1.2.3-54-g00ecf From 4b97ad0dce72cede71167e9785cd77b1ddfdcb36 Mon Sep 17 00:00:00 2001 From: Phil Wise Date: Mon, 28 May 2018 12:46:22 +0200 Subject: Get ready for aktualizr-repo tool --- recipes-sota/aktualizr/aktualizr_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 2c0d59f..f55eca8 100755 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb @@ -98,6 +98,7 @@ FILES_${PN}-examples = " \ " FILES_${PN}-host-tools = " \ + ${bindir}/aktualizr-repo \ ${bindir}/aktualizr_cert_provider \ ${bindir}/aktualizr_implicit_writer \ ${bindir}/garage-deploy \ -- cgit v1.2.3-54-g00ecf From cc091e9d9e7fc9e921e9b6ca5fb49bb1cc32c1eb Mon Sep 17 00:00:00 2001 From: Phil Wise Date: Fri, 1 Jun 2018 09:05:03 +0200 Subject: Bump PR to flush old sstate caches that were built in-tree The change that removes autotools-brokensep breaks people who have old sstate caches that were built in-tree. Bump the PR to flush these out of the system. --- recipes-sota/ostree/ostree_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-sota/ostree/ostree_git.bb b/recipes-sota/ostree/ostree_git.bb index bfe16e9..afb767f 100644 --- a/recipes-sota/ostree/ostree_git.bb +++ b/recipes-sota/ostree/ostree_git.bb @@ -11,7 +11,7 @@ SRC_URI = "gitsm://github.com/ostreedev/ostree.git;branch=master" SRCREV="854a823e05d6fe8b610c02c2a71eaeb2bf1e98a6" PV = "v2017.13" -PR = "1" +PR = "2" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf From 645c5346b84adb283b2298f0c4f38d5f85688e9f Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Fri, 1 Jun 2018 12:36:04 +0200 Subject: aktualizr_*.bb: Minor formatting and fixes. Move HSM dependencies to aktualizr recipe, since it's aktualizr that can depend on HSM support, not the provisioning prepartion. Remove references to systemd in provisioning recipes, since they have nothing to do with systemd. --- lib/oeqa/selftest/cases/updater.py | 3 +-- recipes-sota/aktualizr/aktualizr-auto-prov.bb | 2 +- recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb | 4 ++-- recipes-sota/aktualizr/aktualizr-hsm-prov.bb | 4 ++-- recipes-sota/aktualizr/aktualizr-implicit-prov.bb | 2 +- recipes-sota/aktualizr/aktualizr_git.bb | 3 ++- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py index dc3f3a2..0253a84 100644 --- a/lib/oeqa/selftest/cases/updater.py +++ b/lib/oeqa/selftest/cases/updater.py @@ -439,8 +439,7 @@ class HsmTests(OESelftestTestCase): # Strip off line ending. value = stdout.decode()[:-1] self.assertEqual(value, machine, - 'MACHINE does not match hostname: ' + machine + ', ' + value + - '\nIs tianocore ovmf installed?') + 'MACHINE does not match hostname: ' + machine + ', ' + value) print(value) print('Checking output of aktualizr-info:') ran_ok = False diff --git a/recipes-sota/aktualizr/aktualizr-auto-prov.bb b/recipes-sota/aktualizr/aktualizr-auto-prov.bb index 8deee7e..c7f1240 100644 --- a/recipes-sota/aktualizr/aktualizr-auto-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-auto-prov.bb @@ -1,5 +1,5 @@ SUMMARY = "Aktualizr configuration for autoprovisioning" -DESCRIPTION = "Systemd service and configurations for autoprovisioning Aktualizr, the SOTA Client application written in C++" +DESCRIPTION = "Configuration for automatically provisioning Aktualizr, the SOTA Client application written in C++" HOMEPAGE = "https://github.com/advancedtelematic/aktualizr" SECTION = "base" LICENSE = "MPL-2.0" diff --git a/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb b/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb index 319074e..c4802ed 100644 --- a/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb @@ -1,5 +1,5 @@ SUMMARY = "Aktualizr configuration for implicit provisioning with CA" -DESCRIPTION = "Systemd service and configurations for implicitly provisioning Aktualizr using externally provided or generated CA" +DESCRIPTION = "Configuration for implicitly provisioning Aktualizr using externally provided or generated CA" # WARNING: it is NOT a production solution. The secure way to provision devices is to create certificate request directly on the device # (either with HSM/TPM or with software) and then sign it with a CA stored on a disconnected machine @@ -36,7 +36,7 @@ do_install() { SOTA_CACERT_PATH=${DEPLOY_DIR_IMAGE}/CA/cacert.pem SOTA_CAKEY_PATH=${DEPLOY_DIR_IMAGE}/CA/ca.private.pem mkdir -p ${DEPLOY_DIR_IMAGE}/CA - bbwarn "SOTA_CACERT_PATH is not specified, use default one at $SOTA_CACERT_PATH" + bbwarn "SOTA_CACERT_PATH is not specified, use default one at $SOTA_CACERT_PATH" if [ ! -f ${SOTA_CACERT_PATH} ]; then bbwarn "${SOTA_CACERT_PATH} does not exist, generate a new CA" diff --git a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb index 504f0d8..7e2d638 100644 --- a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb @@ -1,12 +1,12 @@ SUMMARY = "Aktualizr configuration with HSM support" -DESCRIPTION = "Systemd service and configurations for HSM provisioning with Aktualizr, the SOTA Client application written in C++" +DESCRIPTION = "Configuration for HSM provisioning with Aktualizr, the SOTA Client application written in C++" HOMEPAGE = "https://github.com/advancedtelematic/aktualizr" SECTION = "base" LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=9741c346eef56131163e13b9db1241b3" DEPENDS = "aktualizr-native" -RDEPENDS_${PN} = "aktualizr softhsm softhsm-testtoken" +RDEPENDS_${PN} = "aktualizr" SRC_URI = " \ file://LICENSE \ diff --git a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb index dcfaffb..e5cd79e 100644 --- a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb @@ -1,5 +1,5 @@ SUMMARY = "Aktualizr configuration for implicit provisioning" -DESCRIPTION = "Systemd service and configurations for implicitly provisioning Aktualizr, the SOTA Client application written in C++" +DESCRIPTION = "Configuration for implicitly provisioning Aktualizr, the SOTA Client application written in C++" HOMEPAGE = "https://github.com/advancedtelematic/aktualizr" SECTION = "base" LICENSE = "MPL-2.0" diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 2c0d59f..1374503 100755 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb @@ -10,7 +10,8 @@ DEPENDS_append_class-target = "ostree ${@bb.utils.contains('SOTA_CLIENT_FEATURES DEPENDS_append_class-native = "glib-2.0-native " RDEPENDS_${PN}_class-target = "lshw " -RDEPENDS_${PN}_append_class-target = " ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'serialcan', ' slcand-start', '', d)} " +RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'serialcan', ' slcand-start', '', d)} " +RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', ' softhsm softhsm-testtoken', '', d)}" PV = "1.0+git${SRCPV}" PR = "7" -- cgit v1.2.3-54-g00ecf From e393c71f6a79825b1e0386fb140272663762dce8 Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Fri, 1 Jun 2018 14:42:27 +0200 Subject: aktualizr: Upgrade to use simplified implicit_writer config. There is no longer a need for dumping the whole config, now we can just add what we need to a new config file and use that in addition to the base config. This simplifies several things and fixes a few bugs. Also renamed the configs to make provenance a little clearer. --- recipes-sota/aktualizr/aktualizr-auto-prov.bb | 5 +++-- recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb | 7 ++++--- recipes-sota/aktualizr/aktualizr-hsm-prov.bb | 8 ++++++-- recipes-sota/aktualizr/aktualizr-implicit-prov.bb | 8 ++++++-- recipes-sota/aktualizr/aktualizr_git.bb | 2 +- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/recipes-sota/aktualizr/aktualizr-auto-prov.bb b/recipes-sota/aktualizr/aktualizr-auto-prov.bb index c7f1240..7f4f2e4 100644 --- a/recipes-sota/aktualizr/aktualizr-auto-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-auto-prov.bb @@ -35,7 +35,8 @@ do_install() { if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then aktualizr_toml=${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-network', 'sota_autoprov_primary.toml', 'sota_autoprov.toml', d)} - install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/${aktualizr_toml} ${D}${libdir}/sota/conf.d/20-sota.toml + install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/${aktualizr_toml} \ + ${D}${libdir}/sota/conf.d/20-${aktualizr_toml}.toml # deploy SOTA credentials if [ -e ${SOTA_PACKED_CREDENTIALS} ]; then @@ -48,7 +49,7 @@ do_install() { FILES_${PN} = " \ ${libdir}/sota/conf.d \ - ${libdir}/sota/conf.d/20-sota.toml \ + ${libdir}/sota/conf.d/20-${aktualizr_toml}.toml \ ${localstatedir}/sota \ ${localstatedir}/sota/sota_provisioning_credentials.zip \ " diff --git a/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb b/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb index c4802ed..4d5ff79 100644 --- a/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb @@ -52,19 +52,20 @@ do_install() { fi install -m 0700 -d ${D}${localstatedir}/sota - install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/sota_implicit_prov_ca.toml ${D}${libdir}/sota/conf.d/20-sota.toml + install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/sota_implicit_prov_ca.toml \ + ${D}${libdir}/sota/conf.d/20-sota_implicit_prov_ca.toml aktualizr_cert_provider --credentials ${SOTA_PACKED_CREDENTIALS} \ --device-ca ${SOTA_CACERT_PATH} \ --device-ca-key ${SOTA_CAKEY_PATH} \ --root-ca \ --server-url \ --local ${D}${localstatedir}/sota \ - --config ${D}${libdir}/sota/conf.d/20-sota.toml + --config ${STAGING_DIR_NATIVE}${libdir}/sota/sota_implicit_prov_ca.toml } FILES_${PN} = " \ ${libdir}/sota/conf.d \ - ${libdir}/sota/conf.d/20-sota.toml \ + ${libdir}/sota/conf.d/20-sota_implicit_prov_ca.toml \ ${libdir}/sota/root.crt \ ${localstatedir}/sota/* \ " diff --git a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb index 7e2d638..d526cd2 100644 --- a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb @@ -19,15 +19,19 @@ require credentials.inc do_install() { install -m 0700 -d ${D}${libdir}/sota/conf.d + install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/sota_hsm_prov.toml \ + ${D}${libdir}/sota/conf.d/20-sota_hsm_prov.toml if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} --no-root-ca \ - -i ${STAGING_DIR_NATIVE}${libdir}/sota/sota_hsm_prov.toml -o ${D}${libdir}/sota/conf.d/20-sota.toml -p ${D} + -i ${STAGING_DIR_NATIVE}${libdir}/sota/sota_hsm_prov.toml \ + -o ${D}${libdir}/sota/conf.d/30-implicit_server.toml -p ${D} fi } FILES_${PN} = " \ ${libdir}/sota/conf.d \ - ${libdir}/sota/conf.d/20-sota.toml \ + ${libdir}/sota/conf.d/20-sota_hsm_prov.toml \ + ${libdir}/sota/conf.d/30-implicit_server.toml \ " # vim:set ts=4 sw=4 sts=4 expandtab: diff --git a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb index e5cd79e..e08eeef 100644 --- a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb @@ -19,15 +19,19 @@ require credentials.inc do_install() { install -m 0700 -d ${D}${libdir}/sota/conf.d + install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/sota_implicit_prov.toml \ + ${D}${libdir}/sota/conf.d/20-sota_implicit_prov.toml if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} \ - -i ${STAGING_DIR_NATIVE}${libdir}/sota/sota_implicit_prov.toml -o ${D}${libdir}/sota/conf.d/20-sota.toml -p ${D} + -i ${STAGING_DIR_NATIVE}${libdir}/sota/sota_implicit_prov.toml \ + -o ${D}${libdir}/sota/conf.d/30-implicit_server.toml -p ${D} fi } FILES_${PN} = " \ ${libdir}/sota/conf.d \ - ${libdir}/sota/conf.d/20-sota.toml \ + ${libdir}/sota/conf.d/20-implicit_prov.toml \ + ${libdir}/sota/conf.d/30-implicit_server.toml \ ${libdir}/sota/root.crt \ " diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 1374503..3a3ca56 100755 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb @@ -23,7 +23,7 @@ SRC_URI = " \ file://aktualizr-secondary.socket \ file://aktualizr-serialcan.service \ " -SRCREV = "3b89858cf8ce9a8331cc4e6a5d2b5783d2eb7ae9" +SRCREV = "114dc6c519ca9a605d73ad292821348607d0fa12" BRANCH ?= "master" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf