[PATCH] Fix 100% initramfs bloat in 2.6.17 versus 2.6.16

[PATCH] Fix 100% initramfs bloat in 2.6.17 versus 2.6.16

[Nix]

When I built 2.6.17 for the first time I was a little surprised to see
my kernel putting on >500Kb in weight.

It didn't take long to work out that this was because my initramfs's
contents were being included twice in the cpio image.

A make V=1 makes the problem obvious:

/bin/sh /usr/packages/linux/versions/i686-loki/scripts/gen_initramfs_list.sh -l  "usr/initramfs" > usr/.initramfs_data.cpio.gz.d
  /bin/sh /usr/packages/linux/versions/i686-loki/scripts/gen_initramfs_list.sh -o usr/initramfs_data.cpio.gz  -u 0  -g 0  "usr/initramfs"  "usr/initramfs"

Note that doubling-up of the "usr/initramfs", which leads to
gen_initramfs_list.sh dumping the thing into the cpio archive twice.

The cause is an obvious pasto, fixed thusly:

Signed-off-by: Nick Alcock <nix@esperi.org.uk>

diff -durN linux-orig/usr/Makefile linux/usr/Makefile
--- linux-orig/usr/Makefile	2006-06-21 00:07:10.000000000 +0100
+++ linux/usr/Makefile	2006-06-21 00:09:29.000000000 +0100
@@ -33,7 +33,7 @@
 endif
 
 quiet_cmd_initfs = GEN     $@
-      cmd_initfs = $(initramfs) -o $@ $(ramfs-args) $(ramfs-input)
+      cmd_initfs = $(initramfs) -o $@ $(ramfs-args)
 
 targets := initramfs_data.cpio.gz
 $(deps_initramfs): klibcdirs

-- 
`NB: Anyone suggesting that we should say "Tibibytes" instead of
 Terabytes there will be hunted down and brutally slain.
 That is all.' --- Matthew Wilcox

Re: [PATCH] Fix 100% initramfs bloat in 2.6.17 versus 2.6.16

[Nix]

On 21 Jun 2006, nix@esperi.org.uk stipulated:
> It didn't take long to work out that this was because my initramfs's
> contents were being included twice in the cpio image.

Ping? Anyone?

-- 
`NB: Anyone suggesting that we should say "Tibibytes" instead of
 Terabytes there will be hunted down and brutally slain.
 That is all.' --- Matthew Wilcox

Re: [PATCH] Fix 100% initramfs bloat in 2.6.17 versus 2.6.16

[Sam Ravnborg]

On Mon, Jun 26, 2006 at 06:57:45PM +0100, Nix wrote:
> On 21 Jun 2006, nix@esperi.org.uk stipulated:
> > It didn't take long to work out that this was because my initramfs's
> > contents were being included twice in the cpio image.
> 
> Ping? Anyone?
It is included in kbuild.git - and Linus has been asked to pull that
tree. It is also forwarded to stable@kernel.org for inclusion in next
stable release.

	Sam

Re: [PATCH] Fix 100% initramfs bloat in 2.6.17 versus 2.6.16

[Nix]

On 26 Jun 2006, Sam Ravnborg moaned:
> On Mon, Jun 26, 2006 at 06:57:45PM +0100, Nix wrote:
>> On 21 Jun 2006, nix@esperi.org.uk stipulated:
>> > It didn't take long to work out that this was because my initramfs's
>> > contents were being included twice in the cpio image.
>> 
>> Ping? Anyone?
> It is included in kbuild.git - and Linus has been asked to pull that
> tree. It is also forwarded to stable@kernel.org for inclusion in next
> stable release.

Ah. I checked hpa's git tree and the upstream, but for some reason
not kbuild.git.

Sorry for the noise.

-- 
`NB: Anyone suggesting that we should say "Tibibytes" instead of
 Terabytes there will be hunted down and brutally slain.
 That is all.' --- Matthew Wilcox