diff mbox series

[meta-cgl] recipes: Replace WORKDIR with UNPACKDIR

Message ID 20241118153056.307379-1-ryosuke.saito@linaro.org
State New
Headers show
Series [meta-cgl] recipes: Replace WORKDIR with UNPACKDIR | expand

Commit Message

Ryosuke Saito Nov. 18, 2024, 3:30 p.m. UTC 
Use UNPACKDIR for file installation paths to ensure compatibility with
Yocto variable handling.

Signed-off-by: Ryosuke Saito <ryosuke.saito@linaro.org>
---
 .../recipes-cgl/heartbeat/heartbeat_3.0.6.bb     |  4 ++--
 .../recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.6.bb |  4 ++--
 .../recipes-cgl/pacemaker/pacemaker_2.0.5.bb     |  4 ++--
 .../recipes-cgl/racoon2/racoon2_202003018.bb     |  6 +++---
 meta-cgl-common/recipes-cgl/ucarp/ucarp_1.5.2.bb | 16 ++++++++--------
 .../initrdscripts/initramfs-cgl-boot_1.0.bb      |  2 +-
 6 files changed, 18 insertions(+), 18 deletions(-)
diff mbox series

Patch

diff --git a/meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.6.bb b/meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.6.bb
index 7b9e87532c70..27497f8afeb8 100644
--- a/meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.6.bb
+++ b/meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.6.bb
@@ -76,12 +76,12 @@  do_compile:prepend() {
     make clean
 }
 do_install:append () {
-    sed -i -e 's,/usr/lib/,${libdir}/,' ${WORKDIR}/heartbeat.service
+    sed -i -e 's,/usr/lib/,${libdir}/,' ${UNPACKDIR}/heartbeat.service
     if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
         install -d ${D}${libexecdir}
         install -m 0755 ${S}/${SOURCE1} ${D}${libexecdir}/heartbeat.init
         install -d ${D}${systemd_unitdir}/system
-        install -m 0644 ${WORKDIR}/heartbeat.service ${D}${systemd_unitdir}/system/
+        install -m 0644 ${UNPACKDIR}/heartbeat.service ${D}${systemd_unitdir}/system/
     fi
 }
 
diff --git a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.6.bb b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.6.bb
index 03a1333409aa..28b82c2cda94 100644
--- a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.6.bb
+++ b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.6.bb
@@ -101,10 +101,10 @@  do_install:append() {
 
     if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
         install -d ${D}/${systemd_system_unitdir}
-        install -m 0644 ${WORKDIR}/o2cb.service ${D}/${systemd_system_unitdir}
+        install -m 0644 ${UNPACKDIR}/o2cb.service ${D}/${systemd_system_unitdir}
         sed -i -e 's,@LIBDIR@,${libexecdir},' ${D}${systemd_system_unitdir}/o2cb.service
 
-        install -m 0644 ${WORKDIR}/ocfs2.service ${D}/${systemd_system_unitdir}
+        install -m 0644 ${UNPACKDIR}/ocfs2.service ${D}/${systemd_system_unitdir}
         sed -i -e 's,@LIBDIR@,${libexecdir},' ${D}${systemd_system_unitdir}/ocfs2.service
 
         install -d ${D}/${libexecdir}
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.5.bb b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.5.bb
index 49d741e28d9d..fee5622eccba 100644
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.5.bb
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.5.bb
@@ -65,9 +65,9 @@  do_configure:prepend() {
 do_install:append() {
     install -d ${D}${sysconfdir}/default
     install -d ${D}${sysconfdir}/default/volatiles
-    install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/06_${BPN}
+    install -m 0644 ${UNPACKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/06_${BPN}
     install -d ${D}${sysconfdir}/tmpfiles.d
-    install -m 0644 ${WORKDIR}/tmpfiles ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
+    install -m 0644 ${UNPACKDIR}/tmpfiles ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
 
     # Don't package some files
     find ${D} -name "*.pyo" -exec rm {} \;
diff --git a/meta-cgl-common/recipes-cgl/racoon2/racoon2_202003018.bb b/meta-cgl-common/recipes-cgl/racoon2/racoon2_202003018.bb
index 0388afe2ac70..d0daa914a817 100644
--- a/meta-cgl-common/recipes-cgl/racoon2/racoon2_202003018.bb
+++ b/meta-cgl-common/recipes-cgl/racoon2/racoon2_202003018.bb
@@ -59,7 +59,7 @@  do_install:append() {
 
     rmdir ${D}${localstatedir}/run/racoon2 ${D}${localstatedir}/run ${D}${localstatedir}
     install -d ${D}${sysconfdir}/default/volatiles
-    install -m 0700 ${WORKDIR}/volatiles.99_racoon2 ${D}${sysconfdir}/default/volatiles/99_racoon2
+    install -m 0700 ${UNPACKDIR}/volatiles.99_racoon2 ${D}${sysconfdir}/default/volatiles/99_racoon2
     if ${@bb.utils.contains('DISTRO_FEATURES', 'krb5', 'false', 'true', d)}; then
         rm -f ${D}${sysconfdir}/init.d/kinkd ${D}${sysconfdir}/${BPN}/init.d/kinkd \
         ${D}${sysconfdir}/${BPN}/transport_kink.conf.sample ${D}${sysconfdir}/${BPN}/tunnel_kink.conf.sample
@@ -67,8 +67,8 @@  do_install:append() {
 
     # Install systemd service files
     install -d ${D}${systemd_system_unitdir}
-    install -m 0644 ${WORKDIR}/iked.service ${D}${systemd_system_unitdir}
-    install -m 0644 ${WORKDIR}/spmd.service ${D}${systemd_system_unitdir}
+    install -m 0644 ${UNPACKDIR}/iked.service ${D}${systemd_system_unitdir}
+    install -m 0644 ${UNPACKDIR}/spmd.service ${D}${systemd_system_unitdir}
     sed -i -e 's#@SBINDIR@#${sbindir}#g' -e 's,@BASE_BINDIR@,${base_bindir},g' \
         ${D}${systemd_system_unitdir}/*.service
 
diff --git a/meta-cgl-common/recipes-cgl/ucarp/ucarp_1.5.2.bb b/meta-cgl-common/recipes-cgl/ucarp/ucarp_1.5.2.bb
index 4109276ac6fb..d221814c0ea3 100644
--- a/meta-cgl-common/recipes-cgl/ucarp/ucarp_1.5.2.bb
+++ b/meta-cgl-common/recipes-cgl/ucarp/ucarp_1.5.2.bb
@@ -46,22 +46,22 @@  do_configure:prepend() {
 
 do_install:append() {
     sed -i -e 's#\(UPSCRIPT=\).*#\1${libexecdir}/vip-up.sh#' \
-           -e 's#\(DOWNSCRIPT=\).*#\1${libexecdir}/vip-down.sh#' ${WORKDIR}/ucarp.init
+           -e 's#\(DOWNSCRIPT=\).*#\1${libexecdir}/vip-down.sh#' ${UNPACKDIR}/ucarp.init
 
-    install -D -m 0755 ${WORKDIR}/ucarp.init ${D}${sysconfdir}/init.d/ucarp
+    install -D -m 0755 ${UNPACKDIR}/ucarp.init ${D}${sysconfdir}/init.d/ucarp
 
     # For systemd
     if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
-        install -D -m 0755 ${WORKDIR}/ucarp.init ${D}${libexecdir}/ucarp
-        install -D -m 0644 ${WORKDIR}/ucarp.service ${D}${systemd_system_unitdir}/ucarp.service
+        install -D -m 0755 ${UNPACKDIR}/ucarp.init ${D}${libexecdir}/ucarp
+        install -D -m 0644 ${UNPACKDIR}/ucarp.service ${D}${systemd_system_unitdir}/ucarp.service
         sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' ${D}${systemd_system_unitdir}/ucarp.service
     fi
 
     install -m 0755 -d ${D}${sysconfdir}/ucarp
-    install -m 0600 ${WORKDIR}/vip-001.conf.example ${D}${sysconfdir}/ucarp/vip-001.conf.example
-    install -m 0600 ${WORKDIR}/vip-common.conf ${D}${sysconfdir}/ucarp/vip-common.conf
+    install -m 0600 ${UNPACKDIR}/vip-001.conf.example ${D}${sysconfdir}/ucarp/vip-001.conf.example
+    install -m 0600 ${UNPACKDIR}/vip-common.conf ${D}${sysconfdir}/ucarp/vip-common.conf
 
     install -m 0755 -d ${D}${libexecdir}
-    install -m 0700 ${WORKDIR}/vip-up.sh ${D}${libexecdir}/vip-up.sh
-    install -m 0700 ${WORKDIR}/vip-down.sh ${D}${libexecdir}/vip-down.sh
+    install -m 0700 ${UNPACKDIR}/vip-up.sh ${D}${libexecdir}/vip-up.sh
+    install -m 0700 ${UNPACKDIR}/vip-down.sh ${D}${libexecdir}/vip-down.sh
 }
diff --git a/meta-cgl-common/recipes-core/initrdscripts/initramfs-cgl-boot_1.0.bb b/meta-cgl-common/recipes-core/initrdscripts/initramfs-cgl-boot_1.0.bb
index e022ad490ce7..ebe56ba181ce 100644
--- a/meta-cgl-common/recipes-core/initrdscripts/initramfs-cgl-boot_1.0.bb
+++ b/meta-cgl-common/recipes-core/initrdscripts/initramfs-cgl-boot_1.0.bb
@@ -5,7 +5,7 @@  SRC_URI = "file://init-boot.sh \
 "
 
 do_install() {
-        install -m 0755 ${WORKDIR}/init-boot.sh ${D}/init
+        install -m 0755 ${UNPACKDIR}/init-boot.sh ${D}/init
 }
 
 inherit allarch