diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2018-10-04 16:45:16 +0200 |
---|---|---|
committer | Patrick Vacek <patrickvacek@gmail.com> | 2018-10-09 09:36:09 +0200 |
commit | 2f2add8d986e391c54f1fe44778f907af76186d0 (patch) | |
tree | 239d3a7a2ce1d8157cd1fef89983da0494bdad1d | |
parent | 751e8b6e46acc957b6ec47c30868835be4c89d52 (diff) | |
download | meta-updater-2f2add8d986e391c54f1fe44778f907af76186d0.tar.gz |
aktualizr: remove example-interface.
-rw-r--r-- | lib/oeqa/selftest/cases/updater.py | 9 | ||||
-rwxr-xr-x | recipes-sota/aktualizr/aktualizr_git.bb | 4 | ||||
-rw-r--r-- | recipes-sota/config/aktualizr-example-interface.bb | 21 | ||||
-rw-r--r-- | recipes-sota/config/files/30-example-interface.toml | 2 |
4 files changed, 2 insertions, 34 deletions
diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py index 38bdcbf..b555d92 100644 --- a/lib/oeqa/selftest/cases/updater.py +++ b/lib/oeqa/selftest/cases/updater.py | |||
@@ -150,8 +150,6 @@ class AutoProvTests(OESelftestTestCase): | |||
150 | self.meta_qemu = None | 150 | self.meta_qemu = None |
151 | self.append_config('MACHINE = "qemux86-64"') | 151 | self.append_config('MACHINE = "qemux86-64"') |
152 | self.append_config('SOTA_CLIENT_PROV = " aktualizr-auto-prov "') | 152 | self.append_config('SOTA_CLIENT_PROV = " aktualizr-auto-prov "') |
153 | # Test aktualizr-example-interface package. | ||
154 | self.append_config('IMAGE_INSTALL_append = " aktualizr-examples aktualizr-example-interface "') | ||
155 | self.qemu, self.s = qemu_launch(machine='qemux86-64') | 153 | self.qemu, self.s = qemu_launch(machine='qemux86-64') |
156 | 154 | ||
157 | def tearDownLocal(self): | 155 | def tearDownLocal(self): |
@@ -185,12 +183,6 @@ class AutoProvTests(OESelftestTestCase): | |||
185 | self.assertTrue(ran_ok, 'aktualizr-info failed: ' + stderr.decode() + stdout.decode()) | 183 | self.assertTrue(ran_ok, 'aktualizr-info failed: ' + stderr.decode() + stdout.decode()) |
186 | 184 | ||
187 | verifyProvisioned(self, machine) | 185 | verifyProvisioned(self, machine) |
188 | # Test aktualizr-example-interface package. | ||
189 | stdout, stderr, retcode = self.qemu_command('aktualizr-info') | ||
190 | self.assertIn(b'hardware ID: example1', stdout, | ||
191 | 'Legacy secondary initialization failed: ' + stderr.decode() + stdout.decode()) | ||
192 | self.assertIn(b'hardware ID: example2', stdout, | ||
193 | 'Legacy secondary initialization failed: ' + stderr.decode() + stdout.decode()) | ||
194 | 186 | ||
195 | 187 | ||
196 | class ManualControlTests(OESelftestTestCase): | 188 | class ManualControlTests(OESelftestTestCase): |
@@ -562,6 +554,7 @@ class HsmTests(OESelftestTestCase): | |||
562 | 554 | ||
563 | verifyProvisioned(self, machine) | 555 | verifyProvisioned(self, machine) |
564 | 556 | ||
557 | |||
565 | class SecondaryTests(OESelftestTestCase): | 558 | class SecondaryTests(OESelftestTestCase): |
566 | @classmethod | 559 | @classmethod |
567 | def setUpClass(cls): | 560 | def setUpClass(cls): |
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 29164ed..f9ddbb4 100755 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb | |||
@@ -26,7 +26,7 @@ SRC_URI = " \ | |||
26 | file://aktualizr-secondary.socket \ | 26 | file://aktualizr-secondary.socket \ |
27 | file://aktualizr-serialcan.service \ | 27 | file://aktualizr-serialcan.service \ |
28 | " | 28 | " |
29 | SRCREV = "512ad74c0b5339ca7775d8c9461b565a9e6ff5b3" | 29 | SRCREV = "6b0114e4fad0619d16ed2063e8ff10e3fb8500f2" |
30 | BRANCH ?= "master" | 30 | BRANCH ?= "master" |
31 | 31 | ||
32 | S = "${WORKDIR}/git" | 32 | S = "${WORKDIR}/git" |
@@ -97,8 +97,6 @@ FILES_${PN} = " \ | |||
97 | 97 | ||
98 | FILES_${PN}-examples = " \ | 98 | FILES_${PN}-examples = " \ |
99 | ${libdir}/sota/demo_secondary.json \ | 99 | ${libdir}/sota/demo_secondary.json \ |
100 | ${bindir}/example-interface \ | ||
101 | ${bindir}/isotp-test-interface \ | ||
102 | ${bindir}/hmi_stub \ | 100 | ${bindir}/hmi_stub \ |
103 | " | 101 | " |
104 | 102 | ||
diff --git a/recipes-sota/config/aktualizr-example-interface.bb b/recipes-sota/config/aktualizr-example-interface.bb deleted file mode 100644 index ac75352..0000000 --- a/recipes-sota/config/aktualizr-example-interface.bb +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | SUMMARY = "Aktualizr example interface" | ||
2 | DESCRIPTION = "Aktualizr example interface for legacy secondaries" | ||
3 | HOMEPAGE = "https://github.com/advancedtelematic/aktualizr" | ||
4 | SECTION = "base" | ||
5 | LICENSE = "MPL-2.0" | ||
6 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" | ||
7 | |||
8 | SRC_URI = " \ | ||
9 | file://30-example-interface.toml \ | ||
10 | " | ||
11 | |||
12 | do_install_append () { | ||
13 | install -m 0700 -d ${D}${libdir}/sota/conf.d | ||
14 | install -m 0644 ${WORKDIR}/30-example-interface.toml ${D}${libdir}/sota/conf.d/30-example-interface.toml | ||
15 | } | ||
16 | |||
17 | FILES_${PN} = " \ | ||
18 | ${libdir}/sota/conf.d/30-example-interface.toml \ | ||
19 | " | ||
20 | |||
21 | # vim:set ts=4 sw=4 sts=4 expandtab: | ||
diff --git a/recipes-sota/config/files/30-example-interface.toml b/recipes-sota/config/files/30-example-interface.toml deleted file mode 100644 index fc4e9ec..0000000 --- a/recipes-sota/config/files/30-example-interface.toml +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | [uptane] | ||
2 | legacy_interface = "/usr/bin/example-interface" | ||