diff options
| author | Patrick Vacek <patrickvacek@gmail.com> | 2019-10-11 16:20:04 +0200 |
|---|---|---|
| committer | Patrick Vacek <patrickvacek@gmail.com> | 2019-10-21 13:01:52 +0200 |
| commit | b2cc2e04da9fb31a410a517a5bc78e3f2edd79a1 (patch) | |
| tree | 5fc5a6188203ead383d6fa285e29610d65959afa | |
| parent | ce0e0fbca14a6cd93dc4ab474344a65917adf05c (diff) | |
| download | meta-updater-b2cc2e04da9fb31a410a517a5bc78e3f2edd79a1.tar.gz | |
demo-config: inherit allarch for config-only recipes.
Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
| -rw-r--r-- | recipes-test/demo-config/primary-config.bb | 2 | ||||
| -rw-r--r-- | recipes-test/demo-config/secondary-config.bb | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/recipes-test/demo-config/primary-config.bb b/recipes-test/demo-config/primary-config.bb index 27cb553..b1964e2 100644 --- a/recipes-test/demo-config/primary-config.bb +++ b/recipes-test/demo-config/primary-config.bb | |||
| @@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 | |||
| 4 | 4 | ||
| 5 | require shared-conf.inc | 5 | require shared-conf.inc |
| 6 | 6 | ||
| 7 | inherit allarch | ||
| 8 | |||
| 7 | PRIMARY_SECONDARIES ?= "${SECONDARY_IP}:${SECONDARY_PORT}" | 9 | PRIMARY_SECONDARIES ?= "${SECONDARY_IP}:${SECONDARY_PORT}" |
| 8 | 10 | ||
| 9 | SRC_URI = "\ | 11 | SRC_URI = "\ |
diff --git a/recipes-test/demo-config/secondary-config.bb b/recipes-test/demo-config/secondary-config.bb index 9411646..b2b9547 100644 --- a/recipes-test/demo-config/secondary-config.bb +++ b/recipes-test/demo-config/secondary-config.bb | |||
| @@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 | |||
| 4 | 4 | ||
| 5 | require shared-conf.inc | 5 | require shared-conf.inc |
| 6 | 6 | ||
| 7 | inherit allarch | ||
| 8 | |||
| 7 | SECONDARY_SERIAL_ID ?= "" | 9 | SECONDARY_SERIAL_ID ?= "" |
| 8 | SOTA_HARDWARE_ID ?= "${MACHINE}-sndry" | 10 | SOTA_HARDWARE_ID ?= "${MACHINE}-sndry" |
| 9 | SECONDARY_HARDWARE_ID ?= "${SOTA_HARDWARE_ID}" | 11 | SECONDARY_HARDWARE_ID ?= "${SOTA_HARDWARE_ID}" |
| @@ -16,18 +18,18 @@ SRC_URI = "\ | |||
| 16 | 18 | ||
| 17 | do_install () { | 19 | do_install () { |
| 18 | install -m 0700 -d ${D}${libdir}/sota/conf.d | 20 | install -m 0700 -d ${D}${libdir}/sota/conf.d |
| 19 | install -m 0644 ${WORKDIR}/30-fake-pacman.toml ${D}/${libdir}/sota/conf.d/30-fake-pacman.toml | 21 | install -m 0644 ${WORKDIR}/30-fake-pacman.toml ${D}${libdir}/sota/conf.d/30-fake-pacman.toml |
| 20 | 22 | ||
| 21 | install -m 0644 ${WORKDIR}/35-network-config.toml ${D}/${libdir}/sota/conf.d/35-network-config.toml | 23 | install -m 0644 ${WORKDIR}/35-network-config.toml ${D}${libdir}/sota/conf.d/35-network-config.toml |
| 22 | sed -i -e 's|@PORT@|${SECONDARY_PORT}|g' \ | 24 | sed -i -e 's|@PORT@|${SECONDARY_PORT}|g' \ |
| 23 | -e 's|@PRIMARY_IP@|${PRIMARY_IP}|g' \ | 25 | -e 's|@PRIMARY_IP@|${PRIMARY_IP}|g' \ |
| 24 | -e 's|@PRIMARY_PORT@|${PRIMARY_PORT}|g' \ | 26 | -e 's|@PRIMARY_PORT@|${PRIMARY_PORT}|g' \ |
| 25 | ${D}/${libdir}/sota/conf.d/35-network-config.toml | 27 | ${D}${libdir}/sota/conf.d/35-network-config.toml |
| 26 | 28 | ||
| 27 | install -m 0644 ${WORKDIR}/45-id-config.toml ${D}/${libdir}/sota/conf.d/45-id-config.toml | 29 | install -m 0644 ${WORKDIR}/45-id-config.toml ${D}${libdir}/sota/conf.d/45-id-config.toml |
| 28 | sed -i -e 's|@SERIAL@|${SECONDARY_SERIAL_ID}|g' \ | 30 | sed -i -e 's|@SERIAL@|${SECONDARY_SERIAL_ID}|g' \ |
| 29 | -e 's|@HWID@|${SECONDARY_HARDWARE_ID}|g' \ | 31 | -e 's|@HWID@|${SECONDARY_HARDWARE_ID}|g' \ |
| 30 | ${D}/${libdir}/sota/conf.d/45-id-config.toml | 32 | ${D}${libdir}/sota/conf.d/45-id-config.toml |
| 31 | 33 | ||
| 32 | } | 34 | } |
| 33 | 35 | ||
