From c88452a5755815d3637de308b2e10730656fe26f Mon Sep 17 00:00:00 2001 From: Wenkai Lin Date: Wed, 24 Nov 2021 11:56:58 +0800 Subject: [PATCH] libwd: change uadk head install path UADK head should install in right path, otherwise uadk engine will not find it. Signed-off-by: Wenkai Lin (cherry picked from commit 42720f1e74830f17399f9cb1f6baad022b0ed3cf) --- warpdrive.spec | 41 ++++++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/warpdrive.spec b/warpdrive.spec index db43744..bce611c 100644 --- a/warpdrive.spec +++ b/warpdrive.spec @@ -1,7 +1,7 @@ Name: libwd Summary: User Space Accelerator Development Kit Version: 2.3.20 -Release: 1 +Release: 2 License: Apache-2.0 Source: %{name}-%{version}.tar.gz Vendor: Huawei Corporation @@ -38,7 +38,6 @@ install -b -m755 uadk/.libs/libwd_comp.so.%{version} ${RPM_BUILD_ROOT}/usr/lib64 install -b -m755 uadk/.libs/libhisi_sec.so.%{version} ${RPM_BUILD_ROOT}/usr/lib64 install -b -m755 uadk/.libs/libhisi_hpre.so.%{version} ${RPM_BUILD_ROOT}/usr/lib64 install -b -m755 uadk/.libs/libhisi_zip.so.%{version} ${RPM_BUILD_ROOT}/usr/lib64 -mkdir -p ${RPM_BUILD_ROOT}/usr/include/warpdrive mkdir -p ${RPM_BUILD_ROOT}/usr/include/warpdrive/include cp uadk/v1/uacce.h ${RPM_BUILD_ROOT}/usr/include/warpdrive/include cp uadk/v1/wd.h ${RPM_BUILD_ROOT}/usr/include/warpdrive @@ -48,9 +47,8 @@ cp uadk/v1/wd_dh.h ${RPM_BUILD_ROOT}/usr/include/warpdrive cp uadk/v1/wd_digest.h ${RPM_BUILD_ROOT}/usr/include/warpdrive cp uadk/v1/wd_rsa.h ${RPM_BUILD_ROOT}/usr/include/warpdrive cp uadk/v1/wd_bmm.h ${RPM_BUILD_ROOT}/usr/include/warpdrive -mkdir -p ${RPM_BUILD_ROOT}/usr/include/uadk -mkdir -p ${RPM_BUILD_ROOT}/usr/include/uadk/include -cp uadk/include/uacce.h ${RPM_BUILD_ROOT}/usr/include/uadk/include +mkdir -p ${RPM_BUILD_ROOT}/usr/include/uadk/v1 +cp uadk/include/uacce.h ${RPM_BUILD_ROOT}/usr/include/uadk cp uadk/include/wd.h ${RPM_BUILD_ROOT}/usr/include/uadk cp uadk/include/wd_cipher.h ${RPM_BUILD_ROOT}/usr/include/uadk cp uadk/include/wd_comp.h ${RPM_BUILD_ROOT}/usr/include/uadk @@ -60,6 +58,17 @@ cp uadk/include/wd_rsa.h ${RPM_BUILD_ROOT}/usr/include/uadk cp uadk/include/wd_aead.h ${RPM_BUILD_ROOT}/usr/include/uadk cp uadk/include/wd_ecc.h ${RPM_BUILD_ROOT}/usr/include/uadk cp uadk/include/wd_ecc_curve.h ${RPM_BUILD_ROOT}/usr/include/uadk +cp uadk/include/wd_alg_common.h ${RPM_BUILD_ROOT}/usr/include/uadk +cp uadk/include/wd_common.h ${RPM_BUILD_ROOT}/usr/include/uadk +cp uadk/include/wd_sched.h ${RPM_BUILD_ROOT}/usr/include/uadk +cp uadk/v1/uacce.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1 +cp uadk/v1/wd.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1 +cp uadk/v1/wd_cipher.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1 +cp uadk/v1/wd_comp.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1 +cp uadk/v1/wd_dh.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1 +cp uadk/v1/wd_digest.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1 +cp uadk/v1/wd_rsa.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1 +cp uadk/v1/wd_bmm.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1 %clean @@ -82,7 +91,7 @@ rm -rf ${RPM_BUILD_ROOT} /usr/include/warpdrive/wd_digest.h /usr/include/warpdrive/wd_rsa.h /usr/include/warpdrive/wd_bmm.h -/usr/include/uadk/include/uacce.h +/usr/include/uadk/uacce.h /usr/include/uadk/wd.h /usr/include/uadk/wd_cipher.h /usr/include/uadk/wd_comp.h @@ -92,6 +101,17 @@ rm -rf ${RPM_BUILD_ROOT} /usr/include/uadk/wd_aead.h /usr/include/uadk/wd_ecc.h /usr/include/uadk/wd_ecc_curve.h +/usr/include/uadk/wd_alg_common.h +/usr/include/uadk/wd_common.h +/usr/include/uadk/wd_sched.h +/usr/include/uadk/v1/uacce.h +/usr/include/uadk/v1/wd.h +/usr/include/uadk/v1/wd_cipher.h +/usr/include/uadk/v1/wd_comp.h +/usr/include/uadk/v1/wd_dh.h +/usr/include/uadk/v1/wd_digest.h +/usr/include/uadk/v1/wd_rsa.h +/usr/include/uadk/v1/wd_bmm.h %exclude /usr/lib64/libwd.so.2 %exclude /usr/lib64/libwd_crypto.so.2 %exclude /usr/lib64/libwd_comp.so.2 @@ -154,13 +174,16 @@ fi /sbin/ldconfig %changelog -* Mon Nov 22 2021 Yang Shen 2.3.20-1 +* Mon Nov 24 2021 linwenkai 2.3.20-2 +- libwd: add missing head files and fix install path + +* Mon Nov 22 2021 Yang Shen 2.3.20-1 - libwd: update uadk from 2.3.11 to 2.3.20 -* Fri Sep 03 2021 Yang Shen 2.3.11-4 +* Fri Sep 03 2021 Yang Shen 2.3.11-4 - uadk-access-the-file-isolate-before-read-it.patch -* Fri Aug 06 2021 Pengju Jiang 2.3.11-3 +* Fri Aug 06 2021 Pengju Jiang 2.3.11-3 - bugfix-of-gcc-10.patch * Wed Jul 21 2021 caodongxia 2.3.11-2