diff --git a/kae-2.0.0.tar.gz b/kae-2.0.0.tar.gz deleted file mode 100644 index 73359d954beb55586d0557cd28c9cc19ca4e766c..0000000000000000000000000000000000000000 Binary files a/kae-2.0.0.tar.gz and /dev/null differ diff --git a/kae-2.0.3.tar.gz b/kae-2.0.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..a92ce85425a687214322284b94bfe108be2644cb Binary files /dev/null and b/kae-2.0.3.tar.gz differ diff --git a/kae-v2.spec b/kae-v2.spec index f387bd294f210aa2223dd81315742465d2c7edb5..efe1fc7b025db99a045903b4d36e07828a167c8c 100644 --- a/kae-v2.spec +++ b/kae-v2.spec @@ -1,122 +1,101 @@ Name: kae Summary: Huawei Kunpeng Accelerator Engine Zip -Version: 2.0.0 -Release: 5 +Version: 2.0.3 +Release: 1 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, compat-openssl11-devel, chrpath +BuildRequires: gcc, make, kernel-devel, libtool, numactl-devel, openssl-devel, chrpath, lz4-devel ExclusiveArch: aarch64 Autoreq: no Autoprov: no %define kernel_version %(rpm -q kernel-devel | sed 's/kernel-devel-//') %define kae_build_path %{_builddir}/%{name}-%{version}/%{name}-%{version}/kae_build -%define kae_path %{_builddir}/%{name}-%{version}/%{name}-%{version} +%define kae_path %{_builddir}/%{name}-%{version}/%{name}-%{version}/ %define kae_driver_path %{_builddir}/%{name}-%{version}/%{name}-%{version}/KAEKernelDriver %define kae_uadk_path %{_builddir}/%{name}-%{version}/%{name}-%{version}/uadk %define zlib_version 1.2.11 %define zstd_version 1.5.2 %description -This package contains the Huawei Hisilicon Zip Accelerator Engine. +This package contains the Huawei Hisilicon Zip and Openssl Accelerator Engine. + %prep %global debug_package %{nil} %setup -c -n %{name}-%{version} +implementer=$(cat /proc/cpuinfo | grep "CPU implementer" | awk 'NR==1{printf $4}') +part=$(cat /proc/cpuinfo | grep "CPU part" | awk 'NR==1{printf $4}') +if [ "${implementer}-${part}" != "0x48-0xd01" ] && [ "${implementer}-${part}" != "0x48-0xd02" ]; then + echo "Only installed on kunpeng CPUs" +fi %build cd %{name}-%{version} -sh build.sh buildallv2 +sh build.sh rpm %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 - -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 +implementer=$(cat /proc/cpuinfo | grep "CPU implementer" | awk 'NR==1{printf $4}') +part=$(cat /proc/cpuinfo | grep "CPU part" | awk 'NR==1{printf $4}') +#driver + mkdir -p ${RPM_BUILD_ROOT}/lib/modules/%{kernel_version}/extra + mkdir -p ${RPM_BUILD_ROOT}/etc/modprobe.d + install -b -m755 %{kae_path}/kae_build/driver/*.ko ${RPM_BUILD_ROOT}/lib/modules/%{kernel_version}/extra + install -b -m755 %{kae_path}/kae_build/driver/*.conf ${RPM_BUILD_ROOT}/etc/modprobe.d/ + +#uadk + mkdir -p ${RPM_BUILD_ROOT}/usr/local/lib + chrpath -d %{kae_path}/kae_build/uadk/lib/* + cp -rf %{kae_path}/kae_build/uadk/lib/* ${RPM_BUILD_ROOT}/usr/local/lib + + mkdir -p ${RPM_BUILD_ROOT}/usr/include/uadk + mkdir -p ${RPM_BUILD_ROOT}/usr/include/uadk/v1 + mkdir -p ${RPM_BUILD_ROOT}/usr/include/uadk/drv + install -b -m755 %{kae_path}/kae_build/uadk/include/*.h ${RPM_BUILD_ROOT}/usr/include/uadk + install -b -m755 %{kae_path}/kae_build/uadk/include/v1/*.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1 + install -b -m755 %{kae_path}/kae_build/uadk/include/drv/*.h ${RPM_BUILD_ROOT}/usr/include/uadk/drv + + +#engine + mkdir -p ${RPM_BUILD_ROOT}/usr/local/lib/engines-3.0 + chrpath -d %{kae_path}/kae_build/KAEOpensslEngine/lib/* + cp -rf %{kae_path}/kae_build/KAEOpensslEngine/lib/* ${RPM_BUILD_ROOT}/usr/local/lib/engines-3.0/ + +#zlib + 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 + cp -rf %{kae_path}/kae_build/kaezip/lib/* ${RPM_BUILD_ROOT}/usr/local/kaezip/lib + cp -rf %{kae_path}/kae_build/kaezip/include/* ${RPM_BUILD_ROOT}/usr/local/kaezip/include + cp -rf %{kae_path}/kae_build/kaezip/share/* ${RPM_BUILD_ROOT}/usr/local/kaezip/share + +#zstd只在SVA支持 + 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/man1 + cp -rf %{kae_path}/kae_build/kaezstd/lib/* ${RPM_BUILD_ROOT}/usr/local/kaezstd/lib + cp -rf %{kae_path}/kae_build/kaezstd/bin/* ${RPM_BUILD_ROOT}/usr/local/kaezstd/bin + cp -rf %{kae_path}/kae_build/kaezstd/include/* ${RPM_BUILD_ROOT}/usr/local/kaezstd/include + cp -rf %{kae_path}/kae_build/kaezstd/share/* ${RPM_BUILD_ROOT}/usr/local/kaezstd/share + +#lz4 + mkdir -p ${RPM_BUILD_ROOT}/usr/local/kaelz4/lib + mkdir -p ${RPM_BUILD_ROOT}/usr/local/kaelz4/bin + mkdir -p ${RPM_BUILD_ROOT}/usr/local/kaelz4/include + mkdir -p ${RPM_BUILD_ROOT}/usr/local/kaelz4/lib + mkdir -p ${RPM_BUILD_ROOT}/usr/local/kaelz4/share/man/man1 + cp -rf %{kae_path}/kae_build/kaelz4/lib/* ${RPM_BUILD_ROOT}/usr/local/kaelz4/lib + cp -rf %{kae_path}/kae_build/kaelz4/bin/* ${RPM_BUILD_ROOT}/usr/local/kaelz4/bin + cp -rf %{kae_path}/kae_build/kaelz4/include/* ${RPM_BUILD_ROOT}/usr/local/kaelz4/include + cp -rf %{kae_path}/kae_build/kaelz4/share/* ${RPM_BUILD_ROOT}/usr/local/kaelz4/share %clean @@ -132,71 +111,37 @@ 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 +/lib/modules/%{kernel_version}/extra/*.ko +%config(noreplace) /etc/modprobe.d/*.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 - rm -rf /usr/lib64/libwd.so > /dev/null 2>&1 || true - rm -rf /usr/lib64/libwd.so.1 > /dev/null 2>&1 || true +/usr/local/lib/libwd.* +/usr/local/lib/libwd_comp.* +/usr/local/lib/libwd_crypto.* +/usr/local/lib/libhisi_hpre.* +/usr/local/lib/libhisi_sec.* +/usr/local/lib/libhisi_zip.* - rm -rf /usr/lib64/libwd_comp.so > /dev/null 2>&1 || true - rm -rf /usr/lib64/libwd_comp.so.1 > /dev/null 2>&1 || true - - rm -rf /usr/lib64/libwd_crypto.so > /dev/null 2>&1 || true - rm -rf /usr/lib64/libwd_crypto.so.1 > /dev/null 2>&1 || true +%defattr(644,root,root) +/usr/include/uadk/*.h +/usr/include/uadk/v1/*.h +/usr/include/uadk/drv/*.h - rm -rf /usr/lib64/libhisi_hpre.so > /dev/null 2>&1 || true - rm -rf /usr/lib64/libhisi_hpre.so.1 > /dev/null 2>&1 || true - rm -rf /usr/lib64/libhisi_sec.so > /dev/null 2>&1 || true - rm -rf /usr/lib64/libhisi_sec.so.1 > /dev/null 2>&1 || true +%pre driver +echo "Preprocessing before installing the driver" +modprobe -r hisi_zip > /dev/null 2>&1 || true +modprobe -r hisi_hpre > /dev/null 2>&1 || true +modprobe -r hisi_sec2 > /dev/null 2>&1 || true +modprobe -r hisi_qm > /dev/null 2>&1 || true +modprobe -r uacce > /dev/null 2>&1 || true +rm -rf /usr/local/lib/libwd.* > /dev/null 2>&1 || true +rm -rf /usr/local/lib/libwd_comp.* > /dev/null 2>&1 || true +rm -rf /usr/local/lib/libwd_crypto.* > /dev/null 2>&1 || true +rm -rf /usr/local/lib/libhisi_hpre.* > /dev/null 2>&1 || true +rm -rf /usr/local/lib/libhisi_sec.* > /dev/null 2>&1 || true +rm -rf /usr/local/lib/libhisi_zip.* > /dev/null 2>&1 || true - rm -rf /usr/lib64/libhisi_zip.so > /dev/null 2>&1 || true - rm -rf /usr/lib64/libhisi_zip.so.1 > /dev/null 2>&1 || true -fi echo "checking installed modules" if [[ "$1" = "1" || "$1" = "2" ]] ; then #1: install 2: update @@ -221,24 +166,17 @@ 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 + implementer=$(cat /proc/cpuinfo | grep "CPU implementer" | awk 'NR==1{printf $4}') + part=$(cat /proc/cpuinfo | grep "CPU part" | awk 'NR==1{printf $4}') + depmod -a + modprobe uacce + modprobe hisi_qm + modprobe hisi_sec2 uacce_mode=2 pf_q_num=256 + modprobe hisi_hpre uacce_mode=2 pf_q_num=256 + modprobe hisi_zip uacce_mode=2 pf_q_num=256 + echo "options hisi_sec2 uacce_mode=2 pf_q_num=256" > /etc/modprobe.d/hisi_sec2.conf + echo "options hisi_hpre uacce_mode=2 pf_q_num=256" > /etc/modprobe.d/hisi_hpre.conf + echo "options hisi_zip uacce_mode=2 pf_q_num=256" > /etc/modprobe.d/hisi_zip.conf fi /sbin/ldconfig @@ -276,25 +214,11 @@ fi echo "hisi_zip modules installed" %preun driver -if [ "$1" = "0" ] ; then #0: uninstall - rm -rf /usr/lib64/libwd.so > /dev/null 2>&1 || true - rm -rf /usr/lib64/libwd.so.1 > /dev/null 2>&1 || true - - rm -rf /usr/lib64/libwd_comp.so > /dev/null 2>&1 || true - rm -rf /usr/lib64/libwd_comp.so.1 > /dev/null 2>&1 || true - - rm -rf /usr/lib64/libwd_crypto.so > /dev/null 2>&1 || true - rm -rf /usr/lib64/libwd_crypto.so.1 > /dev/null 2>&1 || true - - rm -rf /usr/lib64/libhisi_hpre.so > /dev/null 2>&1 || true - rm -rf /usr/lib64/libhisi_hpre.so.1 > /dev/null 2>&1 || true - - rm -rf /usr/lib64/libhisi_sec.so > /dev/null 2>&1 || true - rm -rf /usr/lib64/libhisi_sec.so.1 > /dev/null 2>&1 || true - - rm -rf /usr/lib64/libhisi_zip.so > /dev/null 2>&1 || true - rm -rf /usr/lib64/libhisi_zip.so.1 > /dev/null 2>&1 || true -fi +modprobe -r hisi_zip > /dev/null 2>&1 || true +modprobe -r hisi_hpre > /dev/null 2>&1 || true +modprobe -r hisi_sec2 > /dev/null 2>&1 || true +modprobe -r hisi_qm > /dev/null 2>&1 || true +modprobe -r uacce > /dev/null 2>&1 || true if [ -e /sbin/weak-modules ]; then echo "/lib/modules/%{kernel_version}/extra/uacce.ko" | /sbin/weak-modules --remove-module --no-initramfs @@ -328,6 +252,22 @@ fi %postun driver /sbin/ldconfig +rm -rf /usr/local/lib/libwd.* > /dev/null 2>&1 || true +rm -rf /usr/local/lib/libwd_comp.* > /dev/null 2>&1 || true +rm -rf /usr/local/lib/libwd_crypto.* > /dev/null 2>&1 || true +rm -rf /usr/local/lib/libhisi_hpre.* > /dev/null 2>&1 || true +rm -rf /usr/local/lib/libhisi_sec.* > /dev/null 2>&1 || true +rm -rf /usr/local/lib/libhisi_zip.* > /dev/null 2>&1 || true + +rm -rf /lib/modules/%{kernel_version}/extra/uacce.ko > /dev/null 2>&1 || true +rm -rf /lib/modules/%{kernel_version}/extra/hisi_qm.ko > /dev/null 2>&1 || true +rm -rf /lib/modules/%{kernel_version}/extra/hisi_sec2.ko > /dev/null 2>&1 || true +rm -rf /lib/modules/%{kernel_version}/extra/hisi_hpre.ko > /dev/null 2>&1 || true +rm -rf /lib/modules/%{kernel_version}/extra/hisi_zip.ko > /dev/null 2>&1 || true +rm -rf /etc/modprobe.d/hisi_sec2.conf > /dev/null 2>&1 || true +rm -rf /etc/modprobe.d/hisi_hpre.conf > /dev/null 2>&1 || true +rm -rf /etc/modprobe.d/hisi_zip.conf > /dev/null 2>&1 || true + if [ "$1" = "0" ] ; then #0: uninstall /sbin/depmod -a > /dev/null 2>&1 || true @@ -370,92 +310,64 @@ 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 +/usr/local/kaezip/lib/* +/usr/local/kaezstd/lib/* +/usr/local/kaezstd/bin/* +/usr/local/kaelz4/lib/* +/usr/local/kaelz4/bin/* -%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 +/usr/local/kaezip/share/man/man3/zlib.3 +/usr/local/kaezip/include/*.h +/usr/local/kaezstd/include/*.h +/usr/local/kaezstd/share/man/man1/* +/usr/local/kaelz4/include/*.h +/usr/local/kaelz4/share/man/man1/* %pre zip echo "installing pre zip..." if [ "$1" = "2" ] ; then #2: update - rm -rf /usr/local/kaezip/lib/libkaezip.so > /dev/null 2>&1 || true - rm -rf /usr/local/kaezip/lib/libkaezip.so.0 > /dev/null 2>&1 || true - rm -rf /usr/local/kaezip/lib/libz.so > /dev/null 2>&1 || true - rm -rf /usr/local/kaezip/lib/libz.so.1 > /dev/null 2>&1 || true - - rm -rf /usr/local/kaezstd/lib/libkaezstd.so > /dev/null 2>&1 || true - rm -rf /usr/local/kaezstd/lib/libkaezstd.so.0 > /dev/null 2>&1 || true - rm -rf /usr/local/kaezstd/lib/libzstd.so > /dev/null 2>&1 || true - rm -rf /usr/local/kaezstd/lib/libzstd.so.1 > /dev/null 2>&1 || true - - rm -rf /usr/local/kaezstd/bin/unzstd > /dev/null 2>&1 || true - rm -rf /usr/local/kaezstd/bin/zstdcat > /dev/null 2>&1 || true - rm -rf /usr/local/kaezstd/bin/zstdmt > /dev/null 2>&1 || true + rm -rf /usr/local/kaezip > /dev/null 2>&1 || true + rm -rf /usr/local/kaezstd > /dev/null 2>&1 || true + rm -rf /usr/local/kaelz4 > /dev/null 2>&1 || true 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 + implementer=$(cat /proc/cpuinfo | grep "CPU implementer" | awk 'NR==1{printf $4}') + part=$(cat /proc/cpuinfo | grep "CPU part" | awk 'NR==1{printf $4}') + if [ "${implementer}-${part}" == "0x48-0xd01" ]; then + rm -rf /usr/local/kaezstd > /dev/null 2>&1 || true + rm -rf /usr/local/kaelz4 > /dev/null 2>&1 || true + fi fi /sbin/ldconfig %preun zip -if [ "$1" = "0" ] ; then #0: uninstall - rm -rf /usr/local/kaezip/lib/libz.so > /dev/null 2>&1 || true - rm -rf /usr/local/kaezip/lib/libz.so.1 > /dev/null 2>&1 || true - rm -rf /usr/local/kaezip/lib/libkaezip.so > /dev/null 2>&1 || true - rm -rf /usr/local/kaezip/lib/libkaezip.so.0 > /dev/null 2>&1 || true - - rm -rf /usr/local/kaezstd/lib/libzstd.so > /dev/null 2>&1 || true - rm -rf /usr/local/kaezstd/lib/libzstd.so.1 > /dev/null 2>&1 || true - rm -rf /usr/local/kaezstd/lib/libkaezstd.so > /dev/null 2>&1 || true - rm -rf /usr/local/kaezstd/lib/libkaezstd.so.0 > /dev/null 2>&1 || true - - rm -rf /usr/local/kaezstd/bin/unzstd > /dev/null 2>&1 || true - rm -rf /usr/local/kaezstd/bin/zstdcat > /dev/null 2>&1 || true - rm -rf /usr/local/kaezstd/bin/zstdmt > /dev/null 2>&1 || true - - rm -f /var/log/kaezip.log > /dev/null 2>&1 || true - rm -f /var/log/kaezip.log.old > /dev/null 2>&1 || true -fi +echo "uninstalling zip-rpm" + %postun zip +rm -rf /usr/local/kaezip > /dev/null 2>&1 || true +rm -f /var/log/kaezip.log* > /dev/null 2>&1 || true + +if [[ "$1" = "1" || "$1" = "2" ]] ; then #1: install 2: update + implementer=$(cat /proc/cpuinfo | grep "CPU implementer" | awk 'NR==1{printf $4}') + part=$(cat /proc/cpuinfo | grep "CPU part" | awk 'NR==1{printf $4}') + if [ "${implementer}-${part}" != "0x48-0xd01" ]; then + rm -rf /usr/local/kaezstd > /dev/null 2>&1 || true + rm -rf /usr/local/kaelz4 > /dev/null 2>&1 || true + + rm -f /var/log/kaezstd.log* > /dev/null 2>&1 || true + rm -f /var/log/kaelz4.log* > /dev/null 2>&1 || true + fi +fi +echo "zip-rpm uninstalled" /sbin/ldconfig + %package openssl Summary: KAE Openssl Package Requires:kae-driver, openssl-devel @@ -467,44 +379,47 @@ This package kae_openssl library. %files openssl %defattr(755,root,root) -/usr/local/lib/engines-1.1/kae.so.2.0.0 +/usr/local/lib/engines-3.0/* %pre openssl +if [ "$RPM_INSTALL_PREFIX" == "" ]; then + RPM_INSTALL_PREFIX=/usr/local/lib/engines-3.0 +fi if [ "$1" = "2" ] ; then #2: update - rm -rf $RPM_INSTALL_PREFIX/kae.so > /dev/null 2>&1 || true - rm -rf $RPM_INSTALL_PREFIX/kae.so.0 > /dev/null 2>&1 || true + rm -rf $RPM_INSTALL_PREFIX > /dev/null 2>&1 || true fi %post openssl -echo "installing openssl..." -if [[ "$1" = "1" || "$1" = "2" ]] ; then #1: install 2: update - ln -sf $RPM_INSTALL_PREFIX/kae.so.%{version} $RPM_INSTALL_PREFIX/kae.so - ln -sf $RPM_INSTALL_PREFIX/kae.so.%{version} $RPM_INSTALL_PREFIX/kae.so.0 +echo "installing openssl engine..." +if [ "$RPM_INSTALL_PREFIX" == "" ]; then + RPM_INSTALL_PREFIX=/usr/local/lib/engines-3.0 fi /sbin/ldconfig %preun openssl -if [ "$1" = "0" ] ; then #0: uninstall - rm -rf $RPM_INSTALL_PREFIX/kae.so > /dev/null 2>&1 || true - rm -rf $RPM_INSTALL_PREFIX/kae.so.0 > /dev/null 2>&1 || true - rm -f /var/log/kae.log > /dev/null 2>&1 || true - rm -f /var/log/kae.log.old > /dev/null 2>&1 || true +echo "uninstalling openssl engine..." +if [ "$RPM_INSTALL_PREFIX" == "" ]; then + RPM_INSTALL_PREFIX=/usr/local/lib/engines-3.0 fi - %postun openssl +if [ "$RPM_INSTALL_PREFIX" == "" ]; then + RPM_INSTALL_PREFIX=/usr/local/lib/engines-3.0 +fi +rm -rf $RPM_INSTALL_PREFIX > /dev/null 2>&1 || true +rm -f /var/log/kae.log* > /dev/null 2>&1 || true +echo "openssl engine uninstalled" /sbin/ldconfig - %changelog -* Tue Apr 2 2024 liuyang 2.0.0-5 -- Second Spec Version Include kunpeng accelerator engine Code +* Tue Mar 19 2024 linyixiang 2.0.3-1 +- Update Spec Version Include kunpeng accelerator engine Code -* Thu Jun 29 2023 liuyang 2.0.0-3 -- Second Spec Version Include kunpeng accelerator engine Code +* Tue Mar 19 2024 liuyang 2.0.2-1 +- Update Spec Version Include kunpeng accelerator engine Code -* Wed Jun 28 2023 liuyang 2.0.0-2 -- Second Spec Version Include kunpeng accelerator engine Code +* Tue Jan 2 2024 liuyang 2.0.1-1 +- Update Spec Version Include kunpeng accelerator engine Code * Wed Jun 14 2023 liuyang 2.0.0-2 - Second Spec Version Include kunpeng accelerator engine Code