Add gcr, p11kit and certdata packages

[hvlinux.git] / stage3 / pkg / openssl

diff --git a/stage3/pkg/openssl b/stage3/pkg/openssl
index 715d37f..863696e 100644 (file)
--- a/stage3/pkg/openssl
+++ b/stage3/pkg/openssl
@@ -1,11 +1,5 @@
 #!/bin/bash
 
-hvconfig_pre()
-{
-    cd ${LFS_TMP}/${PACKAGE}
-    decompress_package ${OPENSSL_ROOT_CERTS} ./
-}
-
 hvbuild()
 {
     cd ${LFS_TMP}/${PACKAGE}
@@ -13,6 +7,7 @@ hvbuild()
     MAKEDEPPROG=gcc CC=gcc ./config \
         --prefix=/usr \
         --openssldir=/etc/ssl \
+        --libdir=lib \
         shared \
         zlib-dynamic
 
@@ -23,12 +18,4 @@ hvbuild()
     install -v -d -m755 /usr/share/doc/${PACKAGE}
     cp -v -r doc/{HOWTO,README,*.{txt,html,gif}} \
         /usr/share/doc/${PACKAGE}
-
-    cp -rv certs /etc/ssl
-
-    # Create a single file that contains all of the installed certificates:
-    for pem in /etc/ssl/certs/*.pem; do
-        cat $pem
-        echo ""
-    done > /etc/ssl/ca-bundle.crt
 }