recipes: Switch away from S = WORKDIR

Make it dependent on UNPACKDIR instead

Signed-off-by: Khem Raj <raj.khem@gmail.com>

2 files changed, 9 insertions, 7 deletions

diff --git a/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb b/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb
index 25ab44f75e..6fad255c89 100644
--- a/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb
+++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb
@@ -12,7 +12,8 @@ SRC_URI = "file://fancontrol \
            file://sensors.conf \
            file://sensord \
 "
-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 PACKAGECONFIG ??= "sensord"
 PACKAGECONFIG[sensord] = ",,"
@@ -22,20 +23,20 @@ RDEPENDS:${PN}-dev = ""
 do_install() {
     # Install fancontrol configuration file
     install -d ${D}${sysconfdir}/sysconfig
-    install -m 0644 ${WORKDIR}/fancontrol ${D}${sysconfdir}
-    install -m 0644 ${WORKDIR}/sensord ${D}${sysconfdir}/sysconfig
+    install -m 0644 ${UNPACKDIR}/fancontrol ${D}${sysconfdir}
+    install -m 0644 ${UNPACKDIR}/sensord ${D}${sysconfdir}/sysconfig
     # Install libsensors configuration file
     install -d ${D}${sysconfdir}/sensors.d
-    install -m 0644 ${WORKDIR}/sensors.conf ${D}${sysconfdir}/sensors.d
+    install -m 0644 ${UNPACKDIR}/sensors.conf ${D}${sysconfdir}/sensors.d
 
     if ${@bb.utils.contains('PACKAGECONFIG', 'sensord', 'true', 'false', d)}; then
         # Install sensord configuration file
-        install -m 0644 ${WORKDIR}/sensord.conf ${D}${sysconfdir}
+        install -m 0644 ${UNPACKDIR}/sensord.conf ${D}${sysconfdir}
 
         # Install sensord.cgi script and create world-writable
         # web-accessible sensord directory
         install -d ${D}/www/pages/cgi-bin
-        install -m 0755 ${WORKDIR}/sensord.cgi ${D}/www/pages/cgi-bin
+        install -m 0755 ${UNPACKDIR}/sensord.cgi ${D}/www/pages/cgi-bin
         install -d -m a=rwxs ${D}/www/pages/sensord
     fi
 }
diff --git a/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb b/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb
index 61be5b2dcc..20e870ccb2 100644
--- a/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb
+++ b/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb
@@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4b5fcfc87fb615860d398b5e38685edf"
 SRC_URI = "file://pointercal \
            file://COPYING"
 
-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 do_install() {
     # Only install file if it has a contents