diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-17 12:17:43 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-17 12:17:43 +0000 |
| commit | ed0a52a8e5b4f996d4911e1e4f77dfc725cd5ba7 (patch) | |
| tree | 2995437c20031f95af8ad9cefe0f940a22789573 /meta | |
| parent | 6a54171997fff21fcc9057befc85d337d445a71b (diff) | |
| download | openembedded-core-ed0a52a8e5b4f996d4911e1e4f77dfc725cd5ba7.tar.gz openembedded-core-ed0a52a8e5b4f996d4911e1e4f77dfc725cd5ba7.tar.bz2 openembedded-core-ed0a52a8e5b4f996d4911e1e4f77dfc725cd5ba7.zip | |
openssl: Convert to use do_install for staging
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/openssl/openssl-native_0.9.8g.bb | 10 | ||||
| -rw-r--r-- | meta/packages/openssl/openssl.inc | 11 | ||||
| -rw-r--r-- | meta/packages/openssl/openssl_0.9.8g.bb | 4 |
3 files changed, 6 insertions, 19 deletions
diff --git a/meta/packages/openssl/openssl-native_0.9.8g.bb b/meta/packages/openssl/openssl-native_0.9.8g.bb index 664895ce85..31f333f9e2 100644 --- a/meta/packages/openssl/openssl-native_0.9.8g.bb +++ b/meta/packages/openssl/openssl-native_0.9.8g.bb @@ -1,4 +1,4 @@ -inherit pkgconfig native pkgconfig_stage +inherit native require openssl.inc @@ -12,11 +12,3 @@ SRC_URI += "file://debian.patch;patch=1 \ file://configure-targets.patch;patch=1 \ file://shared-libs.patch;patch=1" -PARALLEL_MAKE = "" - -FILESPATH = "${@base_set_filespath( ['${FILE_DIRNAME}/openssl-${PV}', '${FILE_DIRNAME}/openssl', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" - -do_install() { - : -} - diff --git a/meta/packages/openssl/openssl.inc b/meta/packages/openssl/openssl.inc index 2ec1d91e7a..fd0bbba58c 100644 --- a/meta/packages/openssl/openssl.inc +++ b/meta/packages/openssl/openssl.inc @@ -18,6 +18,10 @@ export DIRS = "crypto ssl apps" export EX_LIBS = "-lgcc -ldl" export AS = "${CC} -c" +PARALLEL_MAKE = "" + +inherit pkgconfig + PACKAGES =+ "libcrypto libssl" FILES_libcrypto = "${libdir}/libcrypto.so.*" FILES_libssl = "${libdir}/libssl.so.*" @@ -80,12 +84,7 @@ do_compile () { oe_runmake } -do_stage () { - cp --dereference -R include/openssl ${STAGING_INCDIR}/ - oe_libinstall -a -so libcrypto ${STAGING_LIBDIR} - oe_libinstall -a -so libssl ${STAGING_LIBDIR} -} - +NATIVE_INSTALL_WORKS = "1" do_install () { install -m 0755 -d ${D}${libdir}/pkgconfig oe_runmake INSTALL_PREFIX="${D}" install diff --git a/meta/packages/openssl/openssl_0.9.8g.bb b/meta/packages/openssl/openssl_0.9.8g.bb index f83c5b293d..73335f36b4 100644 --- a/meta/packages/openssl/openssl_0.9.8g.bb +++ b/meta/packages/openssl/openssl_0.9.8g.bb @@ -1,5 +1,3 @@ -inherit pkgconfig pkgconfig_stage - require openssl.inc PR = "r10" @@ -7,5 +5,3 @@ PR = "r10" SRC_URI += "file://debian.patch;patch=1 \ file://configure-targets.patch;patch=1 \ file://shared-libs.patch;patch=1" - -PARALLEL_MAKE = "" |