summaryrefslogtreecommitdiffstats
path: root/recipes-test/demo-config
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2020-01-23 16:23:48 +0100
committerGitHub <noreply@github.com>2020-01-23 16:23:48 +0100
commite81f2e7d2a74fe27a0840aacfcfe547acbdcac0c (patch)
tree2b8e320a4149aa145eb0b75917fbdc74ac92c2fb /recipes-test/demo-config
parenta6ef1ed2784fde198baef0e6b12e4b0d86e8bb66 (diff)
parent19ff287e7b6764af2f0af29cb5bac9433fc5862d (diff)
downloadmeta-updater-e81f2e7d2a74fe27a0840aacfcfe547acbdcac0c.tar.gz
Merge pull request #663 from advancedtelematic/feat/zeus/2020.1
Feat/zeus/2020.1
Diffstat (limited to 'recipes-test/demo-config')
-rw-r--r--recipes-test/demo-config/files/30-fake-pacman.toml2
-rw-r--r--recipes-test/demo-config/files/30-ostree-pacman.toml2
-rw-r--r--recipes-test/demo-config/secondary-config.bb6
3 files changed, 5 insertions, 5 deletions
diff --git a/recipes-test/demo-config/files/30-fake-pacman.toml b/recipes-test/demo-config/files/30-fake-pacman.toml
deleted file mode 100644
index 3fb5cf2..0000000
--- a/recipes-test/demo-config/files/30-fake-pacman.toml
+++ /dev/null
@@ -1,2 +0,0 @@
1[pacman]
2type = "fake"
diff --git a/recipes-test/demo-config/files/30-ostree-pacman.toml b/recipes-test/demo-config/files/30-ostree-pacman.toml
new file mode 100644
index 0000000..d2cf5b8
--- /dev/null
+++ b/recipes-test/demo-config/files/30-ostree-pacman.toml
@@ -0,0 +1,2 @@
1[pacman]
2type = "ostree"
diff --git a/recipes-test/demo-config/secondary-config.bb b/recipes-test/demo-config/secondary-config.bb
index ddbed89..58b18df 100644
--- a/recipes-test/demo-config/secondary-config.bb
+++ b/recipes-test/demo-config/secondary-config.bb
@@ -12,14 +12,14 @@ SOTA_HARDWARE_ID ?= "${MACHINE}-sndry"
12SECONDARY_HARDWARE_ID ?= "${SOTA_HARDWARE_ID}" 12SECONDARY_HARDWARE_ID ?= "${SOTA_HARDWARE_ID}"
13 13
14SRC_URI = "\ 14SRC_URI = "\
15 file://30-fake-pacman.toml \ 15 file://30-ostree-pacman.toml \
16 file://35-network-config.toml \ 16 file://35-network-config.toml \
17 file://45-id-config.toml \ 17 file://45-id-config.toml \
18 " 18 "
19 19
20do_install () { 20do_install () {
21 install -m 0700 -d ${D}${libdir}/sota/conf.d 21 install -m 0700 -d ${D}${libdir}/sota/conf.d
22 install -m 0644 ${WORKDIR}/30-fake-pacman.toml ${D}${libdir}/sota/conf.d/30-fake-pacman.toml 22 install -m 0644 ${WORKDIR}/30-ostree-pacman.toml ${D}${libdir}/sota/conf.d/30-ostree-pacman.toml
23 23
24 install -m 0644 ${WORKDIR}/35-network-config.toml ${D}${libdir}/sota/conf.d/35-network-config.toml 24 install -m 0644 ${WORKDIR}/35-network-config.toml ${D}${libdir}/sota/conf.d/35-network-config.toml
25 sed -i -e 's|@PORT@|${SECONDARY_PORT}|g' \ 25 sed -i -e 's|@PORT@|${SECONDARY_PORT}|g' \
@@ -36,7 +36,7 @@ do_install () {
36 36
37FILES_${PN} = " \ 37FILES_${PN} = " \
38 ${libdir}/sota/conf.d \ 38 ${libdir}/sota/conf.d \
39 ${libdir}/sota/conf.d/30-fake-pacman.toml \ 39 ${libdir}/sota/conf.d/30-ostree-pacman.toml \
40 ${libdir}/sota/conf.d/35-network-config.toml \ 40 ${libdir}/sota/conf.d/35-network-config.toml \
41 ${libdir}/sota/conf.d/45-id-config.toml \ 41 ${libdir}/sota/conf.d/45-id-config.toml \
42 " 42 "