diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2024-05-23 10:21:50 -0400 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2024-12-19 22:41:31 -0500 |
| commit | b8f5c41d1d447795ffa72e3ceeeaf12f6f0e1605 (patch) | |
| tree | 7db11a20de9ca399678bbd8c12b70cdf394b85e4 /recipes-config | |
| parent | d100e89de22d6a950b3caab4d060b7e8dc3f4e15 (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')
| -rw-r--r-- | recipes-config/cluster-demo-config/cluster-demo-config_1.0.bb | 9 | ||||
| -rw-r--r-- | recipes-config/cluster-demo-network-config/cluster-demo-network-config_1.0.bb | 7 |
2 files changed, 11 insertions, 5 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 48b7965e4..48cc26dc6 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 8d737282d..12dcea718 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 |