summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcajun-rat <philip.wise@here.com>2018-06-26 15:57:16 +0200
committerGitHub <noreply@github.com>2018-06-26 15:57:16 +0200
commitff555e8690eb47177ade42dc6912ae17a759cc45 (patch)
tree175c04bff81a63eea5be5dbe26d01f19bc7de368
parent620b412923cf055a0fddb6214f63be6cbdde5701 (diff)
parent8f34212cfae702018d77372bc499b6977339c10e (diff)
downloadmeta-updater-ff555e8690eb47177ade42dc6912ae17a759cc45.tar.gz
Merge pull request #349 from advancedtelematic/bugfix/rocko-latest-aktualizr
Bump aktualizr to latest and fix googletest complaint.
-rwxr-xr-xrecipes-sota/aktualizr/aktualizr_git.bb5
1 files changed, 3 insertions, 2 deletions
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index 9ca0815..ca0bfb6 100755
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -25,7 +25,7 @@ SRC_URI = " \
25 file://aktualizr-secondary.socket \ 25 file://aktualizr-secondary.socket \
26 file://aktualizr-serialcan.service \ 26 file://aktualizr-serialcan.service \
27 " 27 "
28SRCREV = "9f538a8a411ca917184fe11a6cf92e5ebf9efc61" 28SRCREV = "767098f45e2e05d5bbd817f9b3b3aa44844da8ec"
29BRANCH ?= "master" 29BRANCH ?= "master"
30 30
31S = "${WORKDIR}/git" 31S = "${WORKDIR}/git"
@@ -45,7 +45,8 @@ require garage-sign-version.inc
45EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF \ 45EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF \
46 -DCMAKE_BUILD_TYPE=Release \ 46 -DCMAKE_BUILD_TYPE=Release \
47 -DAKTUALIZR_VERSION=${PV} \ 47 -DAKTUALIZR_VERSION=${PV} \
48 -DBUILD_LOAD_TESTS=OFF" 48 -DBUILD_LOAD_TESTS=OFF \
49 -Dgtest_disable_pthreads=ON"
49EXTRA_OECMAKE_append_class-target = " -DBUILD_OSTREE=ON \ 50EXTRA_OECMAKE_append_class-target = " -DBUILD_OSTREE=ON \
50 -DBUILD_ISOTP=ON \ 51 -DBUILD_ISOTP=ON \
51 ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', '-DBUILD_P11=ON', '', d)} " 52 ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', '-DBUILD_P11=ON', '', d)} "