diff options
-rw-r--r-- | lib/oeqa/selftest/updater.py | 2 | ||||
-rw-r--r-- | recipes-sota/aktualizr/aktualizr_git.bb | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/oeqa/selftest/updater.py b/lib/oeqa/selftest/updater.py index 971e7c5..c114456 100644 --- a/lib/oeqa/selftest/updater.py +++ b/lib/oeqa/selftest/updater.py | |||
@@ -15,6 +15,7 @@ class SotaToolsTests(oeSelfTest): | |||
15 | 15 | ||
16 | @classmethod | 16 | @classmethod |
17 | def setUpClass(cls): | 17 | def setUpClass(cls): |
18 | super(SotaToolsTests, cls).setUpClass() | ||
18 | logger = logging.getLogger("selftest") | 19 | logger = logging.getLogger("selftest") |
19 | logger.info('Running bitbake to build aktualizr-native tools') | 20 | logger.info('Running bitbake to build aktualizr-native tools') |
20 | bitbake('aktualizr-native') | 21 | bitbake('aktualizr-native') |
@@ -96,6 +97,7 @@ class AktualizrToolsTests(oeSelfTest): | |||
96 | 97 | ||
97 | @classmethod | 98 | @classmethod |
98 | def setUpClass(cls): | 99 | def setUpClass(cls): |
100 | super(AktualizrToolsTests, cls).setUpClass() | ||
99 | logger = logging.getLogger("selftest") | 101 | logger = logging.getLogger("selftest") |
100 | logger.info('Running bitbake to build aktualizr-native tools') | 102 | logger.info('Running bitbake to build aktualizr-native tools') |
101 | bitbake('aktualizr-native') | 103 | bitbake('aktualizr-native') |
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 1dd1016..3af9988 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb | |||
@@ -20,7 +20,7 @@ SRC_URI = " \ | |||
20 | file://aktualizr.service \ | 20 | file://aktualizr.service \ |
21 | file://aktualizr-serialcan.service \ | 21 | file://aktualizr-serialcan.service \ |
22 | " | 22 | " |
23 | SRCREV = "930d8eef6eb584686654601c056d7c9c6fca3048" | 23 | SRCREV = "6a2a0db0e557ef0ad95e19baee516a94b67aa566" |
24 | BRANCH ?= "master" | 24 | BRANCH ?= "master" |
25 | 25 | ||
26 | S = "${WORKDIR}/git" | 26 | S = "${WORKDIR}/git" |
@@ -34,10 +34,12 @@ BBCLASSEXTEND =+ "native" | |||
34 | 34 | ||
35 | EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF -DCMAKE_BUILD_TYPE=Release -DAKTUALIZR_VERSION=${PV} " | 35 | EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF -DCMAKE_BUILD_TYPE=Release -DAKTUALIZR_VERSION=${PV} " |
36 | EXTRA_OECMAKE_append_class-target = " -DBUILD_OSTREE=ON -DBUILD_ISOTP=ON ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', '-DBUILD_P11=ON', '', d)} " | 36 | EXTRA_OECMAKE_append_class-target = " -DBUILD_OSTREE=ON -DBUILD_ISOTP=ON ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', '-DBUILD_P11=ON', '', d)} " |
37 | EXTRA_OECMAKE_append_class-native = " -DBUILD_SOTA_TOOLS=ON -DBUILD_OSTREE=OFF " | 37 | EXTRA_OECMAKE_append_class-native = " -DBUILD_SOTA_TOOLS=ON -DBUILD_OSTREE=OFF -DBUILD_SYSTEMD=OFF " |
38 | 38 | ||
39 | do_install_append () { | 39 | do_install_append () { |
40 | rm -fr ${D}${libdir}/systemd | 40 | rm -fr ${D}${libdir}/systemd |
41 | rm -f ${D}${bindir}/aktualizr-secondary | ||
42 | rm -f ${D}${bindir}/aktualizr-check-discovery | ||
41 | } | 43 | } |
42 | 44 | ||
43 | do_install_append_class-target () { | 45 | do_install_append_class-target () { |