Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41612378 authored by Mike Marciniszyn's avatar Mike Marciniszyn Committed by Michal Marek
Browse files

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: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent 3c9c7a14

scripts/package/mkspec

+5 −4
Original line number Diff line number Diff line
@@ -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"