summaryrefslogtreecommitdiffstats
path: root/recipes-sota/aktualizr
diff options
context:
space:
mode:
authorAnton Gerasimov <anton.gerasimov@here.com>2018-09-24 18:02:30 +0200
committerPatrick Vacek <patrickvacek@gmail.com>2018-10-02 12:51:40 +0200
commit3de1da03ce374166db6245486ec22839e260c6f6 (patch)
tree33a5c0e61b918ffc621c86fddc808fe84c3ad830 /recipes-sota/aktualizr
parent9a1a68a5dd94e10d969f9e692965e29683d9b836 (diff)
downloadmeta-updater-3de1da03ce374166db6245486ec22839e260c6f6.tar.gz
Fixes for oe-selftest
Diffstat (limited to 'recipes-sota/aktualizr')
-rw-r--r--recipes-sota/aktualizr/aktualizr-auto-prov-creds.bb3
-rw-r--r--recipes-sota/aktualizr/aktualizr-auto-prov.bb1
-rw-r--r--recipes-sota/aktualizr/aktualizr-ca-implicit-prov-creds.bb1
-rwxr-xr-xrecipes-sota/aktualizr/aktualizr_git.bb4
4 files changed, 4 insertions, 5 deletions
diff --git a/recipes-sota/aktualizr/aktualizr-auto-prov-creds.bb b/recipes-sota/aktualizr/aktualizr-auto-prov-creds.bb
index d964a0a..34460af 100644
--- a/recipes-sota/aktualizr/aktualizr-auto-prov-creds.bb
+++ b/recipes-sota/aktualizr/aktualizr-auto-prov-creds.bb
@@ -4,11 +4,12 @@ LICENSE = "MPL-2.0"
4LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" 4LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad"
5 5
6DEPENDS = "aktualizr-native zip-native" 6DEPENDS = "aktualizr-native zip-native"
7ALLOW_EMPTY_${PN} = "1"
7 8
8require credentials.inc 9require credentials.inc
9 10
10do_install() { 11do_install() {
11 if [ -n ${SOTA_PACKED_CREDENTIALS} ]; then 12 if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then
12 install -m 0700 -d ${D}${localstatedir}/sota 13 install -m 0700 -d ${D}${localstatedir}/sota
13 cp ${SOTA_PACKED_CREDENTIALS} ${D}${localstatedir}/sota/sota_provisioning_credentials.zip 14 cp ${SOTA_PACKED_CREDENTIALS} ${D}${localstatedir}/sota/sota_provisioning_credentials.zip
14 # Device should not be able to push data to treehub 15 # Device should not be able to push data to treehub
diff --git a/recipes-sota/aktualizr/aktualizr-auto-prov.bb b/recipes-sota/aktualizr/aktualizr-auto-prov.bb
index 65e89bd..01f21fa 100644
--- a/recipes-sota/aktualizr/aktualizr-auto-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-auto-prov.bb
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7
7 7
8DEPENDS = "aktualizr-native zip-native" 8DEPENDS = "aktualizr-native zip-native"
9RDEPENDS_${PN}_append = "${@' aktualizr-auto-prov-creds' if d.getVar('SOTA_DEPLOY_CREDENTIALS', True) == '1' else ''}" 9RDEPENDS_${PN}_append = "${@' aktualizr-auto-prov-creds' if d.getVar('SOTA_DEPLOY_CREDENTIALS', True) == '1' else ''}"
10RDEPENDS_${PN} = " aktualizr"
11PV = "1.0" 10PV = "1.0"
12PR = "6" 11PR = "6"
13 12
diff --git a/recipes-sota/aktualizr/aktualizr-ca-implicit-prov-creds.bb b/recipes-sota/aktualizr/aktualizr-ca-implicit-prov-creds.bb
index 5debc19..a729e6b 100644
--- a/recipes-sota/aktualizr/aktualizr-ca-implicit-prov-creds.bb
+++ b/recipes-sota/aktualizr/aktualizr-ca-implicit-prov-creds.bb
@@ -4,6 +4,7 @@ LICENSE = "MPL-2.0"
4LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" 4LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad"
5 5
6DEPENDS = "aktualizr aktualizr-native" 6DEPENDS = "aktualizr aktualizr-native"
7ALLOW_EMPTY_${PN} = "1"
7 8
8SRC_URI = " \ 9SRC_URI = " \
9 file://ca.cnf \ 10 file://ca.cnf \
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index c3a7420..838a5d6 100755
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -16,8 +16,6 @@ RDEPENDS_${PN}_append_class-target = " ${@bb.utils.contains('SOTA_CLIENT_FEATURE
16RDEPENDS_${PN}_append_class-target = " ${PN}-tools " 16RDEPENDS_${PN}_append_class-target = " ${PN}-tools "
17RDEPENDS_${PN}-secondary_append_class-target = " ${PN}-tools " 17RDEPENDS_${PN}-secondary_append_class-target = " ${PN}-tools "
18 18
19RDEPENDS_${PN}_class-target = " openssl-bin "
20
21PV = "1.0+git${SRCPV}" 19PV = "1.0+git${SRCPV}"
22PR = "7" 20PR = "7"
23 21
@@ -28,7 +26,7 @@ SRC_URI = " \
28 file://aktualizr-secondary.socket \ 26 file://aktualizr-secondary.socket \
29 file://aktualizr-serialcan.service \ 27 file://aktualizr-serialcan.service \
30 " 28 "
31SRCREV = "097c763ab4b4b057fa6bedfdac2049e53df93539" 29SRCREV = "803fa9f75ed96993775dc0aa5e65e71920125157"
32BRANCH ?= "master" 30BRANCH ?= "master"
33 31
34S = "${WORKDIR}/git" 32S = "${WORKDIR}/git"