openssl: Convert to use do_install for staging

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/packages/openssl/openssl-native_0.9.8g.bb b/meta/packages/openssl/openssl-native_0.9.8g.bb
index 664895ce85bfdc1e2a39be9915a30dc8382f2896..31f333f9e2a70ab7b5d70107657d5458f9107090 100644 (file)
--- 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 2ec1d91e7aa7bbf8a1200a7b1f1106fbe0354b61..fd0bbba58ced2d25a61ee3c2bf3db42d45e6978d 100644 (file)
--- 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 f83c5b293de0ed3d8d9066cddb5e5e5a4a52bc08..73335f36b4e79ffc3184cfce9060bd90e8770fb2 100644 (file)
--- 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 = ""