|
|
@ -707,27 +707,11 @@ popd > /dev/null
|
|
|
|
popd > /dev/null
|
|
|
|
popd > /dev/null
|
|
|
|
|
|
|
|
|
|
|
|
%install
|
|
|
|
%install
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%define __modsign_install_post %{nil}
|
|
|
|
|
|
|
|
%ifarch x86_64
|
|
|
|
|
|
|
|
%define __modsign_install_post_arch linux-%{version}-%{release}.x86_64
|
|
|
|
|
|
|
|
%elifarch aarch64
|
|
|
|
|
|
|
|
%define __modsign_install_post_arch linux-%{version}-%{release}.aarch64
|
|
|
|
|
|
|
|
%else
|
|
|
|
|
|
|
|
%define __modsign_install_post_arch ""
|
|
|
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%define __modsign_install_post \
|
|
|
|
|
|
|
|
if [ "%{signmodules}" -eq "1" ]; then \
|
|
|
|
|
|
|
|
if [ "%{with_std}" -ne "0" ]; then \
|
|
|
|
|
|
|
|
%{SOURCE21} %{__modsign_install_post_arch}/certs/signing_key.pem.sign %{__modsign_install_post_arch}/certs/signing_key.x509.sign $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/ \
|
|
|
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
%define __modsign_install_post \
|
|
|
|
%define __modsign_install_post \
|
|
|
|
if [ "%{signmodules}" -eq "1" ]; then \
|
|
|
|
if [ "%{signmodules}" -eq "1" ]; then \
|
|
|
|
if [ "%{with_std}" -ne "0" ]; then \
|
|
|
|
if [ "%{with_std}" -ne "0" ]; then \
|
|
|
|
%{SOURCE21} linux-%{version}-%{release}.x86_64/certs/signing_key.pem.sign linux-%{version}-%{release}.x86_64/certs/signing_key.x509.sign $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/ \
|
|
|
|
%{SOURCE21} linux-%{version}-%{release}.%{arch}/certs/signing_key.pem.sign linux-%{version}-%{release}.%{arch}/certs/signing_key.x509.sign $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/ \
|
|
|
|
>>>>>>> parent of 48e6f06 (Adding a logical chain to define the architecture)
|
|
|
|
|
|
|
|
fi \
|
|
|
|
fi \
|
|
|
|
fi \
|
|
|
|
fi \
|
|
|
|
if [ "%{zipmodules}" -eq "1" ]; then \
|
|
|
|
if [ "%{zipmodules}" -eq "1" ]; then \
|
|
|
|