diff options
author | Anatoliy Odukha <aodukha@gmail.com> | 2020-11-03 20:08:44 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-03 20:08:44 +0200 |
commit | 14f693fc330812c289e2be24a338426f99e2a151 (patch) | |
tree | 4823c937218641956b2663ca60f4ecfa278bdbcf /recipes-sota | |
parent | 075ca14b8800dcae1c2532389e5dd219f6e7c2dd (diff) | |
parent | 8350960da91e314c7b40f4f90534d3b9f947be7e (diff) | |
download | meta-updater-14f693fc330812c289e2be24a338426f99e2a151.tar.gz |
Merge pull request #780 from advancedtelematic/feat/2020.10feat/fix-provisioning-test-timeout
aktualizr: Upgrade to 2020.10 release
Diffstat (limited to 'recipes-sota')
-rw-r--r-- | recipes-sota/aktualizr/aktualizr-device-prov-hsm.bb | 2 | ||||
-rw-r--r-- | recipes-sota/aktualizr/aktualizr-device-prov.bb | 2 | ||||
-rw-r--r-- | recipes-sota/aktualizr/aktualizr-shared-prov.bb | 2 | ||||
-rw-r--r-- | recipes-sota/aktualizr/aktualizr_git.bb | 17 |
4 files changed, 10 insertions, 13 deletions
diff --git a/recipes-sota/aktualizr/aktualizr-device-prov-hsm.bb b/recipes-sota/aktualizr/aktualizr-device-prov-hsm.bb index 8f28c03..7239bfd 100644 --- a/recipes-sota/aktualizr/aktualizr-device-prov-hsm.bb +++ b/recipes-sota/aktualizr/aktualizr-device-prov-hsm.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 | |||
7 | 7 | ||
8 | inherit allarch | 8 | inherit allarch |
9 | 9 | ||
10 | # We need to get the config files from the aktualizr-host-tools package built by | 10 | # We need to get the config files from the aktualizr-configs package built by |
11 | # the aktualizr (target) recipe. | 11 | # the aktualizr (target) recipe. |
12 | DEPENDS = "aktualizr" | 12 | DEPENDS = "aktualizr" |
13 | 13 | ||
diff --git a/recipes-sota/aktualizr/aktualizr-device-prov.bb b/recipes-sota/aktualizr/aktualizr-device-prov.bb index 55f398d..391b098 100644 --- a/recipes-sota/aktualizr/aktualizr-device-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-device-prov.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 | |||
7 | 7 | ||
8 | inherit allarch | 8 | inherit allarch |
9 | 9 | ||
10 | # We need to get the config files from the aktualizr-host-tools package built by | 10 | # We need to get the config files from the aktualizr-configs package built by |
11 | # the aktualizr (target) recipe. | 11 | # the aktualizr (target) recipe. |
12 | DEPENDS = "aktualizr" | 12 | DEPENDS = "aktualizr" |
13 | 13 | ||
diff --git a/recipes-sota/aktualizr/aktualizr-shared-prov.bb b/recipes-sota/aktualizr/aktualizr-shared-prov.bb index 0f712df..0c54f32 100644 --- a/recipes-sota/aktualizr/aktualizr-shared-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-shared-prov.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 | |||
7 | 7 | ||
8 | inherit allarch | 8 | inherit allarch |
9 | 9 | ||
10 | # We need to get the config files from the aktualizr-host-tools package built by | 10 | # We need to get the config files from the aktualizr-configs package built by |
11 | # the aktualizr (target) recipe. | 11 | # the aktualizr (target) recipe. |
12 | DEPENDS = "aktualizr" | 12 | DEPENDS = "aktualizr" |
13 | RDEPENDS_${PN}_append = "${@' aktualizr-shared-prov-creds' if oe.types.boolean(d.getVar('SOTA_DEPLOY_CREDENTIALS')) else ''}" | 13 | RDEPENDS_${PN}_append = "${@' aktualizr-shared-prov-creds' if oe.types.boolean(d.getVar('SOTA_DEPLOY_CREDENTIALS')) else ''}" |
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index e098d11..111ba0a 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb | |||
@@ -7,8 +7,7 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=815ca599c9df247a0c7f619bab123dad" | |||
7 | 7 | ||
8 | DEPENDS = "boost curl openssl libarchive libsodium sqlite3 asn1c-native" | 8 | DEPENDS = "boost curl openssl libarchive libsodium sqlite3 asn1c-native" |
9 | DEPENDS_append = "${@bb.utils.contains('PTEST_ENABLED', '1', ' coreutils-native net-tools-native ostree-native aktualizr-native ', '', d)}" | 9 | DEPENDS_append = "${@bb.utils.contains('PTEST_ENABLED', '1', ' coreutils-native net-tools-native ostree-native aktualizr-native ', '', d)}" |
10 | RDEPENDS_${PN}_class-target = "${PN}-configs ${PN}-hwid lshw" | 10 | RDEPENDS_${PN}_class-target = "${PN}-hwid lshw" |
11 | RDEPENDS_${PN}-host-tools = "aktualizr aktualizr-cert-provider ${@bb.utils.contains('PACKAGECONFIG', 'sota-tools', 'garage-deploy garage-push', '', d)}" | ||
12 | 11 | ||
13 | RDEPENDS_${PN}-ptest += "bash cmake curl net-tools python3-core python3-misc python3-modules openssl-bin sqlite3 valgrind" | 12 | RDEPENDS_${PN}-ptest += "bash cmake curl net-tools python3-core python3-misc python3-modules openssl-bin sqlite3 valgrind" |
14 | 13 | ||
@@ -17,7 +16,7 @@ PRIVATE_LIBS_${PN}-ptest = "libaktualizr.so libaktualizr_secondary.so" | |||
17 | PV = "1.0+git${SRCPV}" | 16 | PV = "1.0+git${SRCPV}" |
18 | PR = "7" | 17 | PR = "7" |
19 | 18 | ||
20 | GARAGE_SIGN_PV = "0.7.1-22-g1d0d714" | 19 | GARAGE_SIGN_PV = "0.7.2-9-g80ae114" |
21 | 20 | ||
22 | SRC_URI = " \ | 21 | SRC_URI = " \ |
23 | gitsm://github.com/advancedtelematic/aktualizr;branch=${BRANCH};name=aktualizr \ | 22 | gitsm://github.com/advancedtelematic/aktualizr;branch=${BRANCH};name=aktualizr \ |
@@ -29,10 +28,10 @@ SRC_URI = " \ | |||
29 | ${@ d.expand("https://tuf-cli-releases.ota.here.com/cli-${GARAGE_SIGN_PV}.tgz;unpack=0;name=garagesign") if not oe.types.boolean(d.getVar('GARAGE_SIGN_AUTOVERSION')) else ''} \ | 28 | ${@ d.expand("https://tuf-cli-releases.ota.here.com/cli-${GARAGE_SIGN_PV}.tgz;unpack=0;name=garagesign") if not oe.types.boolean(d.getVar('GARAGE_SIGN_AUTOVERSION')) else ''} \ |
30 | " | 29 | " |
31 | 30 | ||
32 | SRC_URI[garagesign.md5sum] = "7be214beb64ce4ae443f7a4288b6d491" | 31 | SRC_URI[garagesign.md5sum] = "2598ce3a468c40a58df3304fb71ea14b" |
33 | SRC_URI[garagesign.sha256sum] = "b8524a03bb31551889790eca4ed44070f679d33a98b09e8220d7e0e965de68d8" | 32 | SRC_URI[garagesign.sha256sum] = "acbc814a9ed962a0d3b5bc397b14fef6a139e874e6cc3075671dab69bc8541fd" |
34 | 33 | ||
35 | SRCREV = "d4811f900c765f3b4e5b9ea76531bad7d830a691" | 34 | SRCREV = "1255aa24fe55f99b606027c8acc8cd80db29a282" |
36 | BRANCH ?= "master" | 35 | BRANCH ?= "master" |
37 | 36 | ||
38 | S = "${WORKDIR}/git" | 37 | S = "${WORKDIR}/git" |
@@ -133,14 +132,12 @@ python split_hosttools_packages () { | |||
133 | bindir = d.getVar('bindir') | 132 | bindir = d.getVar('bindir') |
134 | 133 | ||
135 | # Split all binaries to their own packages. | 134 | # Split all binaries to their own packages. |
136 | do_split_packages(d, bindir, '^(.*)$', '%s', 'Aktualizr tool - %s', extra_depends='aktualizr-configs', prepend=False) | 135 | do_split_packages(d, bindir, '^(.*)$', '%s', 'Aktualizr tool - %s', extra_depends='', prepend=False) |
137 | } | 136 | } |
138 | 137 | ||
139 | PACKAGES_DYNAMIC = "^aktualizr-.* ^garage-.*" | 138 | PACKAGES_DYNAMIC = "^aktualizr-.* ^garage-.*" |
140 | 139 | ||
141 | PACKAGES =+ "${PN}-host-tools ${PN}-info ${PN}-lib ${PN}-resource-control ${PN}-configs ${PN}-secondary ${PN}-secondary-lib ${PN}-sotatools-lib" | 140 | PACKAGES =+ "${PN}-info ${PN}-lib ${PN}-resource-control ${PN}-configs ${PN}-secondary ${PN}-secondary-lib ${PN}-sotatools-lib" |
142 | |||
143 | ALLOW_EMPTY_${PN}-host-tools = "1" | ||
144 | 141 | ||
145 | FILES_${PN} = " \ | 142 | FILES_${PN} = " \ |
146 | ${bindir}/aktualizr \ | 143 | ${bindir}/aktualizr \ |