summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2019-10-11 16:19:19 +0200
committerPatrick Vacek <patrickvacek@gmail.com>2019-10-17 17:03:37 +0200
commit8301d07b8d109e5f4164418f66ec2e504fef918e (patch)
treed20b775741971c6d003516f055d39ed7163a0ead
parent7e426508b7a7f873fadd5886bd526276eee16bd9 (diff)
downloadmeta-updater-8301d07b8d109e5f4164418f66ec2e504fef918e.tar.gz
demo-network-config: use ${libdir} consistently.
Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
-rw-r--r--recipes-test/demo-network-config/network-config.inc6
-rw-r--r--recipes-test/demo-network-config/primary-network-config.bb6
-rw-r--r--recipes-test/demo-network-config/secondary-network-config.bb6
3 files changed, 9 insertions, 9 deletions
diff --git a/recipes-test/demo-network-config/network-config.inc b/recipes-test/demo-network-config/network-config.inc
index ed623d4..a231a24 100644
--- a/recipes-test/demo-network-config/network-config.inc
+++ b/recipes-test/demo-network-config/network-config.inc
@@ -6,11 +6,11 @@ SECONDARY_INTERFACE ?= "${@ 'eth0' if d.getVar('MACHINE') == 'raspberrypi3' else
6 6
7do_install_append() { 7do_install_append() {
8 bbnote "Network configuration type to be applied: ${CONF_TYPE}" 8 bbnote "Network configuration type to be applied: ${CONF_TYPE}"
9 install -d ${D}/usr/lib/systemd/network 9 install -d ${D}${libdir}/systemd/network
10 install -m 0644 ${WORKDIR}/26-${CONF_TYPE}-client.network ${D}/usr/lib/systemd/network/ 10 install -m 0644 ${WORKDIR}/26-${CONF_TYPE}-client.network ${D}${libdir}/systemd/network/
11 sed -i -e 's|@ADDR@|${IP_ADDR}|g' \ 11 sed -i -e 's|@ADDR@|${IP_ADDR}|g' \
12 -e 's|@IFNAME@|${SECONDARY_INTERFACE}|g' \ 12 -e 's|@IFNAME@|${SECONDARY_INTERFACE}|g' \
13 ${D}/usr/lib/systemd/network/26-${CONF_TYPE}-client.network 13 ${D}${libdir}/systemd/network/26-${CONF_TYPE}-client.network
14 14
15} 15}
16 16
diff --git a/recipes-test/demo-network-config/primary-network-config.bb b/recipes-test/demo-network-config/primary-network-config.bb
index d840a95..0b0119b 100644
--- a/recipes-test/demo-network-config/primary-network-config.bb
+++ b/recipes-test/demo-network-config/primary-network-config.bb
@@ -8,13 +8,13 @@ SRC_URI = "\
8 file://27-dhcp-client-external.network \ 8 file://27-dhcp-client-external.network \
9 " 9 "
10 10
11FILES_${PN} = "/usr/lib/systemd/network" 11FILES_${PN} = "${libdir}/systemd/network"
12 12
13PR = "1" 13PR = "1"
14 14
15do_install() { 15do_install() {
16 install -d ${D}/usr/lib/systemd/network 16 install -d ${D}${libdir}/systemd/network
17 install -m 0644 ${WORKDIR}/27-dhcp-client-external.network ${D}/usr/lib/systemd/network/ 17 install -m 0644 ${WORKDIR}/27-dhcp-client-external.network ${D}${libdir}/systemd/network/
18} 18}
19 19
20PRIMARY_IP ?= "10.0.3.1" 20PRIMARY_IP ?= "10.0.3.1"
diff --git a/recipes-test/demo-network-config/secondary-network-config.bb b/recipes-test/demo-network-config/secondary-network-config.bb
index b1d70f1..cef8274 100644
--- a/recipes-test/demo-network-config/secondary-network-config.bb
+++ b/recipes-test/demo-network-config/secondary-network-config.bb
@@ -12,13 +12,13 @@ SRC_URI = "\
12 file://27-dhcp-client-external.network \ 12 file://27-dhcp-client-external.network \
13 " 13 "
14 14
15FILES_${PN} = "/usr/lib/systemd/network" 15FILES_${PN} = "${libdir}/systemd/network"
16 16
17PR = "1" 17PR = "1"
18 18
19do_install() { 19do_install() {
20 install -d ${D}/usr/lib/systemd/network 20 install -d ${D}${libdir}/systemd/network
21 install -m 0644 ${WORKDIR}/27-dhcp-client-external.network ${D}/usr/lib/systemd/network/ 21 install -m 0644 ${WORKDIR}/27-dhcp-client-external.network ${D}${libdir}/systemd/network/
22} 22}
23 23
24SECONDARY_IP ?= "10.0.3.2" 24SECONDARY_IP ?= "10.0.3.2"