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.
Unified · Split
| @@ -77,13 +77,14 @@ echo "%install" · 76 unmodified lines | ||
| 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/" |
| @@ -125,7 +126,7 @@ echo "%files" · 35 unmodified lines | ||
| 125 | 126 | echo '%defattr (-, root, root)' |
| 126 | 127 | echo "%dir /lib/modules" |
| 127 | 128 | echo "/lib/modules/$KERNELRELEASE" |
| 128 | −echo "/lib/firmware" | |
| 129 | +echo "/lib/firmware/$KERNELRELEASE" | |
| 129 | 130 | echo "/boot/*" |
| 130 | 131 | echo "" |
| 131 | 132 | echo "%files headers" |