diff --git a/kae-2.0.0.tar.gz b/kae-2.0.0.tar.gz index 9f038cb4a3a72b7c718240a0a9d482b79bdf3c6c..73359d954beb55586d0557cd28c9cc19ca4e766c 100644 Binary files a/kae-2.0.0.tar.gz and b/kae-2.0.0.tar.gz differ diff --git a/kae-v2.spec b/kae-v2.spec index 72866cc93f5f8181d24f3995b69f482b5727c074..f387bd294f210aa2223dd81315742465d2c7edb5 100644 --- a/kae-v2.spec +++ b/kae-v2.spec @@ -1,14 +1,14 @@ Name: kae Summary: Huawei Kunpeng Accelerator Engine Zip Version: 2.0.0 -Release: 3 +Release: 5 License: GPL-2.0 Source: %{name}-%{version}.tar.gz ExclusiveOS: linux BuildRoot: %{_tmppath}/%{name}-%{version}-root Conflicts: %{name} < %{version}-%{release} Provides: %{name} = %{version}-%{release} -BuildRequires: gcc, make, kernel-devel, libtool, numactl-devel, openssl-devel +BuildRequires: gcc, make, kernel-devel, libtool, numactl-devel, compat-openssl11-devel, chrpath ExclusiveArch: aarch64 Autoreq: no Autoprov: no @@ -29,30 +29,94 @@ This package contains the Huawei Hisilicon Zip Accelerator Engine. %setup -c -n %{name}-%{version} %build +cd %{name}-%{version} +sh build.sh buildallv2 -#%install +%install mkdir -p ${RPM_BUILD_ROOT}/lib/modules/%{kernel_version}/extra mkdir -p ${RPM_BUILD_ROOT}/etc/modprobe.d +install -b -m644 %{kae_driver_path}/uacce/uacce.ko ${RPM_BUILD_ROOT}/lib/modules/%{kernel_version}/extra +install -b -m644 %{kae_driver_path}/hisilicon/hisi_qm.ko ${RPM_BUILD_ROOT}/lib/modules/%{kernel_version}/extra +install -b -m644 %{kae_driver_path}/hisilicon/sec2/hisi_sec2.ko ${RPM_BUILD_ROOT}/lib/modules/%{kernel_version}/extra +install -b -m644 %{kae_driver_path}/hisilicon/hpre/hisi_hpre.ko ${RPM_BUILD_ROOT}/lib/modules/%{kernel_version}/extra +install -b -m644 %{kae_driver_path}/hisilicon/zip/hisi_zip.ko ${RPM_BUILD_ROOT}/lib/modules/%{kernel_version}/extra -mkdir -p ${RPM_BUILD_ROOT}/usr/lib64 +install -b -m644 %{kae_driver_path}/conf/hisi_sec2.conf ${RPM_BUILD_ROOT}/etc/modprobe.d/ +install -b -m644 %{kae_driver_path}/conf/hisi_hpre.conf ${RPM_BUILD_ROOT}/etc/modprobe.d/ +install -b -m644 %{kae_driver_path}/conf/hisi_zip.conf ${RPM_BUILD_ROOT}/etc/modprobe.d/ +mkdir -p ${RPM_BUILD_ROOT}/usr/lib64 +chrpath -d %{kae_uadk_path}/.libs/*so* +install -b -m755 %{kae_uadk_path}/.libs/libwd_comp.so.2.5.0 ${RPM_BUILD_ROOT}/usr/lib64 +install -b -m755 %{kae_uadk_path}/.libs/libwd_crypto.so.2.5.0 ${RPM_BUILD_ROOT}/usr/lib64 +install -b -m755 %{kae_uadk_path}/.libs/libwd.so.2.5.0 ${RPM_BUILD_ROOT}/usr/lib64 +install -b -m755 %{kae_uadk_path}/.libs/libhisi_hpre.so.2.5.0 ${RPM_BUILD_ROOT}/usr/lib64 +install -b -m755 %{kae_uadk_path}/.libs/libhisi_sec.so.2.5.0 ${RPM_BUILD_ROOT}/usr/lib64 +install -b -m755 %{kae_uadk_path}/.libs/libhisi_zip.so.2.5.0 ${RPM_BUILD_ROOT}/usr/lib64 mkdir -p ${RPM_BUILD_ROOT}/usr/include/uadk mkdir -p ${RPM_BUILD_ROOT}/usr/include/uadk/drv +install -b -m644 %{kae_uadk_path}/include/hisi_qm_udrv.h ${RPM_BUILD_ROOT}/usr/include/uadk +install -b -m644 %{kae_uadk_path}/include/wd.h ${RPM_BUILD_ROOT}/usr/include/uadk +install -b -m644 %{kae_uadk_path}/include/wd_aead.h ${RPM_BUILD_ROOT}/usr/include/uadk +install -b -m644 %{kae_uadk_path}/include/wd_alg_common.h ${RPM_BUILD_ROOT}/usr/include/uadk +install -b -m644 %{kae_uadk_path}/include/wd_cipher.h ${RPM_BUILD_ROOT}/usr/include/uadk +install -b -m644 %{kae_uadk_path}/include/wd_comp.h ${RPM_BUILD_ROOT}/usr/include/uadk +install -b -m644 %{kae_uadk_path}/include/wd_dh.h ${RPM_BUILD_ROOT}/usr/include/uadk +install -b -m644 %{kae_uadk_path}/include/wd_digest.h ${RPM_BUILD_ROOT}/usr/include/uadk +install -b -m644 %{kae_uadk_path}/include/wd_ecc.h ${RPM_BUILD_ROOT}/usr/include/uadk +install -b -m644 %{kae_uadk_path}/include/wd_ecc_curve.h ${RPM_BUILD_ROOT}/usr/include/uadk +install -b -m644 %{kae_uadk_path}/include/wd_rsa.h ${RPM_BUILD_ROOT}/usr/include/uadk +install -b -m644 %{kae_uadk_path}/include/wd_sched.h ${RPM_BUILD_ROOT}/usr/include/uadk +install -b -m644 %{kae_uadk_path}/include/wd_util.h ${RPM_BUILD_ROOT}/usr/include/uadk +install -b -m644 %{kae_uadk_path}/include/uacce.h ${RPM_BUILD_ROOT}/usr/include/uadk +install -b -m644 %{kae_uadk_path}/include/drv/wd_aead_drv.h ${RPM_BUILD_ROOT}/usr/include/uadk/drv +install -b -m644 %{kae_uadk_path}/include/drv/wd_cipher_drv.h ${RPM_BUILD_ROOT}/usr/include/uadk/drv +install -b -m644 %{kae_uadk_path}/include/drv/wd_comp_drv.h ${RPM_BUILD_ROOT}/usr/include/uadk/drv +install -b -m644 %{kae_uadk_path}/include/drv/wd_dh_drv.h ${RPM_BUILD_ROOT}/usr/include/uadk/drv +install -b -m644 %{kae_uadk_path}/include/drv/wd_digest_drv.h ${RPM_BUILD_ROOT}/usr/include/uadk/drv +install -b -m644 %{kae_uadk_path}/include/drv/wd_ecc_drv.h ${RPM_BUILD_ROOT}/usr/include/uadk/drv +install -b -m644 %{kae_uadk_path}/include/drv/wd_rsa_drv.h ${RPM_BUILD_ROOT}/usr/include/uadk/drv mkdir -p ${RPM_BUILD_ROOT}/usr/local/kaezip/lib mkdir -p ${RPM_BUILD_ROOT}/usr/local/kaezip/include mkdir -p ${RPM_BUILD_ROOT}/usr/local/kaezip/lib/pkgconfig mkdir -p ${RPM_BUILD_ROOT}/usr/local/kaezip/share/man/man3 +chrpath -d %{name}-%{version}/KAEZlib/libkaezip.so.2.0.0 +chrpath -d %{name}-%{version}/KAEZlib/open_source/zlib-%{zlib_version}/libz.so.%{zlib_version} +install -b -m755 %{name}-%{version}/KAEZlib/libkaezip.so.2.0.0 ${RPM_BUILD_ROOT}/usr/local/kaezip/lib +install -b -m755 %{name}-%{version}/KAEZlib/open_source/zlib-%{zlib_version}/libz.so.%{zlib_version} ${RPM_BUILD_ROOT}/usr/local/kaezip/lib +install -b -m755 %{name}-%{version}/KAEZlib/open_source/zlib-%{zlib_version}/libz.a ${RPM_BUILD_ROOT}/usr/local/kaezip/lib +install -b -m644 %{name}-%{version}/KAEZlib/open_source/zlib-%{zlib_version}/zlib.pc ${RPM_BUILD_ROOT}/usr/local/kaezip/lib/pkgconfig +install -b -m644 %{name}-%{version}/KAEZlib/open_source/zlib-%{zlib_version}/zlib.3 ${RPM_BUILD_ROOT}/usr/local/kaezip/share/man/man3 +install -b -m644 %{name}-%{version}/KAEZlib/open_source/zlib-%{zlib_version}/zlib.h ${RPM_BUILD_ROOT}/usr/local/kaezip/include +install -b -m644 %{name}-%{version}/KAEZlib/open_source/zlib-%{zlib_version}/zconf.h ${RPM_BUILD_ROOT}/usr/local/kaezip/include +install -b -m644 %{name}-%{version}/KAEZlib/include/kaezip.h ${RPM_BUILD_ROOT}/usr/local/kaezip/include mkdir -p ${RPM_BUILD_ROOT}/usr/local/kaezstd/lib mkdir -p ${RPM_BUILD_ROOT}/usr/local/kaezstd/bin mkdir -p ${RPM_BUILD_ROOT}/usr/local/kaezstd/include mkdir -p ${RPM_BUILD_ROOT}/usr/local/kaezstd/lib/pkgconfig mkdir -p ${RPM_BUILD_ROOT}/usr/local/kaezstd/share/man/man3 +chrpath -d %{name}-%{version}/KAEZstd/libkaezstd.so.2.0.0 +chrpath -d %{name}-%{version}/KAEZstd/open_source/zstd/lib/libzstd.so.%{zstd_version} +chrpath -d %{name}-%{version}/KAEZstd/open_source/zstd/programs/zstd +install -b -m755 %{name}-%{version}/KAEZstd/libkaezstd.so.2.0.0 ${RPM_BUILD_ROOT}/usr/local/kaezstd/lib +install -b -m755 %{name}-%{version}/KAEZstd/open_source/zstd/lib/libzstd.so.%{zstd_version} ${RPM_BUILD_ROOT}/usr/local/kaezstd/lib +install -b -m755 %{name}-%{version}/KAEZstd/open_source/zstd/lib/libzstd.a ${RPM_BUILD_ROOT}/usr/local/kaezstd/lib +install -b -m644 %{name}-%{version}/KAEZstd/open_source/zstd/lib/libzstd.pc ${RPM_BUILD_ROOT}/usr/local/kaezstd/lib/pkgconfig +install -b -m644 %{name}-%{version}/KAEZstd/open_source/zstd/lib/zstd.h ${RPM_BUILD_ROOT}/usr/local/kaezstd/include +install -b -m644 %{name}-%{version}/KAEZstd/open_source/zstd/lib/zdict.h ${RPM_BUILD_ROOT}/usr/local/kaezstd/include +install -b -m644 %{name}-%{version}/KAEZstd/open_source/zstd/lib/zstd_errors.h ${RPM_BUILD_ROOT}/usr/local/kaezstd/include +install -b -m644 %{name}-%{version}/KAEZstd/include/kaezstd.h ${RPM_BUILD_ROOT}/usr/local/kaezstd/include +install -b -m755 %{name}-%{version}/KAEZstd/open_source/zstd/programs/zstdless ${RPM_BUILD_ROOT}/usr/local/kaezstd/bin +install -b -m755 %{name}-%{version}/KAEZstd/open_source/zstd/programs/zstdgrep ${RPM_BUILD_ROOT}/usr/local/kaezstd/bin +install -b -m755 %{name}-%{version}/KAEZstd/open_source/zstd/programs/zstd ${RPM_BUILD_ROOT}/usr/local/kaezstd/bin mkdir -p ${RPM_BUILD_ROOT}/usr/local/lib/engines-1.1 +chrpath -d %{name}-%{version}/KAEOpensslEngine/src/.libs/kae.so.2.0.0 +install -b -m755 %{name}-%{version}/KAEOpensslEngine/src/.libs/kae.so.2.0.0 ${RPM_BUILD_ROOT}/usr/local/lib/engines-1.1 %clean @@ -68,8 +132,50 @@ This package kae_driver library. %files driver %defattr(644,root,root) +/lib/modules/%{kernel_version}/extra/uacce.ko +/lib/modules/%{kernel_version}/extra/hisi_qm.ko +/lib/modules/%{kernel_version}/extra/hisi_sec2.ko +/lib/modules/%{kernel_version}/extra/hisi_hpre.ko +/lib/modules/%{kernel_version}/extra/hisi_zip.ko +%config(noreplace) /etc/modprobe.d/hisi_zip.conf +%config(noreplace) /etc/modprobe.d/hisi_sec2.conf +%config(noreplace) /etc/modprobe.d/hisi_hpre.conf %defattr(755,root,root) +/usr/lib64/libwd.so.2.5.0 +/usr/lib64/libwd_comp.so.2.5.0 +/usr/lib64/libwd_crypto.so.2.5.0 +/usr/lib64/libhisi_hpre.so.2.5.0 +/usr/lib64/libhisi_sec.so.2.5.0 +/usr/lib64/libhisi_zip.so.2.5.0 +/usr/lib64/libhisi_hpre.so.2 +/usr/lib64/libhisi_sec.so.2 +/usr/lib64/libhisi_zip.so.2 +/usr/lib64/libwd.so.2 +/usr/lib64/libwd_comp.so.2 +/usr/lib64/libwd_crypto.so.2 +%defattr(644,root,root) +/usr/include/uadk/hisi_qm_udrv.h +/usr/include/uadk/wd.h +/usr/include/uadk/wd_aead.h +/usr/include/uadk/wd_alg_common.h +/usr/include/uadk/wd_cipher.h +/usr/include/uadk/wd_comp.h +/usr/include/uadk/wd_dh.h +/usr/include/uadk/wd_digest.h +/usr/include/uadk/wd_ecc.h +/usr/include/uadk/wd_ecc_curve.h +/usr/include/uadk/wd_rsa.h +/usr/include/uadk/wd_sched.h +/usr/include/uadk/wd_util.h +/usr/include/uadk/uacce.h +/usr/include/uadk/drv/wd_aead_drv.h +/usr/include/uadk/drv/wd_cipher_drv.h +/usr/include/uadk/drv/wd_comp_drv.h +/usr/include/uadk/drv/wd_dh_drv.h +/usr/include/uadk/drv/wd_digest_drv.h +/usr/include/uadk/drv/wd_ecc_drv.h +/usr/include/uadk/drv/wd_rsa_drv.h %pre driver if [ "$1" = "2" ] ; then #2: update @@ -114,7 +220,26 @@ fi %post driver echo "installing driver..." +if [[ "$1" = "1" || "$1" = "2" ]] ; then #1: install 2: update + cd /usr/lib64 + ln -sf libwd.so.2.5.0 libwd.so + ln -sf libwd.so.2.5.0 libwd.so.1 + + ln -sf libwd_comp.so.2.5.0 libwd_comp.so + ln -sf libwd_comp.so.2.5.0 libwd_comp.so.1 + ln -sf libwd_crypto.so.2.5.0 libwd_crypto.so + ln -sf libwd_crypto.so.2.5.0 libwd_crypto.so.1 + + ln -sf libhisi_hpre.so.2.5.0 libhisi_hpre.so + ln -sf libhisi_hpre.so.2.5.0 libhisi_hpre.so.1 + + ln -sf libhisi_sec.so.2.5.0 libhisi_sec.so + ln -sf libhisi_sec.so.2.5.0 libhisi_sec.so.1 + + ln -sf libhisi_zip.so.2.5.0 libhisi_zip.so + ln -sf libhisi_zip.so.2.5.0 libhisi_zip.so.1 +fi /sbin/ldconfig if [[ "$1" = "1" || "$1" = "2" ]] ; then #1: install 2: update @@ -245,14 +370,30 @@ This package kaezip library. %files zip %defattr(755,root,root) - +/usr/local/kaezip/lib/libkaezip.so.2.0.0 +/usr/local/kaezip/lib/libz.so.%{zlib_version} +/usr/local/kaezip/lib/libz.a %defattr(644,root,root) - +/usr/local/kaezip/lib/pkgconfig/zlib.pc +/usr/local/kaezip/share/man/man3/zlib.3 +/usr/local/kaezip/include/zlib.h +/usr/local/kaezip/include/zconf.h +/usr/local/kaezip/include/kaezip.h %defattr(755,root,root) - +/usr/local/kaezstd/lib/libkaezstd.so.2.0.0 +/usr/local/kaezstd/lib/libzstd.so.%{zstd_version} +/usr/local/kaezstd/bin/zstdless +/usr/local/kaezstd/bin/zstdgrep +/usr/local/kaezstd/bin/zstd %defattr(644,root,root) - +/usr/local/kaezstd/lib/libzstd.a +/usr/local/kaezstd/lib/pkgconfig/libzstd.pc +#/usr/local/kaezstd/share/man/man3/zlib.3 +/usr/local/kaezstd/include/zstd.h +/usr/local/kaezstd/include/zdict.h +/usr/local/kaezstd/include/zstd_errors.h +/usr/local/kaezstd/include/kaezstd.h %pre zip @@ -275,7 +416,21 @@ fi %post zip echo "installing post zip..." - +if [[ "$1" = "1" || "$1" = "2" ]] ; then #1: install 2: update + ln -sf /usr/local/kaezip/lib/libkaezip.so.2.0.0 /usr/local/kaezip/lib/libkaezip.so + ln -sf /usr/local/kaezip/lib/libkaezip.so.2.0.0 /usr/local/kaezip/lib/libkaezip.so.0 + ln -sf /usr/local/kaezip/lib/libz.so.%{zlib_version} /usr/local/kaezip/lib/libz.so + ln -sf /usr/local/kaezip/lib/libz.so.%{zlib_version} /usr/local/kaezip/lib/libz.so.1 + + ln -sf /usr/local/kaezstd/lib/libkaezstd.so.2.0.0 /usr/local/kaezstd/lib/libkaezstd.so + ln -sf /usr/local/kaezstd/lib/libkaezstd.so.2.0.0 /usr/local/kaezstd/lib/libkaezstd.so.0 + ln -sf /usr/local/kaezstd/lib/libzstd.so.%{zstd_version} /usr/local/kaezstd/lib/libzstd.so + ln -sf /usr/local/kaezstd/lib/libzstd.so.%{zstd_version} /usr/local/kaezstd/lib/libzstd.so.1 + + ln -sf /usr/local/kaezstd/bin/zstd /usr/local/kaezstd/bin/unzstd + ln -sf /usr/local/kaezstd/bin/zstd /usr/local/kaezstd/bin/zstdcat + ln -sf /usr/local/kaezstd/bin/zstd /usr/local/kaezstd/bin/zstdmt +fi /sbin/ldconfig %preun zip @@ -312,6 +467,7 @@ This package kae_openssl library. %files openssl %defattr(755,root,root) +/usr/local/lib/engines-1.1/kae.so.2.0.0 %pre openssl if [ "$1" = "2" ] ; then #2: update @@ -340,10 +496,18 @@ fi /sbin/ldconfig - %changelog +* Tue Apr 2 2024 liuyang 2.0.0-5 +- Second Spec Version Include kunpeng accelerator engine Code + * Thu Jun 29 2023 liuyang 2.0.0-3 -- Update KAE version +- Second Spec Version Include kunpeng accelerator engine Code + +* Wed Jun 28 2023 liuyang 2.0.0-2 +- Second Spec Version Include kunpeng accelerator engine Code + +* Wed Jun 14 2023 liuyang 2.0.0-2 +- Second Spec Version Include kunpeng accelerator engine Code * Tue Jan 07 2020 jinbinhua 1.2.7-1 - First Spec Version Include kunpeng accelerator engine Code