openssl: minor indent fixes

Fix inconsistent indent (and also make the openssl 1.1 recipe more
consistent and consistent with the openssl 1.0 recipe).

(From OE-Core rev: 69844643aa1b829c27f144db634c8223c18c783f)

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>

diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
index 5dc2966faccaf7cc22edcf4e2b79d4242b20e267..a7cd6a488e70c8b919198d90a5d5d60e39eb78c4 100644 (file)
--- a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
@@ -44,7 +44,7 @@ do_configure () {
        linux-musl )
                os=linux
                ;;
-               *)
+       *)
                ;;
        esac
        target="$os-${HOST_ARCH}"
@@ -80,21 +80,21 @@ do_configure () {
                target=linux-x86_64
                ;;
        linux-mips)
-                # specifying TARGET_CC_ARCH prevents openssl from (incorrectly) adding target architecture flags
+               # specifying TARGET_CC_ARCH prevents openssl from (incorrectly) adding target architecture flags
                target="linux-mips32 ${TARGET_CC_ARCH}"
                ;;
        linux-mipsel)
                target="linux-mips32 ${TARGET_CC_ARCH}"
                ;;
-        linux-gnun32-mips*)
-               target=linux-mips64
-                ;;
-        linux-*-mips64 | linux-mips64)
-               target=linux64-mips64
-                ;;
-        linux-*-mips64el | linux-mips64el)
-               target=linux64-mips64
-                ;;
+       linux-gnun32-mips*)
+               target=linux-mips64
+               ;;
+       linux-*-mips64 | linux-mips64)
+               target=linux64-mips64
+               ;;
+       linux-*-mips64el | linux-mips64el)
+               target=linux64-mips64
+               ;;
        linux-microblaze*|linux-nios2*)
                target=linux-generic32
                ;;
@@ -104,12 +104,12 @@ do_configure () {
        linux-powerpc64)
                target=linux-ppc64
                ;;
-       linux-riscv64)
-               target=linux-generic64
-               ;;
        linux-riscv32)
                target=linux-generic32
                ;;
+       linux-riscv64)
+               target=linux-generic64
+               ;;
        linux-supersparc)
                target=linux-sparcv9
                ;;
@@ -120,40 +120,41 @@ do_configure () {
                target=darwin-i386-cc
                ;;
        esac
-        useprefix=${prefix}
-        if [ "x$useprefix" = "x" ]; then
-                useprefix=/
-        fi
+
+       useprefix=${prefix}
+       if [ "x$useprefix" = "x" ]; then
+               useprefix=/
+       fi
        libdirleaf="$(echo ${libdir} | sed s:$useprefix::)"
-       perl ./Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} --prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=${libdirleaf} $target
+       perl ./Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} --prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=$libdirleaf $target
 }
 
 do_install () {
-        oe_runmake DESTDIR="${D}" MANDIR="${mandir}" MANSUFFIX=ssl install
-        oe_multilib_header openssl/opensslconf.h
+       oe_runmake DESTDIR="${D}" MANDIR="${mandir}" MANSUFFIX=ssl install
+       oe_multilib_header openssl/opensslconf.h
 }
 
 do_install_append_class-native () {
-        # Install a custom version of c_rehash that can handle sysroots properly.
-        # This version is used for example when installing ca-certificates during
-        # image creation.
-        install -Dm 0755 ${WORKDIR}/openssl-c_rehash.sh ${D}${bindir}/c_rehash
-        sed -i -e 's,/etc/openssl,${sysconfdir}/ssl,g' ${D}${bindir}/c_rehash
+       # Install a custom version of c_rehash that can handle sysroots properly.
+       # This version is used for example when installing ca-certificates during
+       # image creation.
+       install -Dm 0755 ${WORKDIR}/openssl-c_rehash.sh ${D}${bindir}/c_rehash
+       sed -i -e 's,/etc/openssl,${sysconfdir}/ssl,g' ${D}${bindir}/c_rehash
 }
 
 do_install_append_class-nativesdk () {
-        mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d
-        install -m 644 ${WORKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh
+       mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d
+       install -m 644 ${WORKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh
 }
 
 do_install_ptest() {
-        cp -r * ${D}${PTEST_PATH}
+       cp -r * ${D}${PTEST_PATH}
 
-        # Putting .so files in ptest package will mess up the dependencies of the main openssl package
-        # so we rename them to .so.ptest and patch the test accordingly
-        mv ${D}${PTEST_PATH}/libcrypto.so ${D}${PTEST_PATH}/libcrypto.so.ptest
-        mv ${D}${PTEST_PATH}/libssl.so ${D}${PTEST_PATH}/libssl.so.ptest
-        sed -i 's/$target{shared_extension_simple}/".so.ptest"/' ${D}${PTEST_PATH}/test/recipes/90-test_shlibload.t
+       # Putting .so files in ptest package will mess up the dependencies of the main openssl package
+       # so we rename them to .so.ptest and patch the test accordingly
+       mv ${D}${PTEST_PATH}/libcrypto.so ${D}${PTEST_PATH}/libcrypto.so.ptest
+       mv ${D}${PTEST_PATH}/libssl.so ${D}${PTEST_PATH}/libssl.so.ptest
+       sed -i 's/$target{shared_extension_simple}/".so.ptest"/' ${D}${PTEST_PATH}/test/recipes/90-test_shlibload.t
 }
 
 PACKAGES =+ "${PN}-engines"