Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

rpm-pkg: install firmware files in kernel relative directory

Prior to this patch, firmware files were being installed
in /lib/firmware with a potential conflict with already
installed kernels.

firmware files are now installed in /lib/firmware/<release>
and packaged with the rest of the modules.

Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>

authored by

Mike Marciniszyn and committed by
Michal Marek
41612378 3c9c7a14

+5 -4
+5 -4
scripts/package/mkspec
··· 77 77 echo 'KBUILD_IMAGE=$(make image_name)' 78 78 echo "%ifarch ia64" 79 79 echo 'mkdir -p $RPM_BUILD_ROOT/boot/efi $RPM_BUILD_ROOT/lib/modules' 80 - echo 'mkdir -p $RPM_BUILD_ROOT/lib/firmware' 81 80 echo "%else" 82 81 echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM_BUILD_ROOT/lib/modules' 83 - echo 'mkdir -p $RPM_BUILD_ROOT/lib/firmware' 84 82 echo "%endif" 83 + echo 'mkdir -p $RPM_BUILD_ROOT'"/lib/firmware/$KERNELRELEASE" 85 84 86 - echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{?_smp_mflags} KBUILD_SRC= modules_install' 85 + echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{?_smp_mflags} KBUILD_SRC= mod-fw= modules_install' 86 + echo 'INSTALL_FW_PATH=$RPM_BUILD_ROOT'"/lib/firmware/$KERNELRELEASE" 87 + echo 'make INSTALL_FW_PATH=$INSTALL_FW_PATH' firmware_install 87 88 echo "%ifarch ia64" 88 89 echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/efi/vmlinuz-$KERNELRELEASE" 89 90 echo 'ln -s '"efi/vmlinuz-$KERNELRELEASE" '$RPM_BUILD_ROOT'"/boot/" ··· 126 125 echo '%defattr (-, root, root)' 127 126 echo "%dir /lib/modules" 128 127 echo "/lib/modules/$KERNELRELEASE" 129 - echo "/lib/firmware" 128 + echo "/lib/firmware/$KERNELRELEASE" 130 129 echo "/boot/*" 131 130 echo "" 132 131 echo "%files headers"