Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Robert Joslyn <robert.joslyn@redrectangle.org>
To: openembedded-core@lists.openembedded.org
Subject: [rocko][PATCH 14/25] openssl: minor indent fixes
Date: Sat,  3 Nov 2018 09:44:16 -0700	[thread overview]
Message-ID: <20181103164427.16125-15-robert.joslyn@redrectangle.org> (raw)
In-Reply-To: <20181103164427.16125-1-robert.joslyn@redrectangle.org>

From: Andre McCurdy <armccurdy@gmail.com>

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)

(From OE-Core rev: 3e0290b51da404761ac6a7d2657fd10693bf21b9)

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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../openssl/openssl_1.1.0h.bb                 | 63 ++++++++++---------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
index 472454b5a6..8e57a07e14 100644
--- 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
 		;;
@@ -114,40 +114,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"
-- 
2.18.1



  parent reply	other threads:[~2018-11-03 16:45 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-03 16:44 [rocko][PATCH 00/25] Backport openssl 1.0.2p and 1.1.0i Robert Joslyn
2018-11-03 16:44 ` [rocko][PATCH 01/25] openssl: fix upstream version check for 1.0 version Robert Joslyn
2018-11-03 16:44 ` [rocko][PATCH 02/25] openssl: disable ccache usage Robert Joslyn
2018-11-03 16:44 ` [rocko][PATCH 03/25] openssl-nativesdk: Fix "can't open config file" warning Robert Joslyn
2018-11-03 16:44 ` [rocko][PATCH 04/25] openssl_1.1: avoid using += with an over-ride Robert Joslyn
2018-11-03 16:44 ` [rocko][PATCH 05/25] openssl_1.1: minor recipe formatting tweaks etc Robert Joslyn
2018-11-03 16:44 ` [rocko][PATCH 06/25] openssl_1.0: merge openssl10.inc into the openssl_1.0.2o.bb recipe Robert Joslyn
2018-11-03 16:44 ` [rocko][PATCH 07/25] openssl_1.0: minor recipe formatting tweaks etc Robert Joslyn
2018-11-03 16:44 ` [rocko][PATCH 08/25] openssl_1.0: drop curly brackets from shell local variables Robert Joslyn
2018-11-03 16:44 ` [rocko][PATCH 09/25] openssl_1.0: fix cryptodev-linux PACKAGECONFIG support Robert Joslyn
2018-11-03 16:44 ` [rocko][PATCH 10/25] openssl_1.0: drop leading "-" from no-ssl3 config option Robert Joslyn
2018-11-03 16:44 ` [rocko][PATCH 11/25] openssl_1.0: avoid running make twice for target do_compile() Robert Joslyn
2018-11-03 16:44 ` [rocko][PATCH 12/25] openssl: remove uclibc remnants Robert Joslyn
2018-11-03 16:44 ` [rocko][PATCH 13/25] openssl: support musl-x32 build Robert Joslyn
2018-11-03 16:44 ` Robert Joslyn [this message]
2018-11-03 16:44 ` [rocko][PATCH 15/25] openssl_1.0: drop obsolete ca.patch Robert Joslyn
2018-11-03 16:44 ` [rocko][PATCH 16/25] openssl_1.0: drop obsolete exporting of AS, EX_LIBS and DIRS Robert Joslyn
2018-11-03 16:44 ` [rocko][PATCH 17/25] openssl_1.0: drop unmaintained darwin support Robert Joslyn
2018-11-03 16:44 ` [rocko][PATCH 18/25] openssl_1.0: add PACKAGECONFIG option to control manpages Robert Joslyn
2018-11-03 16:44 ` [rocko][PATCH 19/25] openssl_1.0: squash whitespace in CC_INFO Robert Joslyn
2018-11-03 16:44 ` [rocko][PATCH 20/25] openssl: fix missing dependency on hostperl-runtime-native Robert Joslyn
2018-11-03 16:44 ` [rocko][PATCH 21/25] openssl_1.0: drop unnecessary dependency on makedepend-native Robert Joslyn
2018-11-03 16:44 ` [rocko][PATCH 22/25] openssl_1.0: drop unnecessary call to perlpath.pl from do_configure() Robert Joslyn
2018-11-03 16:44 ` [rocko][PATCH 23/25] openssl-1.1: fix c_rehash perl errors Robert Joslyn
2018-11-03 16:44 ` [rocko][PATCH 24/25] openssl: update 1.0.2o -> 1.0.2p Robert Joslyn
2018-11-03 16:44 ` [rocko][PATCH 25/25] openssl: update 1.1.0h -> 1.1.0i Robert Joslyn
2018-11-03 17:05 ` ✗ patchtest: failure for Backport openssl 1.0.2p and 1.1.0i Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181103164427.16125-15-robert.joslyn@redrectangle.org \
    --to=robert.joslyn@redrectangle.org \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox