Remove unneeded S variables

diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 077ac9c8a3397b9c17f1d059e133d3c57a82e7ff..1fb6e66ced39f8122d804e0df7c53ef523399fc2 100644 (file)
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -80,6 +80,8 @@ export oldincludedir = "${STAGING_DIR_NATIVE}${layout_includedir}"
 do_stage () {
        if [ "${INHIBIT_NATIVE_STAGE_INSTALL}" != "1" ]
        then
+               # If autotools is active, use the autotools staging function, else 
+               # use our "make install" equivalent
                if [ "${AUTOTOOLS_NATIVE_STAGE_INSTALL}" != "1" ]
                then
                        oe_runmake install

diff --git a/meta/packages/cdrtools/cdrtools-native_2.01.bb b/meta/packages/cdrtools/cdrtools-native_2.01.bb
index be99bea862ec75fb276a38765d1c86068efb0eeb..4ed91a7f45d21e1975e4884913406c79038f89a8 100644 (file)
--- a/meta/packages/cdrtools/cdrtools-native_2.01.bb
+++ b/meta/packages/cdrtools/cdrtools-native_2.01.bb
@@ -10,8 +10,6 @@ PR = "r1"
 SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/cdrtools-${PV}.tar.bz2 \
          file://no_usr_src.patch;patch=1"
 
-S="${WORKDIR}/cdrtools-${PV}"
-
 inherit native
 
 STAGE_TEMP="${WORKDIR}/stage_temp"

diff --git a/meta/packages/cmake/cmake.inc b/meta/packages/cmake/cmake.inc
index 7cd1e8a7ec712938bb7a4598d0482288c690fb03..9e5e2600d1c16720b586ce2670d2588d6eafabf4 100644 (file)
--- a/meta/packages/cmake/cmake.inc
+++ b/meta/packages/cmake/cmake.inc
@@ -10,8 +10,6 @@ SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz
 
 inherit autotools
 
-S = "${WORKDIR}/cmake-${PV}"
-
 do_configure () {
        ./configure --prefix=${prefix} || die "./bootstrap failed"
 }

diff --git a/meta/packages/curl/curl_7.18.0.bb b/meta/packages/curl/curl_7.18.0.bb
index cf4926bfbb17ae13cf9def49740723e00db9b8f9..71c157e5274e9c4fdfa6eb4dd49e45609b2c31f0 100644 (file)
--- a/meta/packages/curl/curl_7.18.0.bb
+++ b/meta/packages/curl/curl_7.18.0.bb
@@ -6,7 +6,6 @@ PR = "r1"
 
 SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
            file://pkgconfig_fix.patch;patch=1"
-S = "${WORKDIR}/curl-${PV}"
 
 inherit autotools_stage pkgconfig binconfig
 

diff --git a/meta/packages/file/file_4.18.bb b/meta/packages/file/file_4.18.bb
index c26228a364ac5150f98bfb444fad6863f8332e4e..6d2eed0cd2a626cac239c14e763a193d42407e89 100644 (file)
--- a/meta/packages/file/file_4.18.bb
+++ b/meta/packages/file/file_4.18.bb
@@ -7,7 +7,6 @@ DEPENDS = "file-native"
 SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
            file://dump \
            file://filesystems"
-S = "${WORKDIR}/file-${PV}"
 
 inherit autotools_stage
 

diff --git a/meta/packages/yum/yum-native_3.2.18.bb b/meta/packages/yum/yum-native_3.2.18.bb
index f4dc87ed436587075290ef83c452d39d741610ba..7c3578fc94240821b76aef338209955e34ff9145 100644 (file)
--- a/meta/packages/yum/yum-native_3.2.18.bb
+++ b/meta/packages/yum/yum-native_3.2.18.bb
@@ -9,8 +9,6 @@ PR = "r7"
 
 DEPENDS = "rpm-native python-native python-iniparse-native python-urlgrabber-native yum-metadata-parser-native libxml2-native"
 
-S = "${WORKDIR}/yum-${PV}"
-
 inherit autotools native
 
 do_compile_append () {

diff --git a/meta/packages/zip/zip-native_2.32.bb b/meta/packages/zip/zip-native_2.32.bb
index cfa4272378f1dc6cb71635a184c77151f3ddeb91..50381882477d0d1e417cd484ba1fa308c8a8afd9 100644 (file)
--- a/meta/packages/zip/zip-native_2.32.bb
+++ b/meta/packages/zip/zip-native_2.32.bb
@@ -2,8 +2,6 @@ require zip_${PV}.bb
 
 inherit native
 
-S = "${WORKDIR}/zip-${PV}"
-
 do_stage() {
        install -d ${STAGING_BINDIR}
        install zip zipnote zipsplit zipcloak ${STAGING_BINDIR}