aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeniy Manachkin <sfstudio@mail.ru>2008-10-15 23:37:26 +0600
committerSam Ravnborg <sam@ravnborg.org>2008-10-29 22:02:06 +0100
commit46dca86cb93db80992a45e4b55737ff2b2f61cd0 (patch)
tree69c3b08f47ca49e144b17e8a72624658ca7e4a88
parente946217e4fdaa67681bbabfa8e6b18641921f750 (diff)
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: Evgeniy Manachkin <sfstudio@mail.ru> Acked-by: Alan Cox <alan@redhat.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Stable <stable@kernel.org>
-rwxr-xr-xscripts/package/mkspec3
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index ffd61fe0c1a..62c5ffdf2fd 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -64,8 +64,10 @@ fi
echo "%install"
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 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{_smp_mflags} modules_install'
@@ -92,5 +94,6 @@ echo "%files"
echo '%defattr (-, root, root)'
echo "%dir /lib/modules"
echo "/lib/modules/$KERNELRELEASE"
+echo "/lib/firmware"
echo "/boot/*"
echo ""