mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 01:19:52 +00:00
Code Issues Projects Releases Wiki Activity

openssl: use subdir= instead of moving files in do_configure_prepend()

Browse Source 
For clarity and correctness of source archiving, don't move find.pl from WORKDIR
to S in do_configure_prepend but tell the fetcher to put it in the right place
when unpacking.

Also re-order the files in SRC_URI so that patches are grouped together.

(From OE-Core rev: a960b6024f1b17994b0f4683a4e70fd2a079bd90)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2015-11-11 15:14:07 +00:00
committed by Richard Purdie
parent 036d2dc77f
commit 2e8efb1045
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-connectivity/openssl/openssl_1.0.2d.bb
+3 -7
View File
@@ -11,7 +11,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
export DIRS = "crypto ssl apps engines" export DIRS = "crypto ssl apps engines"
export OE_LDFLAGS="${LDFLAGS}" export OE_LDFLAGS="${LDFLAGS}"
SRC_URI += "file://configure-targets.patch \ SRC_URI += "file://find.pl;subdir=${BP}/util/ \
file://run-ptest \
file://configure-targets.patch \
file://shared-libs.patch \ file://shared-libs.patch \
file://oe-ldflags.patch \ file://oe-ldflags.patch \
file://engines-install-in-libdir-ssl.patch \ file://engines-install-in-libdir-ssl.patch \
@@ -29,11 +31,9 @@ SRC_URI += "file://configure-targets.patch \
file://openssl_fix_for_x32.patch \ file://openssl_fix_for_x32.patch \
file://fix-cipher-des-ede3-cfb1.patch \ file://fix-cipher-des-ede3-cfb1.patch \
file://openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch \ file://openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch \
file://find.pl \
file://openssl-fix-des.pod-error.patch \ file://openssl-fix-des.pod-error.patch \
file://Makefiles-ptest.patch \ file://Makefiles-ptest.patch \
file://ptest-deps.patch \ file://ptest-deps.patch \
file://run-ptest \
file://crypto_use_bigint_in_x86-64_perl.patch \ file://crypto_use_bigint_in_x86-64_perl.patch \
file://openssl-1.0.2a-x32-asm.patch \ file://openssl-1.0.2a-x32-asm.patch \
file://ptest_makefile_deps.patch \ file://ptest_makefile_deps.patch \
@@ -53,10 +53,6 @@ FILES_${PN}-engines-dbg = "${libdir}/ssl/engines/.debug"
PARALLEL_MAKE = "" PARALLEL_MAKE = ""
PARALLEL_MAKEINST = "" PARALLEL_MAKEINST = ""
do_configure_prepend() {
cp ${WORKDIR}/find.pl ${S}/util/find.pl
}
# The crypto_use_bigint patch means that perl's bignum module needs to be # The crypto_use_bigint patch means that perl's bignum module needs to be
# installed, but some distributions (for example Fedora 23) don't ship it by # installed, but some distributions (for example Fedora 23) don't ship it by
# default. As the resulting error is very misleading check for bignum before # default. As the resulting error is very misleading check for bignum before