From fd66047f721dee191a68163c3dd75c7d6aa253b1 Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Tue, 18 Sep 2018 17:13:01 +0200 Subject: softhsm-testtoken: Remove redundant key check. --- recipes-support/softhsm-testtoken/files/createtoken.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-support/softhsm-testtoken/files/createtoken.sh b/recipes-support/softhsm-testtoken/files/createtoken.sh index 5c67080..b142945 100644 --- a/recipes-support/softhsm-testtoken/files/createtoken.sh +++ b/recipes-support/softhsm-testtoken/files/createtoken.sh @@ -5,7 +5,7 @@ if pkcs11-tool --module=/usr/lib/softhsm/libsofthsm2.so -O; then exit 0 fi -if ! ls /var/sota/import/pkey.pem /var/sota/import/client.pem /var/sota/import/pkey.pem; then +if ! ls /var/sota/import/pkey.pem /var/sota/import/client.pem; then # Key/certificate pair is not present, repeat exit 1 fi -- cgit v1.2.3-54-g00ecf From 8a62b2d42405601e47bf5667953d5d140da2f6b5 Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Fri, 14 Sep 2018 11:58:20 +0200 Subject: libp11: Fix paths after switch to openssl 1.1. It should now accept paths in either format to accommodate openssl versions 1.0 and 1.1. --- recipes-support/libp11/libp11_0.4.7.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-support/libp11/libp11_0.4.7.bb b/recipes-support/libp11/libp11_0.4.7.bb index 02d9e50..00074e5 100644 --- a/recipes-support/libp11/libp11_0.4.7.bb +++ b/recipes-support/libp11/libp11_0.4.7.bb @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig # Currently, Makefile dependencies are incorrectly defined which causes build errors -# The number of jobs is high +# if the number of jobs is high # See https://github.com/OpenSC/libp11/issues/94 PARALLEL_MAKE = "" EXTRA_OECONF = "--disable-static" @@ -28,12 +28,12 @@ do_install_append () { rm -rf ${D}${docdir}/${BPN} } -FILES_${PN} = "${libdir}/engines/pkcs11.so \ - ${libdir}/engines/libpkcs11${SOLIBS} \ +FILES_${PN} = "${libdir}/engines*/pkcs11.so \ + ${libdir}/engines*/libpkcs11${SOLIBS} \ ${libdir}/libp11${SOLIBS}" FILES_${PN}-dev = " \ - ${libdir}/engines/libpkcs11${SOLIBSDEV} \ + ${libdir}/engines*/libpkcs11${SOLIBSDEV} \ ${libdir}/libp11${SOLIBSDEV} \ ${libdir}/pkgconfig/libp11.pc \ /usr/include" -- cgit v1.2.3-54-g00ecf From 99a53ec5c0f2c5a021215727a0220da9abb5a668 Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Fri, 14 Sep 2018 14:28:57 +0200 Subject: libp11: Bump to release 0.4.9. --- recipes-support/libp11/libp11_0.4.7.bb | 39 ---------------------------------- recipes-support/libp11/libp11_0.4.9.bb | 39 ++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 39 deletions(-) delete mode 100644 recipes-support/libp11/libp11_0.4.7.bb create mode 100644 recipes-support/libp11/libp11_0.4.9.bb diff --git a/recipes-support/libp11/libp11_0.4.7.bb b/recipes-support/libp11/libp11_0.4.7.bb deleted file mode 100644 index 00074e5..0000000 --- a/recipes-support/libp11/libp11_0.4.7.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Library for using PKCS" -DESCRIPTION = "\ -Libp11 is a library implementing a small layer on top of PKCS \ -make using PKCS" -HOMEPAGE = "http://www.opensc-project.org/libp11" -SECTION = "Development/Libraries" -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" -DEPENDS = "libtool openssl" -RDEPENDS_${PN} += " opensc" - -SRC_URI = "git://github.com/OpenSC/libp11.git \ - file://0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch" -SRCREV = "da725ab727342083478150a203a3c80c4551feb4" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -# Currently, Makefile dependencies are incorrectly defined which causes build errors -# if the number of jobs is high -# See https://github.com/OpenSC/libp11/issues/94 -PARALLEL_MAKE = "" -EXTRA_OECONF = "--disable-static" - -do_install_append () { - rm -rf ${D}${libdir}/*.la - rm -rf ${D}${docdir}/${BPN} -} - -FILES_${PN} = "${libdir}/engines*/pkcs11.so \ - ${libdir}/engines*/libpkcs11${SOLIBS} \ - ${libdir}/libp11${SOLIBS}" - -FILES_${PN}-dev = " \ - ${libdir}/engines*/libpkcs11${SOLIBSDEV} \ - ${libdir}/libp11${SOLIBSDEV} \ - ${libdir}/pkgconfig/libp11.pc \ - /usr/include" diff --git a/recipes-support/libp11/libp11_0.4.9.bb b/recipes-support/libp11/libp11_0.4.9.bb new file mode 100644 index 0000000..6d0165f --- /dev/null +++ b/recipes-support/libp11/libp11_0.4.9.bb @@ -0,0 +1,39 @@ +SUMMARY = "Library for using PKCS" +DESCRIPTION = "\ +Libp11 is a library implementing a small layer on top of PKCS \ +make using PKCS" +HOMEPAGE = "http://www.opensc-project.org/libp11" +SECTION = "Development/Libraries" +LICENSE = "LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" +DEPENDS = "libtool openssl" +RDEPENDS_${PN} += " opensc" + +SRC_URI = "git://github.com/OpenSC/libp11.git \ + file://0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch" +SRCREV = "e1210903291b1de9eabcad26e740a4b2fbcca692" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +# Currently, Makefile dependencies are incorrectly defined which causes build errors +# if the number of jobs is high +# See https://github.com/OpenSC/libp11/issues/94 +PARALLEL_MAKE = "" +EXTRA_OECONF = "--disable-static" + +do_install_append () { + rm -rf ${D}${libdir}/*.la + rm -rf ${D}${docdir}/${BPN} +} + +FILES_${PN} = "${libdir}/engines*/pkcs11.so \ + ${libdir}/engines*/libpkcs11${SOLIBS} \ + ${libdir}/libp11${SOLIBS}" + +FILES_${PN}-dev = " \ + ${libdir}/engines*/libpkcs11${SOLIBSDEV} \ + ${libdir}/libp11${SOLIBSDEV} \ + ${libdir}/pkgconfig/libp11.pc \ + /usr/include" -- cgit v1.2.3-54-g00ecf From e387dcf0f9e0a5275d6a9fe5cc300410a95b00df Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Fri, 14 Sep 2018 17:46:42 +0200 Subject: Update `installed_versions` passing to new location --- classes/image_types_ota.bbclass | 6 ++++-- recipes-sota/aktualizr/aktualizr_git.bb | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass index 360b746..4a51f24 100644 --- a/classes/image_types_ota.bbclass +++ b/classes/image_types_ota.bbclass @@ -99,7 +99,7 @@ IMAGE_CMD_otaimg () { cp -a ${IMAGE_ROOTFS}/var/sota ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true # Create /var/sota if it doesn't exist yet - mkdir -p ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota || true + mkdir -p ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota # Ensure the permissions are correctly set chmod 700 ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota @@ -112,7 +112,9 @@ IMAGE_CMD_otaimg () { if [ -n "${GARAGE_TARGET_VERSION}" ]; then target_version=${GARAGE_TARGET_VERSION} fi - echo "{\"${ostree_target_hash}\":\"${GARAGE_TARGET_NAME}-${target_version}\"}" > ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota/installed_versions + mkdir -p ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota/import + echo "{\"${ostree_target_hash}\":\"${GARAGE_TARGET_NAME}-${target_version}\"}" > ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota/import/installed_versions + rm -rf ${HOME_TMP} # Calculate image type diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index fd2fdd5..9112546 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 = "8083d4fa67046689d4bf784b908a048a58457d63" +SRCREV = "090c463c6f1ec7a7ceae963cd7b4ba99aa74e1f5" BRANCH ?= "master" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf From 7f86acc51e2aaa291c9ee66b70b671713b2a1dd8 Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Mon, 17 Sep 2018 16:27:52 +0200 Subject: Do not run aktualizr-info --allow-migrate in tests --- lib/oeqa/selftest/cases/updater.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py index 1c5a1dc..a3fe407 100644 --- a/lib/oeqa/selftest/cases/updater.py +++ b/lib/oeqa/selftest/cases/updater.py @@ -226,8 +226,8 @@ class ManualControlTests(OESelftestTestCase): Disable the systemd service then run aktualizr manually """ sleep(20) - stdout, stderr, retcode = self.qemu_command('aktualizr-info --allow-migrate') - self.assertIn(b'Fetched metadata: no', stdout, + stdout, stderr, retcode = self.qemu_command('aktualizr-info') + self.assertIn(b'Can\'t open database', stdout, 'Aktualizr should not have run yet' + stderr.decode() + stdout.decode()) stdout, stderr, retcode = self.qemu_command('aktualizr --running-mode=once') -- cgit v1.2.3-54-g00ecf From d97920396531300644ba27c342644fc08dbf4672 Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Fri, 21 Sep 2018 13:58:16 +0200 Subject: aktualizr: bump to latest for campaign and test fixes. --- 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 9112546..7260af6 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 = "090c463c6f1ec7a7ceae963cd7b4ba99aa74e1f5" +SRCREV = "487905ccb2a4b7e8b01becd051242fe504e85950" BRANCH ?= "master" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf