summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-07-23 19:38:55 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-26 13:16:41 +0100
commit9386aa39c2d549702ed0527fe931aeef62ace9e4 (patch)
tree68167fe69ba883ed655b13d7dc66e073ccaff7fa
parent858af1a3a62fe2dc570338c83ec228ca0ea4ecb5 (diff)
downloadpoky-9386aa39c2d549702ed0527fe931aeef62ace9e4.tar.gz
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>
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.1.0h.bb69
1 files changed, 35 insertions, 34 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
index 5dc2966fac..a7cd6a488e 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 () {
44 linux-musl ) 44 linux-musl )
45 os=linux 45 os=linux
46 ;; 46 ;;
47 *) 47 *)
48 ;; 48 ;;
49 esac 49 esac
50 target="$os-${HOST_ARCH}" 50 target="$os-${HOST_ARCH}"
@@ -80,21 +80,21 @@ do_configure () {
80 target=linux-x86_64 80 target=linux-x86_64
81 ;; 81 ;;
82 linux-mips) 82 linux-mips)
83 # specifying TARGET_CC_ARCH prevents openssl from (incorrectly) adding target architecture flags 83 # specifying TARGET_CC_ARCH prevents openssl from (incorrectly) adding target architecture flags
84 target="linux-mips32 ${TARGET_CC_ARCH}" 84 target="linux-mips32 ${TARGET_CC_ARCH}"
85 ;; 85 ;;
86 linux-mipsel) 86 linux-mipsel)
87 target="linux-mips32 ${TARGET_CC_ARCH}" 87 target="linux-mips32 ${TARGET_CC_ARCH}"
88 ;; 88 ;;
89 linux-gnun32-mips*) 89 linux-gnun32-mips*)
90 target=linux-mips64 90 target=linux-mips64
91 ;; 91 ;;
92 linux-*-mips64 | linux-mips64) 92 linux-*-mips64 | linux-mips64)
93 target=linux64-mips64 93 target=linux64-mips64
94 ;; 94 ;;
95 linux-*-mips64el | linux-mips64el) 95 linux-*-mips64el | linux-mips64el)
96 target=linux64-mips64 96 target=linux64-mips64
97 ;; 97 ;;
98 linux-microblaze*|linux-nios2*) 98 linux-microblaze*|linux-nios2*)
99 target=linux-generic32 99 target=linux-generic32
100 ;; 100 ;;
@@ -104,12 +104,12 @@ do_configure () {
104 linux-powerpc64) 104 linux-powerpc64)
105 target=linux-ppc64 105 target=linux-ppc64
106 ;; 106 ;;
107 linux-riscv64)
108 target=linux-generic64
109 ;;
110 linux-riscv32) 107 linux-riscv32)
111 target=linux-generic32 108 target=linux-generic32
112 ;; 109 ;;
110 linux-riscv64)
111 target=linux-generic64
112 ;;
113 linux-supersparc) 113 linux-supersparc)
114 target=linux-sparcv9 114 target=linux-sparcv9
115 ;; 115 ;;
@@ -120,40 +120,41 @@ do_configure () {
120 target=darwin-i386-cc 120 target=darwin-i386-cc
121 ;; 121 ;;
122 esac 122 esac
123 useprefix=${prefix} 123
124 if [ "x$useprefix" = "x" ]; then 124 useprefix=${prefix}
125 useprefix=/ 125 if [ "x$useprefix" = "x" ]; then
126 fi 126 useprefix=/
127 fi
127 libdirleaf="$(echo ${libdir} | sed s:$useprefix::)" 128 libdirleaf="$(echo ${libdir} | sed s:$useprefix::)"
128 perl ./Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} --prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=${libdirleaf} $target 129 perl ./Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} --prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=$libdirleaf $target
129} 130}
130 131
131do_install () { 132do_install () {
132 oe_runmake DESTDIR="${D}" MANDIR="${mandir}" MANSUFFIX=ssl install 133 oe_runmake DESTDIR="${D}" MANDIR="${mandir}" MANSUFFIX=ssl install
133 oe_multilib_header openssl/opensslconf.h 134 oe_multilib_header openssl/opensslconf.h
134} 135}
135 136
136do_install_append_class-native () { 137do_install_append_class-native () {
137 # Install a custom version of c_rehash that can handle sysroots properly. 138 # Install a custom version of c_rehash that can handle sysroots properly.
138 # This version is used for example when installing ca-certificates during 139 # This version is used for example when installing ca-certificates during
139 # image creation. 140 # image creation.
140 install -Dm 0755 ${WORKDIR}/openssl-c_rehash.sh ${D}${bindir}/c_rehash 141 install -Dm 0755 ${WORKDIR}/openssl-c_rehash.sh ${D}${bindir}/c_rehash
141 sed -i -e 's,/etc/openssl,${sysconfdir}/ssl,g' ${D}${bindir}/c_rehash 142 sed -i -e 's,/etc/openssl,${sysconfdir}/ssl,g' ${D}${bindir}/c_rehash
142} 143}
143 144
144do_install_append_class-nativesdk () { 145do_install_append_class-nativesdk () {
145 mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d 146 mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d
146 install -m 644 ${WORKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh 147 install -m 644 ${WORKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh
147} 148}
148 149
149do_install_ptest() { 150do_install_ptest() {
150 cp -r * ${D}${PTEST_PATH} 151 cp -r * ${D}${PTEST_PATH}
151 152
152 # Putting .so files in ptest package will mess up the dependencies of the main openssl package 153 # Putting .so files in ptest package will mess up the dependencies of the main openssl package
153 # so we rename them to .so.ptest and patch the test accordingly 154 # so we rename them to .so.ptest and patch the test accordingly
154 mv ${D}${PTEST_PATH}/libcrypto.so ${D}${PTEST_PATH}/libcrypto.so.ptest 155 mv ${D}${PTEST_PATH}/libcrypto.so ${D}${PTEST_PATH}/libcrypto.so.ptest
155 mv ${D}${PTEST_PATH}/libssl.so ${D}${PTEST_PATH}/libssl.so.ptest 156 mv ${D}${PTEST_PATH}/libssl.so ${D}${PTEST_PATH}/libssl.so.ptest
156 sed -i 's/$target{shared_extension_simple}/".so.ptest"/' ${D}${PTEST_PATH}/test/recipes/90-test_shlibload.t 157 sed -i 's/$target{shared_extension_simple}/".so.ptest"/' ${D}${PTEST_PATH}/test/recipes/90-test_shlibload.t
157} 158}
158 159
159PACKAGES =+ "${PN}-engines" 160PACKAGES =+ "${PN}-engines"