diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-02-28 10:21:21 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-02-28 14:25:35 +0100 |
| commit | 376237d3baeac9655f7bfa12030eac19b23beca1 (patch) | |
| tree | 730c206f87942f84f88d26961e760f592b5d3f53 | |
| parent | 37ff69b901efe19de5cd01093f048dd966660ae3 (diff) | |
| download | kernel-376237d3baeac9655f7bfa12030eac19b23beca1.tar.gz kernel-376237d3baeac9655f7bfa12030eac19b23beca1.tar.xz kernel-376237d3baeac9655f7bfa12030eac19b23beca1.zip | |
Drop placeholder ld.so.conf files
https://bugzilla.redhat.com/show_bug.cgi?id=1381764
| -rw-r--r-- | kernel.spec | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kernel.spec b/kernel.spec index d795d09bc..f3f561c5f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1296,14 +1296,15 @@ BuildKernel() { # 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= + # 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 %{make} %{?make_opts} ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT vdso_install KERNELRELEASE=$KernelVer - if [ ! -s ldconfig-kernel.conf ]; then - echo > ldconfig-kernel.conf "\ - # Placeholder file, no vDSO hwcap entries used in this kernel." + if [ -s ldconfig-kernel.conf ]; then + install -D -m 444 ldconfig-kernel.conf \ + $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 - %{__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 fi @@ -1816,7 +1817,7 @@ fi # %define kernel_variant_files(k:) \ %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)\ %{!?_licensedir:%global license %%doc}\ %license linux-%{KVERREL}/COPYING\ @@ -1842,7 +1843,6 @@ fi /lib/modules/%{KVERREL}%{?3:+%{3}}/bls.conf\ %if %{1}\ /lib/modules/%{KVERREL}%{?3:+%{3}}/vdso\ -/etc/ld.so.conf.d/kernel-%{KVERREL}%{?3:+%{3}}.conf\ %endif\ /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.*\ %{expand:%%files -f kernel-%{?3:%{3}-}modules.list %{?3:%{3}-}modules}\ @@ -1867,8 +1867,8 @@ fi %endif\ %{nil} -%kernel_variant_files %{_use_vdso} %{with_up} -%kernel_variant_files %{_use_vdso} %{with_debug} debug +%kernel_variant_files %{_use_vdso} %{with_up} +%kernel_variant_files %{_use_vdso} %{with_debug} debug %kernel_variant_files %{use_vdso} %{with_pae} %{pae} %kernel_variant_files %{use_vdso} %{with_pae_debug} %{pae}debug |