5 files changed, 13 insertions, 13 deletions

diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
index e33df444..2d02d7ab 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -274,7 +274,7 @@ do_install () {
                 rm -rf ${D}$f
             done
         else
-            install -Dm 0644 ${WORKDIR}/imx_icd.json ${D}${sysconfdir}/vulkan/icd.d/imx_icd.json
+            install -Dm 0644 ${UNPACKDIR}/imx_icd.json ${D}${sysconfdir}/vulkan/icd.d/imx_icd.json
             sed -i "s,%libdir%,${libdir}," ${D}${sysconfdir}/vulkan/icd.d/imx_icd.json
             sed -i "s,%api_version%,${LIBVULKAN_API_VERSION}," ${D}${sysconfdir}/vulkan/icd.d/imx_icd.json
         fi
diff --git a/recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb b/recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb
index 87d05365..658b28de 100644
--- a/recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb
+++ b/recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb
@@ -17,13 +17,13 @@ do_install:use-mainline-bsp() {
 
     # systemd
     if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
-        install -D -m 644 ${WORKDIR}/mesa-etnaviv.conf \
+        install -D -m 644 ${UNPACKDIR}/mesa-etnaviv.conf \
             ${D}${sysconfdir}/systemd/system.conf.d/mesa-etnaviv.conf
     fi
 
     # sysvinit
     if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
-        install -D -m 644 ${WORKDIR}/mesa-etnaviv.sh \
+        install -D -m 644 ${UNPACKDIR}/mesa-etnaviv.sh \
             ${D}${sysconfdir}/profile.d/mesa-etnaviv.sh
     fi
 }
diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend
index 9d04df23..07a4ea86 100644
--- a/recipes-graphics/wayland/weston-init.bbappend
+++ b/recipes-graphics/wayland/weston-init.bbappend
@@ -58,8 +58,8 @@ PACKAGECONFIG[use-g2d] = ",,"
 PACKAGECONFIG[xwayland] = ",,"
 
 do_install:append() {
-    if [ -f "${WORKDIR}/weston.config" ]; then
-        install -Dm0755 ${WORKDIR}/weston.config ${D}${sysconfdir}/default/weston
+    if [ -f "${UNPACKDIR}/weston.config" ]; then
+        install -Dm0755 ${UNPACKDIR}/weston.config ${D}${sysconfdir}/default/weston
     fi
 
     if [ "${@bb.utils.contains('PACKAGECONFIG', 'gbm-format', 'yes', 'no', d)}" = "yes" ]; then
diff --git a/recipes-graphics/wayland/weston_10.0.5.imx.bb b/recipes-graphics/wayland/weston_10.0.5.imx.bb
index 99624887..df2898f0 100644
--- a/recipes-graphics/wayland/weston_10.0.5.imx.bb
+++ b/recipes-graphics/wayland/weston_10.0.5.imx.bb
@@ -109,18 +109,18 @@ do_install:append() {
         # If X11, ship a desktop file to launch it
         if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then
                 install -d ${D}${datadir}/applications
-                install ${WORKDIR}/weston.desktop ${D}${datadir}/applications
+                install ${UNPACKDIR}/weston.desktop ${D}${datadir}/applications
 
                 install -d ${D}${datadir}/icons/hicolor/48x48/apps
-                install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
+                install ${UNPACKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
         fi
 
         if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then
-                install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
+                install -Dm 644 ${UNPACKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
         fi
 
         if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then
-                install -Dm 644 ${WORKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
+                install -Dm 644 ${UNPACKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
         fi
 
         if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then
diff --git a/recipes-graphics/wayland/weston_12.0.3.imx.bb b/recipes-graphics/wayland/weston_12.0.3.imx.bb
index 8114ddbb..14b79f18 100644
--- a/recipes-graphics/wayland/weston_12.0.3.imx.bb
+++ b/recipes-graphics/wayland/weston_12.0.3.imx.bb
@@ -116,18 +116,18 @@ do_install:append() {
         # If X11, ship a desktop file to launch it
         if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then
                 install -d ${D}${datadir}/applications
-                install ${WORKDIR}/weston.desktop ${D}${datadir}/applications
+                install ${UNPACKDIR}/weston.desktop ${D}${datadir}/applications
 
                 install -d ${D}${datadir}/icons/hicolor/48x48/apps
-                install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
+                install ${UNPACKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
         fi
 
         if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then
-                install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
+                install -Dm 644 ${UNPACKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
         fi
 
         if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then
-                install -Dm 644 ${WORKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
+                install -Dm 644 ${UNPACKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
         fi
 
         if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then