From f091e6c78ac882deae3961939af57d5423560db3 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Sat, 3 Jan 2009 18:34:00 +0000
Subject: Remove unneeded S variables

---
 meta/classes/native.bbclass                    | 2 ++
 meta/packages/cdrtools/cdrtools-native_2.01.bb | 2 --
 meta/packages/cmake/cmake.inc                  | 2 --
 meta/packages/curl/curl_7.18.0.bb              | 1 -
 meta/packages/file/file_4.18.bb                | 1 -
 meta/packages/yum/yum-native_3.2.18.bb         | 2 --
 meta/packages/zip/zip-native_2.32.bb           | 2 --
 7 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'meta')

diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 077ac9c8a3..1fb6e66ced 100644
--- 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 be99bea862..4ed91a7f45 100644
--- 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 7cd1e8a7ec..9e5e2600d1 100644
--- 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 cf4926bfbb..71c157e527 100644
--- 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 c26228a364..6d2eed0cd2 100644
--- 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 f4dc87ed43..7c3578fc94 100644
--- 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 cfa4272378..5038188247 100644
--- 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}
-- 
cgit v1.2.3-54-g00ecf