| From jejb@kernel.org Tue Nov 4 11:41:57 2008 |
| From: Evgeniy Manachkin <sfstudio@mail.ru> |
| Date: Thu, 30 Oct 2008 23:10:14 GMT |
| Subject: kbuild: mkspec - fix build rpm |
| To: jejb@kernel.org, stable@kernel.org |
| Message-ID: <200810302310.m9UNAE1C020732@hera.kernel.org> |
| |
| From: Evgeniy Manachkin <sfstudio@mail.ru> |
| |
| commit 46dca86cb93db80992a45e4b55737ff2b2f61cd0 upstream |
| Date: Wed, 15 Oct 2008 23:37:26 +0600 |
| Subject: 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| scripts/package/mkspec | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| --- 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 "" |
