Commit 46dca86c authored by Evgeniy Manachkin's avatar Evgeniy Manachkin Committed by Sam Ravnborg
Browse files

kbuild: mkspec - fix build rpm 



This is patch to fix incorrect mkspec script to make rpm correctly at 2.6.27 vanilla kernel.
This is regression in 2.6.27. 2.6.26 make rpm work good.
In 2.6.27 'make rpm' say error from rpmbuild "Many unpacked files (*.fw)."

Signed-off-by: default avatarEvgeniy Manachkin <sfstudio@mail.ru>
Acked-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Stable <stable@kernel.org>
parent e946217e

scripts/package/mkspec

+3 −0
Original line number Original line Diff line number Diff line
@@ -64,8 +64,10 @@ fi 
echo "%install"

echo "%install"

echo "%ifarch ia64"

echo "%ifarch ia64"

echo 'mkdir -p $RPM_BUILD_ROOT/boot/efi $RPM_BUILD_ROOT/lib/modules'

echo 'mkdir -p $RPM_BUILD_ROOT/boot/efi $RPM_BUILD_ROOT/lib/modules'

echo 'mkdir -p $RPM_BUILD_ROOT/lib/firmware'

echo "%else"

echo "%else"

echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM_BUILD_ROOT/lib/modules'

echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM_BUILD_ROOT/lib/modules'

echo 'mkdir -p $RPM_BUILD_ROOT/lib/firmware'

echo "%endif"

echo "%endif"





echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{_smp_mflags} modules_install'

echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{_smp_mflags} modules_install'
@@ -92,5 +94,6 @@ echo "%files" 
echo '%defattr (-, root, root)'

echo '%defattr (-, root, root)'

echo "%dir /lib/modules"

echo "%dir /lib/modules"

echo "/lib/modules/$KERNELRELEASE"

echo "/lib/modules/$KERNELRELEASE"

echo "/lib/firmware"

echo "/boot/*"

echo "/boot/*"

echo ""
 
echo ""

CRA Git | Maintained and supported by SUSTech CRA and CCSE