diff options
author | cajun-rat <philip.wise@here.com> | 2018-06-26 15:57:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-26 15:57:16 +0200 |
commit | ff555e8690eb47177ade42dc6912ae17a759cc45 (patch) | |
tree | 175c04bff81a63eea5be5dbe26d01f19bc7de368 | |
parent | 620b412923cf055a0fddb6214f63be6cbdde5701 (diff) | |
parent | 8f34212cfae702018d77372bc499b6977339c10e (diff) | |
download | meta-updater-ff555e8690eb47177ade42dc6912ae17a759cc45.tar.gz |
Merge pull request #349 from advancedtelematic/bugfix/rocko-latest-aktualizr
Bump aktualizr to latest and fix googletest complaint.
-rwxr-xr-x | recipes-sota/aktualizr/aktualizr_git.bb | 5 |
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 | " |
28 | SRCREV = "9f538a8a411ca917184fe11a6cf92e5ebf9efc61" | 28 | SRCREV = "767098f45e2e05d5bbd817f9b3b3aa44844da8ec" |
29 | BRANCH ?= "master" | 29 | BRANCH ?= "master" |
30 | 30 | ||
31 | S = "${WORKDIR}/git" | 31 | S = "${WORKDIR}/git" |
@@ -45,7 +45,8 @@ require garage-sign-version.inc | |||
45 | EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF \ | 45 | EXTRA_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" | ||
49 | EXTRA_OECMAKE_append_class-target = " -DBUILD_OSTREE=ON \ | 50 | EXTRA_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)} " |