diff options
| author | Mike Marciniszyn <mike.marciniszyn@intel.com> | 2013-06-24 10:38:28 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2013-07-23 14:36:44 +0200 |
| commit | 41612378da980cd98a0191c1307ff62d4ee20fb8 (patch) | |
| tree | d5c22266e72a36fe470eb73672a513c60f6fe57e /scripts/package | |
| parent | 3c9c7a14b6274074cc3af2b83d56a92547188f27 (diff) | |
| download | linux-41612378da980cd98a0191c1307ff62d4ee20fb8.tar.gz linux-41612378da980cd98a0191c1307ff62d4ee20fb8.tar.bz2 linux-41612378da980cd98a0191c1307ff62d4ee20fb8.zip | |
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>
Diffstat (limited to 'scripts/package')
| -rwxr-xr-x | scripts/package/mkspec | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/scripts/package/mkspec b/scripts/package/mkspec index 0aa6a242a900..514aeb2bb422 100755 --- a/scripts/package/mkspec +++ b/scripts/package/mkspec @@ -77,13 +77,14 @@ echo "%install" echo 'KBUILD_IMAGE=$(make image_name)' echo "%ifarch ia64" echo 'mkdir -p $RPM_BUILD_ROOT/boot/efi $RPM_BUILD_ROOT/lib/modules' -echo 'mkdir -p $RPM_BUILD_ROOT/lib/firmware' echo "%else" echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM_BUILD_ROOT/lib/modules' -echo 'mkdir -p $RPM_BUILD_ROOT/lib/firmware' echo "%endif" +echo 'mkdir -p $RPM_BUILD_ROOT'"/lib/firmware/$KERNELRELEASE" -echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{?_smp_mflags} KBUILD_SRC= modules_install' +echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{?_smp_mflags} KBUILD_SRC= mod-fw= modules_install' +echo 'INSTALL_FW_PATH=$RPM_BUILD_ROOT'"/lib/firmware/$KERNELRELEASE" +echo 'make INSTALL_FW_PATH=$INSTALL_FW_PATH' firmware_install echo "%ifarch ia64" echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/efi/vmlinuz-$KERNELRELEASE" echo 'ln -s '"efi/vmlinuz-$KERNELRELEASE" '$RPM_BUILD_ROOT'"/boot/" @@ -125,7 +126,7 @@ echo "%files" echo '%defattr (-, root, root)' echo "%dir /lib/modules" echo "/lib/modules/$KERNELRELEASE" -echo "/lib/firmware" +echo "/lib/firmware/$KERNELRELEASE" echo "/boot/*" echo "" echo "%files headers" |