rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

Drop placeholder ld.so.conf files

Browse Source 
https://bugzilla.redhat.com/show_bug.cgi?id=1381764
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-02-28 10:21:21 +01:00
parent 37ff69b901
commit 376237d3ba
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kernel.spec
View File

@ -1296,14 +1296,15 @@ BuildKernel() {
# we'll get it from the linux-firmware package and we don't want conflicts # we'll get it from the linux-firmware package and we don't want conflicts
%{make} %{?make_opts} ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer mod-fw= %{make} %{?make_opts} ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer mod-fw=
# add an a noop %%defattr statement 'cause rpm doesn't like empty file list files
echo '%%defattr(-,-,-)' > ../kernel${Flavour:+-${Flavour}}-ldsoconf.list
if [ $DoVDSO -ne 0 ]; then if [ $DoVDSO -ne 0 ]; then
%{make} %{?make_opts} ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT vdso_install KERNELRELEASE=$KernelVer %{make} %{?make_opts} ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT vdso_install KERNELRELEASE=$KernelVer
if [ ! -s ldconfig-kernel.conf ]; then if [ -s ldconfig-kernel.conf ]; then
echo > ldconfig-kernel.conf "\ install -D -m 444 ldconfig-kernel.conf \
# Placeholder file, no vDSO hwcap entries used in this kernel." $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernel-$KernelVer.conf
echo /etc/ld.so.conf.d/kernel-$KernelVer.conf >> ../kernel${Flavour:+-${Flavour}}-ldsoconf.list
fi fi
%{__install} -D -m 444 ldconfig-kernel.conf \
$RPM_BUILD_ROOT/etc/ld.so.conf.d/kernel-$KernelVer.conf
rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/vdso/.build-id rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/vdso/.build-id
fi fi
@ -1816,7 +1817,7 @@ fi
# #
%define kernel_variant_files(k:) \ %define kernel_variant_files(k:) \
%if %{2}\ %if %{2}\
%{expand:%%files -f kernel-%{?3:%{3}-}core.list %{?3:%{3}-}core}\ %{expand:%%files -f kernel-%{?3:%{3}-}core.list %{?1:-f kernel-%{?3:%{3}-}ldsoconf.list} %{?3:%{3}-}core}\
%defattr(-,root,root)\ %defattr(-,root,root)\
%{!?_licensedir:%global license %%doc}\ %{!?_licensedir:%global license %%doc}\
%license linux-%{KVERREL}/COPYING\ %license linux-%{KVERREL}/COPYING\
@ -1842,7 +1843,6 @@ fi
/lib/modules/%{KVERREL}%{?3:+%{3}}/bls.conf\ /lib/modules/%{KVERREL}%{?3:+%{3}}/bls.conf\
%if %{1}\ %if %{1}\
/lib/modules/%{KVERREL}%{?3:+%{3}}/vdso\ /lib/modules/%{KVERREL}%{?3:+%{3}}/vdso\
/etc/ld.so.conf.d/kernel-%{KVERREL}%{?3:+%{3}}.conf\
%endif\ %endif\
/lib/modules/%{KVERREL}%{?3:+%{3}}/modules.*\ /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.*\
%{expand:%%files -f kernel-%{?3:%{3}-}modules.list %{?3:%{3}-}modules}\ %{expand:%%files -f kernel-%{?3:%{3}-}modules.list %{?3:%{3}-}modules}\
@ -1867,8 +1867,8 @@ fi
%endif\ %endif\
%{nil} %{nil}
%kernel_variant_files %{_use_vdso} %{with_up} %kernel_variant_files %{_use_vdso} %{with_up}
%kernel_variant_files %{_use_vdso} %{with_debug} debug %kernel_variant_files %{_use_vdso} %{with_debug} debug
%kernel_variant_files %{use_vdso} %{with_pae} %{pae} %kernel_variant_files %{use_vdso} %{with_pae} %{pae}
%kernel_variant_files %{use_vdso} %{with_pae_debug} %{pae}debug %kernel_variant_files %{use_vdso} %{with_pae_debug} %{pae}debug