[oe-commits] Richard Purdie : curl: Drop unneeded custom staging functions
git version control
git at git.openembedded.org
Fri Nov 13 06:54:15 UTC 2009
Module: openembedded.git
Branch: shr/merge
Commit: cc161c965f86874169fc78eefc7626ad203df18a
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=cc161c965f86874169fc78eefc7626ad203df18a
Author: Richard Purdie <rpurdie at linux.intel.com>
Date: Thu Nov 12 14:44:51 2009 +0000
curl: Drop unneeded custom staging functions
Signed-off-by: Richard Purdie <rpurdie at linux.intel.com>
---
recipes/curl/curl-common.inc | 6 ++----
recipes/curl/curl-native_7.18.2.bb | 8 --------
recipes/curl/curl-native_7.19.6.bb | 8 --------
recipes/curl/curl-sdk_7.18.2.bb | 10 ----------
4 files changed, 2 insertions(+), 30 deletions(-)
diff --git a/recipes/curl/curl-common.inc b/recipes/curl/curl-common.inc
index 4af85ba..41c5d91 100644
--- a/recipes/curl/curl-common.inc
+++ b/recipes/curl/curl-common.inc
@@ -6,7 +6,7 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
file://pkgconfig_fix.patch;patch=1"
S = "${WORKDIR}/curl-${PV}"
-INC_PR = "r2"
+INC_PR = "r3"
CURL_FEATURES ?= "zlib,gnutls,cookies,crypto-auth,dict,file,ftp,http,telnet,tftp"
# other allowed features: ipv6, ares, openssl
@@ -62,7 +62,5 @@ do_configure_prepend() {
}
do_stage () {
- install -d ${STAGING_INCDIR}/curl
- install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/
- oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR}
+ autotools_stage_all
}
diff --git a/recipes/curl/curl-native_7.18.2.bb b/recipes/curl/curl-native_7.18.2.bb
index d395021..1eef23b 100644
--- a/recipes/curl/curl-native_7.18.2.bb
+++ b/recipes/curl/curl-native_7.18.2.bb
@@ -2,11 +2,3 @@ require curl-common.inc
inherit native
DEPENDS = "zlib-native"
PR = "${INC_PR}.1"
-
-do_stage () {
- autotools_stage_all
-}
-
-do_install() {
- :
-}
diff --git a/recipes/curl/curl-native_7.19.6.bb b/recipes/curl/curl-native_7.19.6.bb
index b201530..392476b 100644
--- a/recipes/curl/curl-native_7.19.6.bb
+++ b/recipes/curl/curl-native_7.19.6.bb
@@ -4,11 +4,3 @@ DEPENDS = "zlib-native"
PR = "${INC_PR}.2"
CURL_FEATURES = "zlib,cookies,crypto-auth,dict,file,ftp,http,telnet,tftp"
-
-do_stage () {
- autotools_stage_all
-}
-
-do_install() {
- :
-}
diff --git a/recipes/curl/curl-sdk_7.18.2.bb b/recipes/curl/curl-sdk_7.18.2.bb
index 8eed3d6..f1fd34f 100644
--- a/recipes/curl/curl-sdk_7.18.2.bb
+++ b/recipes/curl/curl-sdk_7.18.2.bb
@@ -2,13 +2,3 @@ require curl-common.inc
inherit sdk
DEPENDS = "zlib-sdk"
PR = "${INC_PR}.1"
-
-do_stage () {
- install -d ${STAGING_INCDIR}/curl
- install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/
- oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR}
-}
-
-do_install() {
- :
-}
More information about the Openembedded-commits
mailing list