patch to 2.6.27 fix build rpm

patch to 2.6.27 fix build rpm

[Евгений Маначкин]

Latest working kernel version:2.6.26.6
Distribution: any
Hardware Environment: any
Software Environment: any
Problem Description: Build error from make rpm. Many unpacked files (*.fw).

Steps to reproduce: 

Add in .config:
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
CONFIG_FW_LOADER=y
CONFIG_FIRMWARE_IN_KERNEL=y
CONFIG_EXTRA_FIRMWARE=""

and say make rpm to build.

This patch for file linux-2.6.27/scripts/package/mkspec is fix this problem:


--- mkspec.old  2008-10-11 00:00:38.000000000 +0700
+++ mkspec      2008-10-11 00:39:43.000000000 +0700
@@ -64,8 +64,10 @@
 echo "%install"
 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/firmware'
 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/firmware'
 echo "%endif"

 echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{_smp_mflags} modules_install'
@@ -92,5 +94,6 @@
 echo '%defattr (-, root, root)'
 echo "%dir /lib/modules"
 echo "/lib/modules/$KERNELRELEASE"
+echo "/lib/firmware"
 echo "/boot/*"
 echo ""

С уважением, Маначкин Е.Р.
________________________________________
|Комплексные решения на базе Linux.
|Opensource wireless routers firmware
|www: http://wive-ng.sf.net
|mail-to: sfstudio@mail.ru
|ICQ: 485758428
|JID: sfstudio-omsk@jabber.ru

Re: patch to 2.6.27 fix build rpm

[Cyrill Gorcunov]

[Евгений Маначкин - Wed, Oct 15, 2008 at 08:04:02PM +0600]
| Latest working kernel version:2.6.26.6
| Distribution: any
| Hardware Environment: any
| Software Environment: any
| Problem Description: Build error from make rpm. Many unpacked files (*.fw).
| 
| Steps to reproduce: 
| 
| Add in .config:
| # CONFIG_PREVENT_FIRMWARE_BUILD is not set
| CONFIG_FW_LOADER=y
| CONFIG_FIRMWARE_IN_KERNEL=y
| CONFIG_EXTRA_FIRMWARE=""
| 
| and say make rpm to build.
| 
| This patch for file linux-2.6.27/scripts/package/mkspec is fix this problem:
| 
| 
| --- mkspec.old  2008-10-11 00:00:38.000000000 +0700
| +++ mkspec      2008-10-11 00:39:43.000000000 +0700
| @@ -64,8 +64,10 @@
|  echo "%install"
|  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/firmware'
|  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/firmware'
|  echo "%endif"
| 
|  echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{_smp_mflags} modules_install'
| @@ -92,5 +94,6 @@
|  echo '%defattr (-, root, root)'
|  echo "%dir /lib/modules"
|  echo "/lib/modules/$KERNELRELEASE"
| +echo "/lib/firmware"
|  echo "/boot/*"
|  echo ""
| 
| С уважением, Маначкин Е.Р.
| ________________________________________
| |Комплексные решения на базе Linux.
| |Opensource wireless routers firmware
| |www: http://wive-ng.sf.net
| |mail-to: sfstudio@mail.ru
| |ICQ: 485758428
| |JID: sfstudio-omsk@jabber.ru
| 
| 

Hi Евгений,

please use patch form described in Documentation/SubmittingPatches
(kernel source tree). Thanks.

		- Cyrill -

Re: Re: patch to 2.6.27 fix build rpm

[Евгений Маначкин]

This is OK ?

--- linux-2.6.27/scripts/package/mkspec.orig    2008-10-11 00:00:38.000000000 +0700
+++ linux-2.6.27/scripts/package/mkspec 2008-10-11 00:39:43.000000000 +0700
@@ -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/boot/efi $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/boot $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 ""

Re: Re: patch to 2.6.27 fix build rpm

[Cyrill Gorcunov]

[Евгений Маначкин - Wed, Oct 15, 2008 at 11:54:34PM +0700]
| This is OK ?
| 
| --- linux-2.6.27/scripts/package/mkspec.orig    2008-10-11 00:00:38.000000000 +0700
| +++ linux-2.6.27/scripts/package/mkspec 2008-10-11 00:39:43.000000000 +0700
| @@ -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/boot/efi $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/boot $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 ""
| 

Evgeniy, it should be something like that

---
From: Evgeniy Manachkin <sfstudio@mail.ru>
Subject: [PATCH] mkspec - fix build rpm

Patch description goes here

Signed-off-by: Evgeniy Manachkin <sfstudio@mail.ru>
---
Patch body goes here

I didn't check the patch just show you the form of patch submission.
For example -- take a look on

	http://lkml.org/lkml/2008/10/15/2
or
	http://lkml.org/lkml/2008/10/15/20

Actually SubmittingPatches has a quite good description how to
make it right :)

		- Cyrill -

Re: Re: Re: patch to 2.6.27 fix build rpm

[Евгений Маначкин]

From: Evgeniy Manachkin <sfstudio@mail.ru>
Subject: [PATCH] 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)." 
This is patch fix it this error.

Sorry my English.

Signed-off-by: Evgeniy Manachkin <sfstudio@mail.ru>

 --- linux-2.6.27/scripts/package/mkspec.orig    2008-10-11 00:00:38.000000000 +0700
 +++ linux-2.6.27/scripts/package/mkspec 2008-10-11 00:39:43.000000000 +0700
 @@ -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/boot/efi $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/boot $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 ""

Re: [PATCH] patch to 2.6.27 fix build rpm

[Alan Cox]

On Wed, 15 Oct 2008 23:37:26 +0600
Евгений Маначкин  <sfstudio@mail.ru> wrote:

> From: Evgeniy Manachkin <sfstudio@mail.ru>
> Subject: [PATCH] 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)." 
> This is patch fix it this error.
> 
> Sorry my English.
> 
> Signed-off-by: Evgeniy Manachkin <sfstudio@mail.ru>

Acked-by: Alan Cox <alan@redhat.com>

This should IMHO go straight into both upstream and 2.6.27.x as it is a
regression fix.

Alan

Re: [stable] [PATCH] patch to 2.6.27 fix build rpm

[Greg KH]

On Wed, Oct 15, 2008 at 06:46:52PM +0100, Alan Cox wrote:
> On Wed, 15 Oct 2008 23:37:26 +0600
> Евгений Маначкин  <sfstudio@mail.ru> wrote:
> 
> > From: Evgeniy Manachkin <sfstudio@mail.ru>
> > Subject: [PATCH] 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)." 
> > This is patch fix it this error.
> > 
> > Sorry my English.
> > 
> > Signed-off-by: Evgeniy Manachkin <sfstudio@mail.ru>
> 
> Acked-by: Alan Cox <alan@redhat.com>
> 
> This should IMHO go straight into both upstream and 2.6.27.x as it is a
> regression fix.

This doesn't seem to have gone into Linus's tree yet, can someone please
resend it?

Also be sure to cc: stable@kernel.org on this patch as well.

thanks,

greg k-h

Re: [stable] [PATCH] patch to 2.6.27 fix build rpm

[Randy Dunlap]

On Thu, 23 Oct 2008 13:46:28 -0700 Greg KH wrote:

> On Wed, Oct 15, 2008 at 06:46:52PM +0100, Alan Cox wrote:
> > On Wed, 15 Oct 2008 23:37:26 +0600
> > Евгений Маначкин  <sfstudio@mail.ru> wrote:
> > 
> > > From: Evgeniy Manachkin <sfstudio@mail.ru>
> > > Subject: [PATCH] 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)." 
> > > This is patch fix it this error.
> > > 
> > > Sorry my English.
> > > 
> > > Signed-off-by: Evgeniy Manachkin <sfstudio@mail.ru>
> > 
> > Acked-by: Alan Cox <alan@redhat.com>
> > 
> > This should IMHO go straight into both upstream and 2.6.27.x as it is a
> > regression fix.
> 
> This doesn't seem to have gone into Linus's tree yet, can someone please
> resend it?
> 
> Also be sure to cc: stable@kernel.org on this patch as well.

We are missing a Sam Ravnborg to merge it...

---
~Randy

Re: [stable] [PATCH] patch to 2.6.27 fix build rpm

[Sam Ravnborg]

On Thu, Oct 23, 2008 at 04:50:17PM -0700, Randy Dunlap wrote:
> On Thu, 23 Oct 2008 13:46:28 -0700 Greg KH wrote:
> 
> > On Wed, Oct 15, 2008 at 06:46:52PM +0100, Alan Cox wrote:
> > > On Wed, 15 Oct 2008 23:37:26 +0600
> > > Евгений Маначкин  <sfstudio@mail.ru> wrote:
> > > 
> > > > From: Evgeniy Manachkin <sfstudio@mail.ru>
> > > > Subject: [PATCH] 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)." 
> > > > This is patch fix it this error.
> > > > 
> > > > Sorry my English.
> > > > 
> > > > Signed-off-by: Evgeniy Manachkin <sfstudio@mail.ru>
> > > 
> > > Acked-by: Alan Cox <alan@redhat.com>
> > > 
> > > This should IMHO go straight into both upstream and 2.6.27.x as it is a
> > > regression fix.
> > 
> > This doesn't seem to have gone into Linus's tree yet, can someone please
> > resend it?
> > 
> > Also be sure to cc: stable@kernel.org on this patch as well.
> 
> We are missing a Sam Ravnborg to merge it...

Back online as of yesterday.
Please resend patch to me.

	Sam

Re: Re: Re: patch to 2.6.27 fix build rpm

[Cyrill Gorcunov]

[Евгений Маначкин - Wed, Oct 15, 2008 at 11:37:26PM +0600]
| From: Evgeniy Manachkin <sfstudio@mail.ru>
| Subject: [PATCH] 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)." 
| This is patch fix it this error.
| 
| Sorry my English.
| 
| Signed-off-by: Evgeniy Manachkin <sfstudio@mail.ru>
| 
|  --- linux-2.6.27/scripts/package/mkspec.orig    2008-10-11 00:00:38.000000000 +0700
|  +++ linux-2.6.27/scripts/package/mkspec 2008-10-11 00:39:43.000000000 +0700
|  @@ -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/boot/efi $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/boot $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 ""
| 

Much better thanks! Lets wait for LKML feedback.

P.S.
As I see you use Mail.ru web interface for patch submission
unfortunately it's not goot -- better use Thunderbird or something
like that since mPOP does mangle tabulators. There was some doc about
how to configure mail clients but I don't remember where is it (maybe
somewhere inside Documentations :-)

		- Cyrill -

Re: Re: Re: patch to 2.6.27 fix build rpm

[Ian Hilt]

On Wed, 15 Oct 2008, Cyrill Gorcunov wrote:
> P.S.
> As I see you use Mail.ru web interface for patch submission
> unfortunately it's not goot -- better use Thunderbird or something
> like that since mPOP does mangle tabulators. There was some doc about
> how to configure mail clients but I don't remember where is it (maybe
> somewhere inside Documentations :-)
> 
> 		- Cyrill -

Documentation/email-clients.txt

Re: Re: Re: patch to 2.6.27 fix build rpm

[Frans Pop]

Евгений Маначкин wrote:
>   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/firmware'
>   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/firmware'

Is it really necessary to make the first directory twice in both cases?

I would suggest changing the patch to simply:
 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'

Or even adding the creation of the firware dir to the original mkdirs.

Cheers,
FJP

Re: Re: Re: Re: patch to 2.6.27 fix build rpm

[Евгений Маначкин]

Ooops... You say true. Fix It.

--- linux-2.6.27/scripts/package/mkspec.orig    2008-10-11 00:00:38.000000000 +0700
+++ linux-2.6.27/scripts/package/mkspec 2008-10-16 02:02:19.000000000 +0700
@@ -63,9 +63,9 @@ 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/boot/efi $RPM_BUILD_ROOT/lib/modules $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/boot $RPM_BUILD_ROOT/lib/modules $RPM_BUILD_ROOT/lib/firmware'
 echo "%endif"

 echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{_smp_mflags} modules_install'
@@ -92,5 +92,6 @@ echo "%files"
 echo '%defattr (-, root, root)'
 echo "%dir /lib/modules"
 echo "/lib/modules/$KERNELRELEASE"
+echo "/lib/firmware"
 echo "/boot/*"
 echo ""

Re: patch to 2.6.27 fix build rpm

[H. Peter Anvin]

Евгений Маначкин wrote:
> 
>  --- linux-2.6.27/scripts/package/mkspec.orig    2008-10-11 00:00:38.000000000 +0700
>  +++ linux-2.6.27/scripts/package/mkspec 2008-10-11 00:39:43.000000000 +0700
>  @@ -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/boot/efi $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/boot $RPM_BUILD_ROOT/lib/firmware'
>   echo "%endif"
>  

Wouldn't:

echo 'mkdir -p $RPM_BUILD_ROOT/boot'
echo 'mkdir -p $RPM_BUILD_ROOT/lib/modules'
echo 'mkdir -p $RPM_BUILD_ROOT/lib/firmware'
echo "%ifarch ia64"
echo 'mkdir -p $RPM_BUILD_ROOT/boot/efi'
echo '%endif'

... be better?

	-hpa

Re: patch to 2.6.27 fix build rpm

[Alan Cox]

On Wed, 15 Oct 2008 23:54:34 +0700
Евгений Маначкин  <sfstudio@mail.ru> wrote:

> This is OK ?

Looks good but needs a signed-off-by line

Alan