diff options
author | Scott Murray <scott.murray@konsulko.com> | 2024-05-23 10:21:50 -0400 |
---|---|---|
committer | Scott Murray <scott.murray@konsulko.com> | 2024-05-23 10:22:43 -0400 |
commit | 4ed1a0a0302cec13f12d3999466d62841c104402 (patch) | |
tree | 3800d3c40398a5441122e5b04bd6aeac6ee88945 /recipes-config | |
parent | fe2024e444f214ed6fd04c37d09c51f1c6a9e8e6 (diff) |
Update recipes for transition to UNPACKDIRnext
Update recipes to handle the transition to using UNPACKDIR as the
destination for unpacked files. For recipes that had been using
S = WORKDIR, the approach used in meta-openembedded has been
followed, i.e. using UNPACKDIR in tasks for consistency.
Bug-AGL: SPEC-5147
Change-Id: I42b2b474be163c66e11a449de6eec7d748e00fbb
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'recipes-config')
7 files changed, 35 insertions, 14 deletions
diff --git a/recipes-config/cluster-demo-config/cluster-demo-config_1.0.bb b/recipes-config/cluster-demo-config/cluster-demo-config_1.0.bb index 48b7965e..48cc26dc 100644 --- a/recipes-config/cluster-demo-config/cluster-demo-config_1.0.bb +++ b/recipes-config/cluster-demo-config/cluster-demo-config_1.0.bb @@ -2,16 +2,19 @@ SUMMARY = "AGL cluster demo configuration file" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -SRC_URI += " \ +SRC_URI = " \ file://AGL.conf.default \ file://AGL.conf.flutter \ " +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + inherit allarch update-alternatives do_install() { - install -D -m 0644 ${WORKDIR}/AGL.conf.default ${D}${sysconfdir}/xdg/AGL.conf.default - install -m 0644 ${WORKDIR}/AGL.conf.flutter ${D}${sysconfdir}/xdg/ + install -D -m 0644 ${UNPACKDIR}/AGL.conf.default ${D}${sysconfdir}/xdg/AGL.conf.default + install -m 0644 ${UNPACKDIR}/AGL.conf.flutter ${D}${sysconfdir}/xdg/ } ALTERNATIVE_LINK_NAME[AGL.conf] = "${sysconfdir}/xdg/AGL.conf" diff --git a/recipes-config/cluster-demo-network-config/cluster-demo-network-config_1.0.bb b/recipes-config/cluster-demo-network-config/cluster-demo-network-config_1.0.bb index 8d737282..12dcea71 100644 --- a/recipes-config/cluster-demo-network-config/cluster-demo-network-config_1.0.bb +++ b/recipes-config/cluster-demo-network-config/cluster-demo-network-config_1.0.bb @@ -9,6 +9,9 @@ SRC_URI = "file://cluster-demo-network-conf@.service \ file://cluster-demo-network-conf.sh \ " +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + # Network device for dedicated connection to cluster AGL_CLUSTER_NET_DEVICE ?= "eth1" @@ -18,11 +21,11 @@ do_compile[noexec] = "1" do_install() { # Install helper script install -d ${D}${sbindir} - install -m 0755 ${WORKDIR}/cluster-demo-network-conf.sh ${D}${sbindir}/ + install -m 0755 ${UNPACKDIR}/cluster-demo-network-conf.sh ${D}${sbindir}/ # Install service unit install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/cluster-demo-network-conf@.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${UNPACKDIR}/cluster-demo-network-conf@.service ${D}${systemd_system_unitdir}/ # Add symlink to network.target.wants install -d ${D}${sysconfdir}/systemd/system/network.target.wants diff --git a/recipes-config/qemu-config/qemu-config-agl-cluster-demo-flutter.bb b/recipes-config/qemu-config/qemu-config-agl-cluster-demo-flutter.bb index f0bc93fd..0106a92b 100644 --- a/recipes-config/qemu-config/qemu-config-agl-cluster-demo-flutter.bb +++ b/recipes-config/qemu-config/qemu-config-agl-cluster-demo-flutter.bb @@ -6,6 +6,9 @@ inherit systemd allarch SRC_URI = "file://${QEMU_IMAGE}.conf" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_configure[noexec] = "1" do_compile[noexec] = "1" @@ -21,7 +24,7 @@ do_install() { # Install conf file install -d ${D}${sysconfdir}/agl-qemu-runner - install -m 0644 ${WORKDIR}/${QEMU_IMAGE}.conf ${D}${sysconfdir}/agl-qemu-runner/ + install -m 0644 ${UNPACKDIR}/${QEMU_IMAGE}.conf ${D}${sysconfdir}/agl-qemu-runner/ } FILES:${PN} += "${systemd_system_unitdir}" diff --git a/recipes-config/qemu-config/qemu-config-agl-cluster-demo-qt.bb b/recipes-config/qemu-config/qemu-config-agl-cluster-demo-qt.bb index e22e4027..c6681c27 100644 --- a/recipes-config/qemu-config/qemu-config-agl-cluster-demo-qt.bb +++ b/recipes-config/qemu-config/qemu-config-agl-cluster-demo-qt.bb @@ -6,6 +6,9 @@ inherit systemd allarch SRC_URI = "file://${QEMU_IMAGE}.conf" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_configure[noexec] = "1" do_compile[noexec] = "1" @@ -21,7 +24,7 @@ do_install() { # Install conf file install -d ${D}${sysconfdir}/agl-qemu-runner - install -m 0644 ${WORKDIR}/${QEMU_IMAGE}.conf ${D}${sysconfdir}/agl-qemu-runner/ + install -m 0644 ${UNPACKDIR}/${QEMU_IMAGE}.conf ${D}${sysconfdir}/agl-qemu-runner/ } FILES:${PN} += "${systemd_system_unitdir}" diff --git a/recipes-config/qemu-config/qemu-config-agl-ivi-demo-flutter.bb b/recipes-config/qemu-config/qemu-config-agl-ivi-demo-flutter.bb index a9f2be43..7091ba3e 100644 --- a/recipes-config/qemu-config/qemu-config-agl-ivi-demo-flutter.bb +++ b/recipes-config/qemu-config/qemu-config-agl-ivi-demo-flutter.bb @@ -6,6 +6,9 @@ inherit systemd allarch SRC_URI = "file://${QEMU_IMAGE}.conf" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_configure[noexec] = "1" do_compile[noexec] = "1" @@ -21,7 +24,7 @@ do_install() { # Install conf file install -d ${D}${sysconfdir}/agl-qemu-runner - install -m 0644 ${WORKDIR}/${QEMU_IMAGE}.conf ${D}${sysconfdir}/agl-qemu-runner/ + install -m 0644 ${UNPACKDIR}/${QEMU_IMAGE}.conf ${D}${sysconfdir}/agl-qemu-runner/ } FILES:${PN} += "${systemd_system_unitdir}" diff --git a/recipes-config/qemu-config/qemu-config-agl-ivi-demo-qt.bb b/recipes-config/qemu-config/qemu-config-agl-ivi-demo-qt.bb index 46e043c0..69ffebae 100644 --- a/recipes-config/qemu-config/qemu-config-agl-ivi-demo-qt.bb +++ b/recipes-config/qemu-config/qemu-config-agl-ivi-demo-qt.bb @@ -6,6 +6,9 @@ inherit systemd allarch SRC_URI = "file://${QEMU_IMAGE}.conf" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_configure[noexec] = "1" do_compile[noexec] = "1" @@ -21,7 +24,7 @@ do_install() { # Install conf file install -d ${D}${sysconfdir}/agl-qemu-runner - install -m 0644 ${WORKDIR}/${QEMU_IMAGE}.conf ${D}${sysconfdir}/agl-qemu-runner/ + install -m 0644 ${UNPACKDIR}/${QEMU_IMAGE}.conf ${D}${sysconfdir}/agl-qemu-runner/ } FILES:${PN} += "${systemd_system_unitdir}" diff --git a/recipes-config/qemu-config/qemu-config-vmnet0.bb b/recipes-config/qemu-config/qemu-config-vmnet0.bb index a5a12982..43712416 100644 --- a/recipes-config/qemu-config/qemu-config-vmnet0.bb +++ b/recipes-config/qemu-config/qemu-config-vmnet0.bb @@ -11,26 +11,29 @@ SRC_URI = "file://vmnet0.netdev \ file://connman-nodnsproxy.conf \ " +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_configure[noexec] = "1" do_compile[noexec] = "1" do_install() { # Install systemd-networkd vmnet0 configuration install -d ${D}${systemd_unitdir}/network - install -m 0644 ${WORKDIR}/vmnet0.netdev ${D}${systemd_unitdir}/network/ - install -m 0644 ${WORKDIR}/vmnet0.network ${D}${systemd_unitdir}/network/ + install -m 0644 ${UNPACKDIR}/vmnet0.netdev ${D}${systemd_unitdir}/network/ + install -m 0644 ${UNPACKDIR}/vmnet0.network ${D}${systemd_unitdir}/network/ # Install QEMU bridge configuration install -d ${D}${sysconfdir}/qemu - install -m 0644 ${WORKDIR}/bridge.conf ${D}${sysconfdir}/qemu/ + install -m 0644 ${UNPACKDIR}/bridge.conf ${D}${sysconfdir}/qemu/ # Configure dnsmasq to serve DHCP to the guests install -d ${D}${sysconfdir}/dnsmasq.d - install -m 0644 ${WORKDIR}/dnsmasq-qemu.conf ${D}${sysconfdir}/dnsmasq.d/ + install -m 0644 ${UNPACKDIR}/dnsmasq-qemu.conf ${D}${sysconfdir}/dnsmasq.d/ # Disable ConnMan's local DNS proxy to not conflict with dnsmasq install -d ${D}${systemd_system_unitdir}/connman.service.d/ - install -m 0644 ${WORKDIR}/connman-nodnsproxy.conf ${D}${systemd_system_unitdir}/connman.service.d/ + install -m 0644 ${UNPACKDIR}/connman-nodnsproxy.conf ${D}${systemd_system_unitdir}/connman.service.d/ } FILES:${PN} += "${systemd_unitdir}/network ${systemd_system_unitdir}" |