diff --git a/1000-Build-with-qatlib-devel.patch b/1000-Build-with-qatlib-devel.patch new file mode 100644 index 0000000000000000000000000000000000000000..636662068395ec6f8915db99d6ba9e2a012224e1 --- /dev/null +++ b/1000-Build-with-qatlib-devel.patch @@ -0,0 +1,44 @@ +From 874525678b341474d1b18843bd93ea08c422f4ef Mon Sep 17 00:00:00 2001 +From: Xuchun Shang +Date: Tue, 21 Feb 2023 11:25:44 +0800 +Subject: [PATCH] Build with qatlib-devel. + +Signed-off-by: Xuchun Shang +--- + configure.ac | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c39e63d..62ddc2e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -894,12 +894,12 @@ if test "x$cflags_qat_hw" != "x" + then + if test "x$cflags_qat_hw_intree" != "x" + then +- AC_SUBST([includes_qat_hw], ["-I\${with_qat_hw_dir}/include/qat"]) ++ AC_SUBST([includes_qat_hw], ["-I\${with_qat_hw_dir}"]) + else +- AC_SUBST([with_ICP_API_DIR], ["\$(with_qat_hw_dir)/quickassist/include"]) +- AC_SUBST([with_ICP_SAL_API_DIR], ["\$(with_qat_hw_dir)/quickassist/lookaside/access_layer/include"]) +- AC_SUBST([with_ICP_LAC_API_DIR], ["\$(with_ICP_API_DIR)/lac"]) +- AC_SUBST([with_ICP_DC_DIR], ["\$(with_qat_hw_dir)/quickassist/include/dc"]) ++ AC_SUBST([with_ICP_API_DIR], ["\$(with_qat_hw_dir)"]) ++ AC_SUBST([with_ICP_SAL_API_DIR], ["\$(with_qat_hw_dir)"]) ++ AC_SUBST([with_ICP_LAC_API_DIR], ["\$(with_ICP_API_DIR)"]) ++ AC_SUBST([with_ICP_DC_DIR], ["\$(with_qat_hw_dir)"]) + AC_SUBST([includes_qat_hw], ["-I\$(with_ICP_API_DIR) -I\$(with_ICP_LAC_API_DIR) -I\$(with_ICP_SAL_API_DIR) -I\$(with_ICP_DC_DIR)"]) + + fi +@@ -943,7 +943,7 @@ then + else + if test "x$with_qat_hw_usdm_dir" = "x" + then +- with_qat_hw_usdm_dir="\$(with_qat_hw_dir)/quickassist/utilities/libusdm_drv" ++ with_qat_hw_usdm_dir="\$(with_qat_hw_dir)" + fi + AC_SUBST([QAT_HW_MEM_LIB], ["-Wl,-rpath,\$(with_qat_hw_usdm_dir) -L\$(with_qat_hw_usdm_dir) -l\$(USDM)"]) + AC_SUBST([includes_qat_hw_usdm], ["-I\$(with_qat_hw_usdm_dir)"]) +-- +2.31.1 + diff --git a/qatengine.spec b/qatengine.spec index 93cc7c754fde419d6b475ca7093c91fe02191990..c0812c5388e6c795ee367565b7a227d790bfb4a1 100644 --- a/qatengine.spec +++ b/qatengine.spec @@ -1,22 +1,27 @@ -%define anolis_release 3 +%define anolis_release 1 %global githubname QAT_Engine %global enginesdir %(pkg-config --variable=enginesdir libcrypto) Name: qatengine -Version: 0.6.16 +Version: 0.6.19 Release: %{anolis_release}%{?dist} Summary: Intel QuickAssist Technology (QAT) OpenSSL Engine License: BSD and OpenSSL URL: https://github.com/intel/%{githubname} Source0: https://github.com/intel/%{githubname}/archive/v%{version}/v%{version}.tar.gz +Patch1000: 1000-Build-with-qatlib-devel.patch + BuildRequires: gcc make pkg-config BuildRequires: autoconf automake libtool BuildRequires: openssl-devel >= 1.1.1 -#BuildRequires: qatlib-devel >= 21.08.0 -BuildRequires: intel-ipp-crypto-mb-devel +BuildRequires: qatlib-devel >= 21.08.0 +BuildRequires: intel-ipp-crypto-mb-devel >= 1.0.6 BuildRequires: intel-ipsec-mb-devel +BuildRequires: intel-QAT20 + +Requires: intel-ipp-crypto-mb >= 1.0.6 ExclusiveArch: x86_64 @@ -39,29 +44,32 @@ The %{name}-doc package contains documentation files for %{name}. %build autoreconf -ivf -%configure --enable-qat_sw --disable-qat_hw +%configure --with-qat_hw_dir=/usr/include/qat --enable-qat_sw %make_build %install %make_install -%generate_compatibility_deps - %files %license LICENSE* -%dir %{abidir} %{enginesdir}/qatengine.so -%{abidir}/qatengine.dump +%attr(755, root, root) %{enginesdir}/qatengine.la %files doc %doc README.md docs* %changelog -* Tue Oct 25 2022 happy_orange - 0.6.16-3 -- enable qat_sw and disable qat_hw +* Mon Mar 20 2023 Xuchun Shang - 0.6.19-1 +- Update to version 0.6.19 -* Tue Oct 18 20222 happy_orange - 0.6.16-2 -- delete scripts of la and change abi. +* Mon Feb 20 2023 Xuchun Shang - 0.6.16-4 +- Build with qatlib-devel + +* Fri Feb 03 2023 Xuchun Shang - 0.6.16-3 +- enable qat_hw + +* Tue Oct 25 2022 happy_orange - 0.6.16-2 +- enable qat_sw and disable qat_hw * Thu Oct 13 2022 happy_orange - 0.6.16-1 - Init package from upstream diff --git a/v0.6.16.tar.gz b/v0.6.16.tar.gz deleted file mode 100644 index 41d1fb547c99e5aad13bb00ac34aaea238bb43ed..0000000000000000000000000000000000000000 Binary files a/v0.6.16.tar.gz and /dev/null differ diff --git a/v0.6.19.tar.gz b/v0.6.19.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..7910bb7a3d35dae90b8cdd6b87ffdec7ca8adae8 Binary files /dev/null and b/v0.6.19.tar.gz differ