diff mbox series

[master] recipes: UNPACKDIR cleanup

Message ID 20240715185008.15655-1-denis@denix.org
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [master] recipes: UNPACKDIR cleanup | expand

Commit Message

Denys Dmytriyenko July 15, 2024, 6:50 p.m. UTC 
From: Denys Dmytriyenko <denys@konsulko.com>

Fix warning that S does not exist, since it defaults to ${WORKDIR}/${BP}

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb        | 7 +++++--
 meta-arago-extras/recipes-core/llvm/llvm-common.bb         | 7 +++++--
 .../recipes-devtools/opkg/opkg-bash-completion.bb          | 5 ++++-
 3 files changed, 14 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb b/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb
index 83a2cba3..bed03208 100644
--- a/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb
+++ b/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb
@@ -9,12 +9,15 @@  SRC_URI = "file://qt_env.sh \
            file://eglfs_kms_cfg.json \
           "
 
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
+
 # Add custom Arago qtbase Environment script and eglfs_kms configuration file
 do_install () {
     install -d ${D}${sysconfdir}/profile.d
-    install -m 0644 ${UNPACKDIR}/qt_env.sh ${D}${sysconfdir}/profile.d/
+    install -m 0644 ${S}/qt_env.sh ${D}${sysconfdir}/profile.d/
     install -d ${D}${sysconfdir}/qt5
-    install -m 0644 ${UNPACKDIR}/eglfs_kms_cfg.json ${D}${sysconfdir}/qt5/
+    install -m 0644 ${S}/eglfs_kms_cfg.json ${D}${sysconfdir}/qt5/
 }
 
 FILES:${PN} += "${sysconfdir}/profile.d/* ${sysconfdir}/qt5/*"
diff --git a/meta-arago-extras/recipes-core/llvm/llvm-common.bb b/meta-arago-extras/recipes-core/llvm/llvm-common.bb
index 9668375e..cf03e434 100644
--- a/meta-arago-extras/recipes-core/llvm/llvm-common.bb
+++ b/meta-arago-extras/recipes-core/llvm/llvm-common.bb
@@ -4,17 +4,20 @@  LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 SRC_URI = "file://llvm-config"
 
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
+
 ALLOW_EMPTY:${PN} = "1"
 SYSROOT_PREPROCESS_FUNCS:append:class-target = " llvm_common_sysroot_preprocess"
 
 llvm_common_sysroot_preprocess() {
     install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
-    install -m 0755 ${UNPACKDIR}/llvm-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/
+    install -m 0755 ${S}/llvm-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/
 }
 
 do_install:class-native() {
     install -d ${D}${bindir}
-    install -m 0755 ${UNPACKDIR}/llvm-config ${D}${bindir}
+    install -m 0755 ${S}/llvm-config ${D}${bindir}
 }
 
 BBCLASSEXTEND = "native"
diff --git a/meta-arago-extras/recipes-devtools/opkg/opkg-bash-completion.bb b/meta-arago-extras/recipes-devtools/opkg/opkg-bash-completion.bb
index a5c78ead..51f0dd3e 100644
--- a/meta-arago-extras/recipes-devtools/opkg/opkg-bash-completion.bb
+++ b/meta-arago-extras/recipes-devtools/opkg/opkg-bash-completion.bb
@@ -7,9 +7,12 @@  LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 
 SRC_URI = "file://opkg-bash-completion"
 
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
+
 do_install() {
     install -d ${D}${datadir}/bash-completion/completions
-    install -m 0644 ${UNPACKDIR}/opkg-bash-completion \
+    install -m 0644 ${S}/opkg-bash-completion \
                     ${D}${datadir}/bash-completion/completions/opkg
 }