#7 Drop placeholder /etc/ld.so.conf.d files
Merged 2 years ago by jcline. Opened 2 years ago by zbyszek.
rpms/ zbyszek/kernel drop-placeholder-ls.so.conf  into  master

file modified
+10 -33

@@ -368,9 +368,8 @@ 

  

  

  Name: kernel%{?variant}

- Group: System Environment/Kernel

  License: GPLv2 and Redistributable, no modification permitted

- URL: http://www.kernel.org/

+ URL: https://www.kernel.org/

  Version: %{rpmversion}

  Release: %{pkg_release}

  # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.

@@ -655,7 +654,6 @@ 

  

  %package headers

  Summary: Header files for the Linux kernel for use by glibc

- Group: Development/System

  Obsoletes: glibc-kernheaders < 3.0-46

  Provides: glibc-kernheaders = 3.0-46

  %if "0%{?variant}"

@@ -671,7 +669,6 @@ 

  

  %package cross-headers

  Summary: Header files for the Linux kernel for use by cross-glibc

- Group: Development/System

  %description cross-headers

  Kernel-cross-headers includes the C header files that specify the interface

  between the Linux kernel and userspace libraries and programs.  The

@@ -682,7 +679,6 @@ 

  

  %package bootwrapper

  Summary: Boot wrapper files for generating combined kernel + initrd images

- Group: Development/System

  Requires: gzip binutils

  %description bootwrapper

  Kernel-bootwrapper contains the wrapper code which makes bootable "zImage"

@@ -690,7 +686,6 @@ 

  

  %package debuginfo-common-%{_target_cpu}

  Summary: Kernel source files used by %{name}-debuginfo packages

- Group: Development/Debug

  Provides: installonlypkg(kernel)

  %description debuginfo-common-%{_target_cpu}

  This package is required by %{name}-debuginfo subpackages.

@@ -703,7 +698,6 @@ 

  %define kernel_debuginfo_package() \

  %package %{?1:%{1}-}debuginfo\

  Summary: Debug information for package %{name}%{?1:-%{1}}\

- Group: Development/Debug\

  Requires: %{name}-debuginfo-common-%{_target_cpu} = %{version}-%{release}\

  Provides: %{name}%{?1:-%{1}}-debuginfo-%{_target_cpu} = %{version}-%{release}\

  Provides: installonlypkg(kernel)\

@@ -721,7 +715,6 @@ 

  %define kernel_devel_package() \

  %package %{?1:%{1}-}devel\

  Summary: Development package for building kernel modules to match the %{?2:%{2} }kernel\

- Group: System Environment/Kernel\

  Provides: kernel%{?1:-%{1}}-devel-%{_target_cpu} = %{version}-%{release}\

  Provides: kernel-devel-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\

  Provides: kernel-devel-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\

@@ -742,7 +735,6 @@ 

  %define kernel_modules_extra_package() \

  %package %{?1:%{1}-}modules-extra\

  Summary: Extra kernel modules to match the %{?2:%{2} }kernel\

- Group: System Environment/Kernel\

  Provides: kernel%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{version}-%{release}\

  Provides: kernel%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\

  Provides: kernel%{?1:-%{1}}-modules-extra = %{version}-%{release}%{?1:+%{1}}\

@@ -763,7 +755,6 @@ 

  %define kernel_modules_package() \

  %package %{?1:%{1}-}modules\

  Summary: kernel modules to match the %{?2:%{2}-}core kernel\

- Group: System Environment/Kernel\

  Provides: kernel%{?1:-%{1}}-modules-%{_target_cpu} = %{version}-%{release}\

  Provides: kernel-modules-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\

  Provides: kernel-modules = %{version}-%{release}%{?1:+%{1}}\

@@ -783,7 +774,6 @@ 

  %define kernel_meta_package() \

  %package %{1}\

  summary: kernel meta-package for the %{1} kernel\

- group: system environment/kernel\

  Requires: kernel-%{1}-core-uname-r = %{KVERREL}%{?variant}+%{1}\

  Requires: kernel-%{1}-modules-uname-r = %{KVERREL}%{?variant}+%{1}\

  Provides: installonlypkg(kernel)\

@@ -799,7 +789,6 @@ 

  %define kernel_variant_package(n:) \

  %package %{?1:%{1}-}core\

  Summary: %{variant_summary}\

- Group: System Environment/Kernel\

  Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\

  Provides: installonlypkg(kernel)\

  %{expand:%%kernel_reqprovconf}\

@@ -1296,14 +1285,15 @@ 

      # 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

  

@@ -1601,7 +1591,6 @@ 

  %ifnarch noarch

  %global __debug_package 1

  %files -f debugfiles.list debuginfo-common-%{_target_cpu}

- %defattr(-,root,root)

  %endif

  

  %endif

@@ -1784,27 +1773,22 @@ 

  

  %if %{with_headers}

  %files headers

- %defattr(-,root,root)

  /usr/include/*

  %endif

  

  %if %{with_cross_headers}

  %files cross-headers

- %defattr(-,root,root)

  /usr/*-linux-gnu/include/*

  %endif

  

  %if %{with_bootwrapper}

  %files bootwrapper

- %defattr(-,root,root)

  /usr/sbin/*

  %{_libdir}/kernel-wrapper

  %endif

  

  # empty meta-package

  %files

- %defattr(-,root,root)

- 

  # This is %%{image_install_path} on an arch where that includes ELF files,

  # or empty otherwise.

  %define elf_image_install_path %{?kernel_image_elf:%{image_install_path}}

@@ -1816,8 +1800,7 @@ 

  #

  %define kernel_variant_files(k:) \

  %if %{2}\

- %{expand:%%files -f kernel-%{?3:%{3}-}core.list %{?3:%{3}-}core}\

- %defattr(-,root,root)\

+ %{expand:%%files -f kernel-%{?3:%{3}-}core.list %{?1:-f kernel-%{?3:%{3}-}ldsoconf.list} %{?3:%{3}-}core}\

  %{!?_licensedir:%global license %%doc}\

  %license linux-%{KVERREL}/COPYING\

  /lib/modules/%{KVERREL}%{?3:+%{3}}/%{?-k:%{-k*}}%{!?-k:vmlinuz}\

@@ -1842,33 +1825,27 @@ 

  /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}\

- %defattr(-,root,root)\

  %{expand:%%files %{?3:%{3}-}devel}\

- %defattr(-,root,root)\

  %defverify(not mtime)\

  /usr/src/kernels/%{KVERREL}%{?3:+%{3}}\

  %{expand:%%files %{?3:%{3}-}modules-extra}\

- %defattr(-,root,root)\

  /lib/modules/%{KVERREL}%{?3:+%{3}}/extra\

  %if %{with_debuginfo}\

  %ifnarch noarch\

  %{expand:%%files -f debuginfo%{?3}.list %{?3:%{3}-}debuginfo}\

- %defattr(-,root,root)\

  %endif\

  %endif\

  %if %{?3:1} %{!?3:0}\

  %{expand:%%files %{3}}\

- %defattr(-,root,root)\

  %endif\

  %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

  

This is related to the simplification of ldconfig scriptlets: by avoiding an empty "placeholder" file /etc/ld.so.conf.d/kernel-<version>.conf, we avoid the need to run ldconfig needlessly from a transfiletrigger (https://bugzilla.redhat.com/show_bug.cgi?id=1381764).

Koji scratch build: https://koji.fedoraproject.org/koji/taskinfo?taskID=25367168

Both changes look good to me, thanks!

Commit 4b0b138 fixes this pull-request

Pull-Request has been merged by jcline

2 years ago

Pull-Request has been merged by jcline

2 years ago
Metadata