summaryrefslogtreecommitdiffstats
path: root/recipes-sota
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2018-10-12 13:54:44 +0200
committerGitHub <noreply@github.com>2018-10-12 13:54:44 +0200
commit7e43d48d6f8152de2a7f730696cae88adda20cd4 (patch)
tree9f6ae4bf7fb8c977636193265ccfedc5e98969d3 /recipes-sota
parenta880e393dfe00efc82217616fb1797bdf2028286 (diff)
parent6f04776ad990421ce0acfc6c52e02c87a14ce2c2 (diff)
downloadmeta-updater-7e43d48d6f8152de2a7f730696cae88adda20cd4.tar.gz
Merge pull request #399 from advancedtelematic/refactor/remove-legacy-secondaries
aktualizr: remove example-interface.
Diffstat (limited to 'recipes-sota')
-rwxr-xr-xrecipes-sota/aktualizr/aktualizr_git.bb5
-rw-r--r--recipes-sota/config/aktualizr-example-interface.bb21
-rw-r--r--recipes-sota/config/files/30-example-interface.toml2
3 files changed, 1 insertions, 27 deletions
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index 29164ed..751f529 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 "
29SRCREV = "512ad74c0b5339ca7775d8c9461b565a9e6ff5b3" 29SRCREV = "6b0114e4fad0619d16ed2063e8ff10e3fb8500f2"
30BRANCH ?= "master" 30BRANCH ?= "master"
31 31
32S = "${WORKDIR}/git" 32S = "${WORKDIR}/git"
@@ -48,7 +48,6 @@ EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF \
48 -DAKTUALIZR_VERSION=${PV} \ 48 -DAKTUALIZR_VERSION=${PV} \
49 -DBUILD_LOAD_TESTS=OFF" 49 -DBUILD_LOAD_TESTS=OFF"
50EXTRA_OECMAKE_append_class-target = " -DBUILD_OSTREE=ON \ 50EXTRA_OECMAKE_append_class-target = " -DBUILD_OSTREE=ON \
51 -DBUILD_ISOTP=ON \
52 ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', '-DBUILD_P11=ON', '', d)} " 51 ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', '-DBUILD_P11=ON', '', d)} "
53EXTRA_OECMAKE_append_class-native = " -DBUILD_SOTA_TOOLS=ON \ 52EXTRA_OECMAKE_append_class-native = " -DBUILD_SOTA_TOOLS=ON \
54 -DBUILD_OSTREE=OFF \ 53 -DBUILD_OSTREE=OFF \
@@ -97,8 +96,6 @@ FILES_${PN} = " \
97 96
98FILES_${PN}-examples = " \ 97FILES_${PN}-examples = " \
99 ${libdir}/sota/demo_secondary.json \ 98 ${libdir}/sota/demo_secondary.json \
100 ${bindir}/example-interface \
101 ${bindir}/isotp-test-interface \
102 ${bindir}/hmi_stub \ 99 ${bindir}/hmi_stub \
103 " 100 "
104 101
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 @@
1SUMMARY = "Aktualizr example interface"
2DESCRIPTION = "Aktualizr example interface for legacy secondaries"
3HOMEPAGE = "https://github.com/advancedtelematic/aktualizr"
4SECTION = "base"
5LICENSE = "MPL-2.0"
6LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad"
7
8SRC_URI = " \
9 file://30-example-interface.toml \
10 "
11
12do_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
17FILES_${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]
2legacy_interface = "/usr/bin/example-interface"