mirror of
git://git.yoctoproject.org/meta-intel.git
synced 2025-07-19 21:09:03 +02:00
meta-isg: openssl-qat: Add support for v0.4.9-009
This recipe adds the openssl-qat engine that accelerates some of the libcrypto algorithms via the Intel QAT implemented on Intel communication chipsets. QAT sample patch v0.4.9-009 is based on async branch of openssl-1.0.1m. openssl & zlib shim layers both install the qat_mem.ko driver. Make openssl shim dependent on zlib-qat and ensure that only zlib-qat installs this kernel module. This fix change in future when qat_mem module has been forked into a separate package. The recipe is for platforms like grantley and crystalforest using the common BSP intel-corei7-64. Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
This commit is contained in:
parent
3954408303
commit
5640cd6bc1
110
meta-isg/common/recipes-extended/openssl-qat/openssl-qat.inc
Normal file
110
meta-isg/common/recipes-extended/openssl-qat/openssl-qat.inc
Normal file
|
@ -0,0 +1,110 @@
|
|||
SUMMARY = "libcrypto* (OpenSSL*) QAT_MEM Memory Management Module \
|
||||
for Intel Quick Assist Technology"
|
||||
DESCRIPTION = "This software adds an engine that accelerates some of \
|
||||
the libcrypto algorithms via the Intel QuickAssist Technology \
|
||||
implemented on Intel Communications Chipset 89xx Series based platforms."
|
||||
|
||||
HOMEPAGE = "http://www.openssl.org/"
|
||||
SECTION = "libs/network"
|
||||
LICENSE = "openssl & GPLv2 & BSD"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8 \
|
||||
file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \
|
||||
file://${COMMON_LICENSE_DIR}/BSD;md5=3775480a712fc46a69647678acb234cb \
|
||||
"
|
||||
|
||||
SRC_URI = "https://01.org/sites/default/files/page/libcrypto_shim_${PV}_withdocumentation.zip;name=openssl_qat;subdir=openssl_qat-${PV} \
|
||||
file://openssl_qat-environment-variables-to-have-precedence.patch \
|
||||
file://openssl_qat-pass-oe_ldflags-to-linker.patch \
|
||||
file://openssl_qat-remove-redundant-rpaths.patch \
|
||||
file://openssl_qat-build-qat_mem-ko-against-yocto-kernel.patch \
|
||||
file://openssl_qat-install-engines-in-libdir-ssl.patch \
|
||||
"
|
||||
|
||||
DEPENDS += " qat16 zlib"
|
||||
RDEPENDS_${PN} += " qat16 zlib zlib-qat"
|
||||
|
||||
inherit pkgconfig module
|
||||
|
||||
PACKAGES =+ "${PN}-misc"
|
||||
PARALLEL_MAKE = ""
|
||||
|
||||
AR_append = " r"
|
||||
EXTRA_OECONF = " -no-ssl3"
|
||||
|
||||
export ICP_ROOT = "${WORKDIR}/git"
|
||||
export ICP_BUILD_OUTPUT = "${STAGING_DIR_TARGET}"
|
||||
export OPENSSL_ROOT = "${ICP_ROOT}"
|
||||
export OPENSSL_PREFIX = "/usr/local"
|
||||
export AS = "${CC} -c"
|
||||
export OE_LDFLAGS="${LDFLAGS} -L${OPENSSL_PREFIX}{base_libdir}"
|
||||
export ICP_API_PATH = "${STAGING_DIR_TARGET}${includedir}/lac"
|
||||
export KERNEL_SOURCE_ROOT = "${STAGING_KERNEL_DIR}"
|
||||
export KERNEL_BUILDDIR = "${STAGING_KERNEL_BUILDDIR}"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
do_unpack2() {
|
||||
cd ${WORKDIR}/openssl_qat-${PV}
|
||||
cd libcrypto_shim_${PV}_*
|
||||
tar -zxof libCrypto_Shim_${PV}.tar.gz
|
||||
tar -zxof libcrypto-openssl-${OPENSSL_VERSION}-qat.L.${PV}.tar.gz
|
||||
mv openssl-${OPENSSL_VERSION}-qat.patch ${WORKDIR}
|
||||
}
|
||||
|
||||
addtask unpack2 after do_unpack before do_patch_prepend
|
||||
|
||||
do_prepatch() {
|
||||
cd ${S}
|
||||
patch -p1 < ${WORKDIR}/openssl-${OPENSSL_VERSION}-qat.patch
|
||||
}
|
||||
|
||||
addtask prepatch after do_unpack2 before do_patch
|
||||
|
||||
do_configure () {
|
||||
os=linux
|
||||
target=linux-x86_64
|
||||
|
||||
./Configure ${EXTRA_OECONF} enable-hw-qat --prefix=$OPENSSL_PREFIX --openssldir="${OPENSSL_PREFIX}${base_libdir}/ssl" --libdir="${base_libdir}" $target
|
||||
}
|
||||
|
||||
do_compile() {
|
||||
oe_runmake
|
||||
}
|
||||
|
||||
do_install() {
|
||||
install -m 0755 -d ${D}${bindir} \
|
||||
${D}${OPENSSL_PREFIX}/include \
|
||||
${D}${sysconfdir}/openssl_conf
|
||||
|
||||
oe_runmake INSTALL_PREFIX="${D}" install
|
||||
|
||||
cp --dereference -R include/openssl ${D}${OPENSSL_PREFIX}/include
|
||||
|
||||
cp ${WORKDIR}/openssl_qat-${PV}/libcrypto_shim_${PV}_withdocumentation/qat/config/dh895xcc/multi_process_optimized/* ${D}${sysconfdir}/openssl_conf/
|
||||
}
|
||||
|
||||
FILES_${PN}-misc += "\
|
||||
${OPENSSL_PREFIX}${base_libdir}/ssl/misc \
|
||||
${bindir}/c_rehash \
|
||||
"
|
||||
|
||||
FILES_${PN}-dbg += "\
|
||||
${OPENSSL_PREFIX}${base_libdir}/ssl/engines/.debug \
|
||||
${OPENSSL_PREFIX}${base_libdir}/engines/.debug \
|
||||
${OPENSSL_PREFIX}${base_libdir}/.debug \
|
||||
${OPENSSL_PREFIX}/bin/.debug \
|
||||
"
|
||||
|
||||
FILES_${PN}-dev = "${OPENSSL_PREFIX}/include"
|
||||
|
||||
FILES_${PN}-staticdev += "${OPENSSL_PREFIX}${base_libdir}/*.a"
|
||||
|
||||
FILES_${PN} =+ "\
|
||||
${bindir} \
|
||||
${sysconfdir}/openssl_conf \
|
||||
${OPENSSL_PREFIX}/bin \
|
||||
${OPENSSL_PREFIX}${base_libdir} \
|
||||
${OPENSSL_PREFIX}${base_libdir}/ssl \
|
||||
${OPENSSL_PREFIX}${base_libdir}/ssl/openssl.cnf \
|
||||
"
|
|
@ -0,0 +1,113 @@
|
|||
From a5068bd456c60b5611494dff2db2093ad6693e6a Mon Sep 17 00:00:00 2001
|
||||
From: Anuj Mittal <anujx.mittal@intel.com>
|
||||
Date: Thu, 9 Jul 2015 23:58:34 +0800
|
||||
Subject: [PATCH] openssl_qat: add openssl async specific symbols
|
||||
|
||||
Upstream-Status: Inappropriate [Configuration]
|
||||
|
||||
Signed-off-by: Anuj Mittal <anujx.mittal@intel.com>
|
||||
---
|
||||
engines/ccgost/openssl.ld | 8 ++++++++
|
||||
engines/openssl.ld | 9 +++++++++
|
||||
engines/qat_engine/openssl.ld | 19 +++++++++++++++++++
|
||||
openssl.ld | 28 ++++++++++++++++++++++++++++
|
||||
4 files changed, 64 insertions(+)
|
||||
create mode 100644 engines/qat_engine/openssl.ld
|
||||
|
||||
diff --git a/engines/ccgost/openssl.ld b/engines/ccgost/openssl.ld
|
||||
index 010fd6f..edf9d87 100644
|
||||
--- a/engines/ccgost/openssl.ld
|
||||
+++ b/engines/ccgost/openssl.ld
|
||||
@@ -8,3 +8,11 @@ OPENSSL_1.0.0 {
|
||||
*;
|
||||
};
|
||||
|
||||
+OPENSSL_1.0.1async {
|
||||
+ global:
|
||||
+ qaeCryptoMemV2P;
|
||||
+ qaeCryptoAtFork;
|
||||
+ qaeCryptoMemAlloc;
|
||||
+ qaeCryptoMemRealloc;
|
||||
+ qaeCryptoMemFree;
|
||||
+} OPENSSL_1.0.0;
|
||||
diff --git a/engines/openssl.ld b/engines/openssl.ld
|
||||
index 010fd6f..3d56887 100644
|
||||
--- a/engines/openssl.ld
|
||||
+++ b/engines/openssl.ld
|
||||
@@ -8,3 +8,12 @@ OPENSSL_1.0.0 {
|
||||
*;
|
||||
};
|
||||
|
||||
+OPENSSL_1.0.1async {
|
||||
+ global:
|
||||
+ qaeCryptoMemV2P;
|
||||
+ qaeCryptoAtFork;
|
||||
+ qaeCryptoMemAlloc;
|
||||
+ qaeCryptoMemRealloc;
|
||||
+ qaeCryptoMemFree;
|
||||
+} OPENSSL_1.0.0;
|
||||
+
|
||||
diff --git a/engines/qat_engine/openssl.ld b/engines/qat_engine/openssl.ld
|
||||
new file mode 100644
|
||||
index 0000000..bdd927d
|
||||
--- /dev/null
|
||||
+++ b/engines/qat_engine/openssl.ld
|
||||
@@ -0,0 +1,19 @@
|
||||
+OPENSSL_1.0.0 {
|
||||
+ global:
|
||||
+ bind_engine;
|
||||
+ v_check;
|
||||
+ OPENSSL_init;
|
||||
+ OPENSSL_finish;
|
||||
+ local:
|
||||
+ *;
|
||||
+};
|
||||
+
|
||||
+OPENSSL_1.0.1async {
|
||||
+ global:
|
||||
+ qaeCryptoMemV2P;
|
||||
+ qaeCryptoAtFork;
|
||||
+ qaeCryptoMemAlloc;
|
||||
+ qaeCryptoMemRealloc;
|
||||
+ qaeCryptoMemFree;
|
||||
+} OPENSSL_1.0.0;
|
||||
+
|
||||
diff --git a/openssl.ld b/openssl.ld
|
||||
index 0c0ed28..afa9349 100644
|
||||
--- a/openssl.ld
|
||||
+++ b/openssl.ld
|
||||
@@ -4618,3 +4618,31 @@ OPENSSL_1.0.1d {
|
||||
CRYPTO_memcmp;
|
||||
} OPENSSL_1.0.1;
|
||||
|
||||
+OPENSSL_1.0.1async {
|
||||
+ global:
|
||||
+ ECDH_compute_key_asynch;
|
||||
+ ECDH_generate_key_asynch;
|
||||
+ ECDH_generate_key;
|
||||
+ DH_compute_key_asynch;
|
||||
+ DH_generate_key_asynch;
|
||||
+ ECDSA_verify_asynch;
|
||||
+ ECDSA_sign_asynch;
|
||||
+ DSA_verify_asynch;
|
||||
+ DSA_sign_asynch;
|
||||
+ RSA_public_decrypt_asynch;
|
||||
+ RSA_private_encrypt_asynch;
|
||||
+ EVP_MD_CTX_ctrl_ex;
|
||||
+ EVP_CIPHER_CTX_ctrl_ex;
|
||||
+ qaeCryptoMemV2P;
|
||||
+ qaeCryptoAtFork;
|
||||
+ SSL_CTX_set_asynch_completion_callback;
|
||||
+ RSA_private_decrypt_asynch;
|
||||
+ RSA_public_encrypt_asynch;
|
||||
+ qaeCryptoMemAlloc;
|
||||
+ qaeCryptoMemRealloc;
|
||||
+ qaeCryptoMemFree;
|
||||
+ RSA_sign_asynch;
|
||||
+ RSA_verify_asynch;
|
||||
+ EVP_PKEY_derive_PRF;
|
||||
+} OPENSSL_1.0.1;
|
||||
+
|
||||
--
|
||||
1.7.9.5
|
||||
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,62 @@
|
|||
From 3927de1c19b48a031b27b2635928cd6f9650d02e Mon Sep 17 00:00:00 2001
|
||||
From: Anuj Mittal <anujx.mittal@intel.com>
|
||||
Date: Wed, 8 Jul 2015 17:49:09 +0800
|
||||
Subject: [PATCH] openssl-qat: build qat_mem ko against yocto kernel
|
||||
|
||||
Upstream-Status: Inappropriate [Configuration]
|
||||
|
||||
Signed-off-by: Anuj Mittal <anujx.mittal@intel.com>
|
||||
---
|
||||
engines/qat_engine/qat_mem/Makefile | 23 +++++++----------------
|
||||
1 file changed, 7 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/engines/qat_engine/qat_mem/Makefile b/engines/qat_engine/qat_mem/Makefile
|
||||
index 3d9a19f..4369503 100644
|
||||
--- a/engines/qat_engine/qat_mem/Makefile
|
||||
+++ b/engines/qat_engine/qat_mem/Makefile
|
||||
@@ -9,23 +9,10 @@
|
||||
MODULENAME := qat_mem
|
||||
### should not need to change stuff below ######################
|
||||
|
||||
-
|
||||
-KDIR := /lib/modules/$(shell uname -r)/build
|
||||
-#KDIR := /exports/linux-2.6.12.2/
|
||||
+KDIR := $(KERNEL_SOURCE_ROOT)
|
||||
PWD := $(shell pwd)
|
||||
|
||||
-ifeq ($(shell uname -r|grep -c grsec-WR), 1)
|
||||
-AUTO_CONF=/lib/modules/$(shell uname -r)/build/include/generated/autoconf.h
|
||||
-else
|
||||
-AUTO_CONF=/usr/src/kernels/$(shell uname -r)/include/linux/autoconf.h
|
||||
-endif
|
||||
-
|
||||
-ifdef KERNEL_SOURCE_ROOT
|
||||
-AUTO_CONF=$(KERNEL_SOURCE_ROOT)/include/linux/autoconf.h
|
||||
-KDIR=$(KERNEL_SOURCE_ROOT)
|
||||
-endif
|
||||
-
|
||||
-CC := gcc -Wall -imacros $(AUTO_CONF)
|
||||
+CC := ${CC} -Wall -imacros $(KERNEL_BUILDDIR)/include/generated/autoconf.h
|
||||
|
||||
ifeq ($(KERNELRELEASE),)
|
||||
all: $(MODULENAME)_test
|
||||
@@ -38,6 +25,11 @@ endif
|
||||
$(MODULENAME)_test: $(MODULENAME)_test.c
|
||||
$(CC) -g -o $(MODULENAME)_test $(MODULENAME)_test.c
|
||||
|
||||
+install: modules_install
|
||||
+ cp $(MODULENAME)_test $(DESTDIR)
|
||||
+
|
||||
+modules_install:
|
||||
+ $(MAKE) -C $(KDIR) M=$(PWD) modules_install
|
||||
|
||||
load:
|
||||
insmod ./$(MODULENAME).ko
|
||||
@@ -50,4 +42,3 @@ test: all
|
||||
|
||||
clean:
|
||||
rm -f *.o *.ko Modules.symvers *.mod.c .*.cmd $(MODULENAME)_test
|
||||
-
|
||||
--
|
||||
1.7.9.5
|
||||
|
|
@ -0,0 +1,59 @@
|
|||
From dde5f7d6603d875b1d871498ae95a6837ccd591d Mon Sep 17 00:00:00 2001
|
||||
From: Anuj Mittal <anujx.mittal@intel.com>
|
||||
Date: Sat, 20 Jun 2015 00:25:27 +0800
|
||||
Subject: [PATCH] openssl_qat: environment variables to have precedence
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
(From meta/recipes-connectivity/openssl/openssl/shared-libs.patch
|
||||
rev: 5dd1d7566964c90d33c0c44f569d9336fb0724ce)
|
||||
|
||||
Signed-off-by: Anuj Mittal <anujx.mittal@intel.com>
|
||||
---
|
||||
Makefile.org | 2 +-
|
||||
crypto/Makefile | 2 +-
|
||||
ssl/Makefile | 2 +-
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/Makefile.org b/Makefile.org
|
||||
index 1f2f5e1..679c884 100644
|
||||
--- a/Makefile.org
|
||||
+++ b/Makefile.org
|
||||
@@ -311,7 +311,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a fips_premain_dso$(EXE_EXT)
|
||||
|
||||
libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a
|
||||
@if [ "$(SHLIB_TARGET)" != "" ]; then \
|
||||
- $(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \
|
||||
+ $(MAKE) -e SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \
|
||||
else \
|
||||
echo "There's no support for shared libraries on this platform" >&2; \
|
||||
exit 1; \
|
||||
diff --git a/crypto/Makefile b/crypto/Makefile
|
||||
index 2355661..1b0c324 100644
|
||||
--- a/crypto/Makefile
|
||||
+++ b/crypto/Makefile
|
||||
@@ -107,7 +107,7 @@ $(LIB): $(LIBOBJ)
|
||||
|
||||
shared: buildinf.h lib subdirs
|
||||
if [ -n "$(SHARED_LIBS)" ]; then \
|
||||
- (cd ..; $(MAKE) $(SHARED_LIB)); \
|
||||
+ (cd ..; $(MAKE) -e $(SHARED_LIB)); \
|
||||
fi
|
||||
|
||||
libs:
|
||||
diff --git a/ssl/Makefile b/ssl/Makefile
|
||||
index e05ada2..6f51862 100644
|
||||
--- a/ssl/Makefile
|
||||
+++ b/ssl/Makefile
|
||||
@@ -64,7 +64,7 @@ lib: $(LIBOBJ)
|
||||
|
||||
shared: lib
|
||||
if [ -n "$(SHARED_LIBS)" ]; then \
|
||||
- (cd ..; $(MAKE) $(SHARED_LIB)); \
|
||||
+ (cd ..; $(MAKE) -e $(SHARED_LIB)); \
|
||||
fi
|
||||
|
||||
files:
|
||||
--
|
||||
1.7.9.5
|
||||
|
|
@ -0,0 +1,72 @@
|
|||
From 9ca66b344a9e9cb3345281496793a74ef01c548f Mon Sep 17 00:00:00 2001
|
||||
From: Anuj Mittal <anujx.mittal@intel.com>
|
||||
Date: Sat, 20 Jun 2015 00:28:55 +0800
|
||||
Subject: [PATCH] openssl_qat: install engines in ${libdir}/ssl
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
(Taken from meta/recipes-connectivity/openssl/openssl
|
||||
rev: 5dd1d7566964c90d33c0c44f569d9336fb0724ce)
|
||||
|
||||
Signed-off-by: Anuj Mittal <anujx.mittal@intel.com>
|
||||
---
|
||||
engines/Makefile | 10 +++++-----
|
||||
engines/ccgost/Makefile | 8 ++++----
|
||||
2 files changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/engines/Makefile b/engines/Makefile
|
||||
index 5240c07..721f1e0 100644
|
||||
--- a/engines/Makefile
|
||||
+++ b/engines/Makefile
|
||||
@@ -108,7 +108,7 @@ install:
|
||||
@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
|
||||
@if [ -n "$(SHARED_LIBS)" ]; then \
|
||||
set -e; \
|
||||
- $(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines; \
|
||||
+ $(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines; \
|
||||
for l in $(LIBNAMES); do \
|
||||
( echo installing $$l; \
|
||||
pfx=lib; \
|
||||
@@ -120,13 +120,13 @@ install:
|
||||
*DSO_WIN32*) sfx="eay32.dll"; pfx=;; \
|
||||
*) sfx=".bad";; \
|
||||
esac; \
|
||||
- cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
|
||||
+ cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx.new; \
|
||||
else \
|
||||
sfx=".so"; \
|
||||
- cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
|
||||
+ cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx.new; \
|
||||
fi; \
|
||||
- chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
|
||||
- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
|
||||
+ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx.new; \
|
||||
+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx ); \
|
||||
done; \
|
||||
fi
|
||||
@target=install; $(RECURSIVE_MAKE)
|
||||
diff --git a/engines/ccgost/Makefile b/engines/ccgost/Makefile
|
||||
index d661c10..e137b37 100644
|
||||
--- a/engines/ccgost/Makefile
|
||||
+++ b/engines/ccgost/Makefile
|
||||
@@ -53,13 +53,13 @@ install:
|
||||
*DSO_WIN32*) sfx="eay32.dll"; pfx=;; \
|
||||
*) sfx=".bad";; \
|
||||
esac; \
|
||||
- cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
|
||||
+ cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$${pfx}$(LIBNAME)$$sfx.new; \
|
||||
else \
|
||||
sfx=".so"; \
|
||||
- cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
|
||||
+ cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$${pfx}$(LIBNAME)$$sfx.new; \
|
||||
fi; \
|
||||
- chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
|
||||
- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx; \
|
||||
+ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$${pfx}$(LIBNAME)$$sfx.new; \
|
||||
+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$${pfx}$(LIBNAME)$$sfx; \
|
||||
fi
|
||||
|
||||
links:
|
||||
--
|
||||
1.7.9.5
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
From accc6c251cafdb3332db946d543952e2cf0698cd Mon Sep 17 00:00:00 2001
|
||||
From: Anuj Mittal <anujx.mittal@intel.com>
|
||||
Date: Sat, 20 Jun 2015 00:31:31 +0800
|
||||
Subject: [PATCH] openssl_qat: pass oe_ldflags to linker
|
||||
|
||||
Upstream-Status: Inappropriate [open-embedded]
|
||||
|
||||
(Taken from meta/recipes-connectivity/openssl/openssl/oe-ldflags.patch
|
||||
rev: 5dd1d7566964c90d33c0c44f569d9336fb0724ce)
|
||||
|
||||
Signed-off-by: Anuj Mittal <anujx.mittal@intel.com>
|
||||
---
|
||||
Makefile.shared | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile.shared b/Makefile.shared
|
||||
index e753f44..fcdcb9e 100644
|
||||
--- a/Makefile.shared
|
||||
+++ b/Makefile.shared
|
||||
@@ -92,7 +92,7 @@ CALC_VERSIONS= \
|
||||
LINK_APP= \
|
||||
( $(SET_X); \
|
||||
LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \
|
||||
- LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \
|
||||
+ LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$(OE_LDFLAGS) $${LDFLAGS:-$(CFLAGS)}"; \
|
||||
LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
|
||||
LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
|
||||
LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
|
||||
@@ -102,7 +102,7 @@ LINK_SO= \
|
||||
( $(SET_X); \
|
||||
LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \
|
||||
SHAREDCMD="$${SHAREDCMD:-$(CC)}"; \
|
||||
- SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
|
||||
+ SHAREDFLAGS="$(OE_LDFLAGS) $${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
|
||||
LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
|
||||
LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
|
||||
LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
|
||||
--
|
||||
1.7.9.5
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
From ed93d22846a1859ba3ab4584a1358b9325bf2e93 Mon Sep 17 00:00:00 2001
|
||||
From: Anuj Mittal <anujx.mittal@intel.com>
|
||||
Date: Tue, 23 Jun 2015 13:59:52 +0800
|
||||
Subject: [PATCH] openssl_qat: remove redundant rpaths
|
||||
|
||||
Upstream-Status: Inappropriate [Configuration]
|
||||
|
||||
This is not required and introduces bad rpath errors when
|
||||
building with bitbake.
|
||||
|
||||
Signed-off-by: Anuj Mittal <anujx.mittal@intel.com>
|
||||
---
|
||||
engines/qat_engine/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/engines/qat_engine/Makefile b/engines/qat_engine/Makefile
|
||||
index 02cfd15..e96e66a 100644
|
||||
--- a/engines/qat_engine/Makefile
|
||||
+++ b/engines/qat_engine/Makefile
|
||||
@@ -99,7 +99,7 @@ endif
|
||||
SRC=$(QATLIBSRC)
|
||||
QATLIBTARGET=$(TOP)/libcrypto.a
|
||||
ifdef ICP_BUILD_OUTPUT
|
||||
-QATSHAREDLIBDEPS=-Wl,-rpath,$(ICP_BUILD_OUTPUT) -L$(ICP_BUILD_OUTPUT) -l$(DRIVER)_s
|
||||
+QATSHAREDLIBDEPS=-L$(ICP_BUILD_OUTPUT) -l$(DRIVER)_s
|
||||
else
|
||||
QATSHAREDLIBDEPS=-l$(DRIVER)_s
|
||||
endif
|
||||
--
|
||||
1.7.9.5
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
include openssl-qat.inc
|
||||
|
||||
OPENSSL_VERSION = "1.0.1async"
|
||||
|
||||
SRC_URI += "git://opensslfoundation.com/openssl-async.git;branch=OpenSSL_1_0_1-async;rev=asynch_v0.4.9-009 \
|
||||
file://openssl-qat_0.4.9-009-openssl_qat-add-version-script.patch \
|
||||
file://openssl-qat_0.4.9-009-openssl_qat-add-openssl-async-specific-symbols.patch \
|
||||
"
|
||||
|
||||
SRC_URI[openssl_qat.md5sum]="8e2b45cf9b345356bdff0956845c6103"
|
||||
SRC_URI[openssl_qat.sha256sum]="c2334b4d1fc8498e06f0554ef155041a6bf441de134cfdd3635e5a449a34bf81"
|
||||
|
Loading…
Reference in New Issue
Block a user