libwd: fix struct for apply patch

There is a problem with the current directory structure, which will make
uadk's patch unable to be applied directly. Therefore, decompress the
'${name}-${version}.tar.gz' as '${name}-${version}' rather than create it
during rpmbuild.

Signed-off-by: Yang Shen <shenyang39@huawei.com>
This commit is contained in:
Yang Shen 2022-01-10 16:52:18 +08:00
parent 6567baea12
commit 6be0e83d22
2 changed files with 36 additions and 39 deletions

Binary file not shown.

View File

@ -22,54 +22,52 @@ and decryption, asymmetric encryption and decryption.
%prep %prep
%global debug_package %{nil} %global debug_package %{nil}
%autosetup -c -n %{name}-%{version} -p1 %autosetup -n %{name}-%{version} -p1
%build %build
cd uadk
sh autogen.sh sh autogen.sh
./configure ./configure
make make
%install %install
mkdir -p ${RPM_BUILD_ROOT}/usr/lib64 mkdir -p ${RPM_BUILD_ROOT}/usr/lib64
install -b -m755 uadk/.libs/libwd.so.%{version} ${RPM_BUILD_ROOT}/usr/lib64 install -b -m755 .libs/libwd.so.%{version} ${RPM_BUILD_ROOT}/usr/lib64
install -b -m755 uadk/.libs/libwd_crypto.so.%{version} ${RPM_BUILD_ROOT}/usr/lib64 install -b -m755 .libs/libwd_crypto.so.%{version} ${RPM_BUILD_ROOT}/usr/lib64
install -b -m755 uadk/.libs/libwd_comp.so.%{version} ${RPM_BUILD_ROOT}/usr/lib64 install -b -m755 .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 .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 .libs/libhisi_hpre.so.%{version} ${RPM_BUILD_ROOT}/usr/lib64
install -b -m755 uadk/.libs/libhisi_zip.so.%{version} ${RPM_BUILD_ROOT}/usr/lib64 install -b -m755 .libs/libhisi_zip.so.%{version} ${RPM_BUILD_ROOT}/usr/lib64
mkdir -p ${RPM_BUILD_ROOT}/usr/include/warpdrive/include mkdir -p ${RPM_BUILD_ROOT}/usr/include/warpdrive/include
cp uadk/v1/uacce.h ${RPM_BUILD_ROOT}/usr/include/warpdrive/include cp v1/uacce.h ${RPM_BUILD_ROOT}/usr/include/warpdrive/include
cp uadk/v1/wd.h ${RPM_BUILD_ROOT}/usr/include/warpdrive cp v1/wd.h ${RPM_BUILD_ROOT}/usr/include/warpdrive
cp uadk/v1/wd_cipher.h ${RPM_BUILD_ROOT}/usr/include/warpdrive cp v1/wd_cipher.h ${RPM_BUILD_ROOT}/usr/include/warpdrive
cp uadk/v1/wd_comp.h ${RPM_BUILD_ROOT}/usr/include/warpdrive cp v1/wd_comp.h ${RPM_BUILD_ROOT}/usr/include/warpdrive
cp uadk/v1/wd_dh.h ${RPM_BUILD_ROOT}/usr/include/warpdrive cp v1/wd_dh.h ${RPM_BUILD_ROOT}/usr/include/warpdrive
cp uadk/v1/wd_digest.h ${RPM_BUILD_ROOT}/usr/include/warpdrive cp v1/wd_digest.h ${RPM_BUILD_ROOT}/usr/include/warpdrive
cp uadk/v1/wd_rsa.h ${RPM_BUILD_ROOT}/usr/include/warpdrive cp v1/wd_rsa.h ${RPM_BUILD_ROOT}/usr/include/warpdrive
cp uadk/v1/wd_bmm.h ${RPM_BUILD_ROOT}/usr/include/warpdrive cp v1/wd_bmm.h ${RPM_BUILD_ROOT}/usr/include/warpdrive
mkdir -p ${RPM_BUILD_ROOT}/usr/include/uadk/v1 mkdir -p ${RPM_BUILD_ROOT}/usr/include/uadk/v1
cp uadk/include/uacce.h ${RPM_BUILD_ROOT}/usr/include/uadk cp include/uacce.h ${RPM_BUILD_ROOT}/usr/include/uadk
cp uadk/include/wd.h ${RPM_BUILD_ROOT}/usr/include/uadk cp include/wd.h ${RPM_BUILD_ROOT}/usr/include/uadk
cp uadk/include/wd_cipher.h ${RPM_BUILD_ROOT}/usr/include/uadk cp include/wd_cipher.h ${RPM_BUILD_ROOT}/usr/include/uadk
cp uadk/include/wd_comp.h ${RPM_BUILD_ROOT}/usr/include/uadk cp include/wd_comp.h ${RPM_BUILD_ROOT}/usr/include/uadk
cp uadk/include/wd_dh.h ${RPM_BUILD_ROOT}/usr/include/uadk cp include/wd_dh.h ${RPM_BUILD_ROOT}/usr/include/uadk
cp uadk/include/wd_digest.h ${RPM_BUILD_ROOT}/usr/include/uadk cp include/wd_digest.h ${RPM_BUILD_ROOT}/usr/include/uadk
cp uadk/include/wd_rsa.h ${RPM_BUILD_ROOT}/usr/include/uadk cp include/wd_rsa.h ${RPM_BUILD_ROOT}/usr/include/uadk
cp uadk/include/wd_aead.h ${RPM_BUILD_ROOT}/usr/include/uadk cp include/wd_aead.h ${RPM_BUILD_ROOT}/usr/include/uadk
cp uadk/include/wd_ecc.h ${RPM_BUILD_ROOT}/usr/include/uadk cp include/wd_ecc.h ${RPM_BUILD_ROOT}/usr/include/uadk
cp uadk/include/wd_ecc_curve.h ${RPM_BUILD_ROOT}/usr/include/uadk cp 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 include/wd_alg_common.h ${RPM_BUILD_ROOT}/usr/include/uadk
cp uadk/include/wd_common.h ${RPM_BUILD_ROOT}/usr/include/uadk cp include/wd_common.h ${RPM_BUILD_ROOT}/usr/include/uadk
cp uadk/include/wd_sched.h ${RPM_BUILD_ROOT}/usr/include/uadk cp include/wd_sched.h ${RPM_BUILD_ROOT}/usr/include/uadk
cp uadk/v1/uacce.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1 cp v1/uacce.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1
cp uadk/v1/wd.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1 cp v1/wd.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1
cp uadk/v1/wd_cipher.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1 cp 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 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 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 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 v1/wd_rsa.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1
cp uadk/v1/wd_bmm.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1 cp v1/wd_bmm.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1
%clean %clean
rm -rf ${RPM_BUILD_ROOT} rm -rf ${RPM_BUILD_ROOT}
@ -119,7 +117,6 @@ rm -rf ${RPM_BUILD_ROOT}
%exclude /usr/lib64/libhisi_hpre.so.2 %exclude /usr/lib64/libhisi_hpre.so.2
%exclude /usr/lib64/libhisi_zip.so.2 %exclude /usr/lib64/libhisi_zip.so.2
%pre %pre
if [ "$1" = "2" ] ; then #2: update if [ "$1" = "2" ] ; then #2: update
rm -rf /usr/lib64/libwd.so > /dev/null 2>&1 || true rm -rf /usr/lib64/libwd.so > /dev/null 2>&1 || true