diff --git a/1000-Build-with-qatlib-devel.patch b/1000-Build-with-qatlib-devel.patch deleted file mode 100644 index 636662068395ec6f8915db99d6ba9e2a012224e1..0000000000000000000000000000000000000000 --- a/1000-Build-with-qatlib-devel.patch +++ /dev/null @@ -1,44 +0,0 @@ -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/README.md b/README.md new file mode 100644 index 0000000000000000000000000000000000000000..7342728d557c602f51c6d278bba9f3dd9faaf356 --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ +Anolis OS +======================================= +# 代码仓库说明 +## 分支说明 +>进行代码开发工作时，请注意选择当前版本对应的分支 +* aX分支为对应大版本的主分支,如a8分支对应当前最新版本 +* aX.Y分支为对应小版本的维护分支，如a8.2分支对应8.2版本 +## 开发流程 +1. 首先fork目标分支到自己的namespace +2. 在自己的fork分支上做出修改 +3. 向对应的仓库中提交merge request，源分支为fork分支 diff --git a/qatengine.spec b/qatengine.spec index c0812c5388e6c795ee367565b7a227d790bfb4a1..f2b620a7b2d596c35a2eed6b82061fde1bc4a1ae 100644 --- a/qatengine.spec +++ b/qatengine.spec @@ -1,35 +1,30 @@ %define anolis_release 1 - -%global githubname QAT_Engine %global enginesdir %(pkg-config --variable=enginesdir libcrypto) +%global githubname QAT_Engine Name: qatengine -Version: 0.6.19 +Version: 1.2.0 Release: %{anolis_release}%{?dist} -Summary: Intel QuickAssist Technology (QAT) OpenSSL Engine +Summary: Intel® QuickAssist Technology OpenSSL* Engine(QAT_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 >= 1.0.6 -BuildRequires: intel-ipsec-mb-devel -BuildRequires: intel-QAT20 - -Requires: intel-ipp-crypto-mb >= 1.0.6 +BuildRequires: gcc make pkg-config autoconf automake libtool openssl-devel +BuildRequires: intel-ipp-crypto-mb-devel intel-ipsec-mb-devel intel-QAT20-devel udma-devel ExclusiveArch: x86_64 %description -This package provides the Intel QuickAssist Technology OpenSSL Engine -(an OpenSSL Plug-In Engine) which provides cryptographic acceleration -for both hardware and optimized software using Intel QuickAssist Technology -enabled Intel platforms. +The %{name} provides the Intel QuickAssist Technology OpenSSL Engine (an +OpenSSL Plug-In Engine). Intel® QuickAssist Technology OpenSSL* Engine +(QAT_Engine) supports acceleration for both hardware as well as optimized +software based on vectorized instructions. This change starting with the +3rd Generation Intel® Xeon® Scalable Processors family provides users more +options to accelerate their workloads. The QAT OpenSSL* engine now supports +the ability to accelerate from the stand OpenSSL* to basic Intel instruction +set, to either Hardware acceleration path (via the qat_hw path) or via the +optimized SW path (qat_sw lib). %package doc Summary: Documentation files for %{name} @@ -43,33 +38,33 @@ The %{name}-doc package contains documentation files for %{name}. %autosetup -n %{githubname}-%{version} -p1 %build -autoreconf -ivf %configure --with-qat_hw_dir=/usr/include/qat --enable-qat_sw %make_build %install %make_install +rm -rf %{buildroot}/%{_libdir}/engines-1.1/qatengine.la %files %license LICENSE* -%{enginesdir}/qatengine.so -%attr(755, root, root) %{enginesdir}/qatengine.la +%{enginesdir}/%{name}.so %files doc %doc README.md docs* %changelog -* Mon Mar 20 2023 Xuchun Shang - 0.6.19-1 -- Update to version 0.6.19 - -* Mon Feb 20 2023 Xuchun Shang - 0.6.16-4 -- Build with qatlib-devel +* Wed Aug 16 2023 Guanjun - 1.2.0-1 +- Add build requires intel-QAT20-devel +- enable qat_hw and qat_sw -* Fri Feb 03 2023 Xuchun Shang - 0.6.16-3 -- enable qat_hw +* Sat Apr 15 2023 Jing Zhang - 0.6.16-4 +- Refact spec -* Tue Oct 25 2022 happy_orange - 0.6.16-2 +* Tue Oct 25 2022 happy_orange - 0.6.16-3 - enable qat_sw and disable qat_hw +* Tue Oct 18 2022 happy_orange - 0.6.16-2 +- delete scripts of la and change abi. + * Thu Oct 13 2022 happy_orange - 0.6.16-1 - Init package from upstream diff --git a/v0.6.19.tar.gz b/v0.6.19.tar.gz deleted file mode 100644 index 7910bb7a3d35dae90b8cdd6b87ffdec7ca8adae8..0000000000000000000000000000000000000000 Binary files a/v0.6.19.tar.gz and /dev/null differ diff --git a/v1.2.0.tar.gz b/v1.2.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..e592460765026190a3b9c247320a325d858be4ba Binary files /dev/null and b/v1.2.0.tar.gz differ