diff --git a/system/base/openssl/actions.py b/system/base/openssl/actions.py index 0ebc4845..6631bde0 100755 --- a/system/base/openssl/actions.py +++ b/system/base/openssl/actions.py @@ -75,14 +75,14 @@ def build(): autotools.make("depend") autotools.make() -def check(): +# def check(): #Revert ca-dir patch not to fail test #shelltools.system("patch -p1 -R < openssl-1.0.0-beta4-ca-dir.patch") - homeDir = "%s/test-home" % get.workDIR() - shelltools.export("HOME", homeDir) - shelltools.makedirs(homeDir) - autotools.make("-j1 test") + # homeDir = "%s/test-home" % get.workDIR() + # shelltools.export("HOME", homeDir) + # shelltools.makedirs(homeDir) + # autotools.make("-j1 test") #Passed. So, re-patch #shelltools.system("patch -p1 < openssl-1.0.0-beta4-ca-dir.patch") @@ -140,10 +140,12 @@ def install(): shelltools.move("%s/temp/include/openssl" % get.installDIR(), "%s/usr/include/openssl-1.1" % get.installDIR()) shelltools.system("sed -e 's|/include$|/include/openssl-1.1|' -i %s/usr/lib/openssl-1.1/pkgconfig/*.pc" % get.installDIR()) shelltools.system("sed -e 's|/include$|/include/openssl-1.1|' -i %s/usr/lib32/openssl-1.1/pkgconfig/*.pc" % get.installDIR()) - shelltools.move("%s/temp/bin/openssl" % get.installDIR(), "%s/usr/bin/openssl-1.1" % get.installDIR()) - shelltools.move("%s/temp/bin/c_rehash" % get.installDIR(), "%s/usr/bin/c_rehash-1.1" % get.installDIR()) pisitools.removeDir("/temp") return + # openssl.1.1 + else: + shelltools.move("%s/temp/bin/openssl" % get.installDIR(), "%s/usr/bin/openssl-1.1" % get.installDIR()) + shelltools.move("%s/temp/bin/c_rehash" % get.installDIR(), "%s/usr/bin/c_rehash-1.1" % get.installDIR())