summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-01-03 18:34:00 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-01-03 18:34:00 +0000
commitf091e6c78ac882deae3961939af57d5423560db3 (patch)
tree57b10065ec70e154aa6fdf59f96f4470ec6b50ed /meta
parent467b5bc1e0e02e4471b8cd6caf9b00308f7a2f00 (diff)
downloadpoky-f091e6c78ac882deae3961939af57d5423560db3.tar.gz
Remove unneeded S variables
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/native.bbclass2
-rw-r--r--meta/packages/cdrtools/cdrtools-native_2.01.bb2
-rw-r--r--meta/packages/cmake/cmake.inc2
-rw-r--r--meta/packages/curl/curl_7.18.0.bb1
-rw-r--r--meta/packages/file/file_4.18.bb1
-rw-r--r--meta/packages/yum/yum-native_3.2.18.bb2
-rw-r--r--meta/packages/zip/zip-native_2.32.bb2
7 files changed, 2 insertions, 10 deletions
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}"
80do_stage () { 80do_stage () {
81 if [ "${INHIBIT_NATIVE_STAGE_INSTALL}" != "1" ] 81 if [ "${INHIBIT_NATIVE_STAGE_INSTALL}" != "1" ]
82 then 82 then
83 # If autotools is active, use the autotools staging function, else
84 # use our "make install" equivalent
83 if [ "${AUTOTOOLS_NATIVE_STAGE_INSTALL}" != "1" ] 85 if [ "${AUTOTOOLS_NATIVE_STAGE_INSTALL}" != "1" ]
84 then 86 then
85 oe_runmake install 87 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"
10SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/cdrtools-${PV}.tar.bz2 \ 10SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/cdrtools-${PV}.tar.bz2 \
11 file://no_usr_src.patch;patch=1" 11 file://no_usr_src.patch;patch=1"
12 12
13S="${WORKDIR}/cdrtools-${PV}"
14
15inherit native 13inherit native
16 14
17STAGE_TEMP="${WORKDIR}/stage_temp" 15STAGE_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
10 10
11inherit autotools 11inherit autotools
12 12
13S = "${WORKDIR}/cmake-${PV}"
14
15do_configure () { 13do_configure () {
16 ./configure --prefix=${prefix} || die "./bootstrap failed" 14 ./configure --prefix=${prefix} || die "./bootstrap failed"
17} 15}
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"
6 6
7SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ 7SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
8 file://pkgconfig_fix.patch;patch=1" 8 file://pkgconfig_fix.patch;patch=1"
9S = "${WORKDIR}/curl-${PV}"
10 9
11inherit autotools_stage pkgconfig binconfig 10inherit autotools_stage pkgconfig binconfig
12 11
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"
7SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \ 7SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
8 file://dump \ 8 file://dump \
9 file://filesystems" 9 file://filesystems"
10S = "${WORKDIR}/file-${PV}"
11 10
12inherit autotools_stage 11inherit autotools_stage
13 12
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"
9 9
10DEPENDS = "rpm-native python-native python-iniparse-native python-urlgrabber-native yum-metadata-parser-native libxml2-native" 10DEPENDS = "rpm-native python-native python-iniparse-native python-urlgrabber-native yum-metadata-parser-native libxml2-native"
11 11
12S = "${WORKDIR}/yum-${PV}"
13
14inherit autotools native 12inherit autotools native
15 13
16do_compile_append () { 14do_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
2 2
3inherit native 3inherit native
4 4
5S = "${WORKDIR}/zip-${PV}"
6
7do_stage() { 5do_stage() {
8 install -d ${STAGING_BINDIR} 6 install -d ${STAGING_BINDIR}
9 install zip zipnote zipsplit zipcloak ${STAGING_BINDIR} 7 install zip zipnote zipsplit zipcloak ${STAGING_BINDIR}