From: Chris Wright Date: Tue, 27 Jun 2006 18:53:54 +0000 (-0700) Subject: kbuild initramfs fix, fwd from Sam X-Git-Tag: v2.6.17.2~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fbc78dd40f59c4538c94db112bd80379768fa564;p=thirdparty%2Fkernel%2Fstable-queue.git kbuild initramfs fix, fwd from Sam --- diff --git a/queue-2.6.17/kbuild-fix-100-initramfs-bloat-in-2.6.17-versus-2.6.16.patch b/queue-2.6.17/kbuild-fix-100-initramfs-bloat-in-2.6.17-versus-2.6.16.patch new file mode 100644 index 00000000000..e8c7df93b11 --- /dev/null +++ b/queue-2.6.17/kbuild-fix-100-initramfs-bloat-in-2.6.17-versus-2.6.16.patch @@ -0,0 +1,43 @@ +From stable-bounces@linux.kernel.org Sun Jun 25 03:05:24 2006 +Date: Sun, 25 Jun 2006 12:04:36 +0200 +From: Sam Ravnborg +To: stable@kernel.org +Cc: +Subject: kbuild: Fix 100% initramfs bloat in 2.6.17 versus 2.6.16 + +From: 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 +Signed-off-by: Sam Ravnborg +Signed-off-by: Chris Wright +--- + usr/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- linux-2.6.17.1.orig/usr/Makefile ++++ linux-2.6.17.1/usr/Makefile +@@ -33,7 +33,7 @@ ifneq ($(wildcard $(obj)/.initramfs_data + 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 diff --git a/queue-2.6.17/series b/queue-2.6.17/series index a63aecdb300..0906124d2a3 100644 --- a/queue-2.6.17/series +++ b/queue-2.6.17/series @@ -18,3 +18,4 @@ ipv6-addrconf-fix-default-source-address-selection-without-config_ipv6_privacy.p ohci1394-fix-broken-suspend-resume-in-ohci1394.patch libata-minor-patch-for-ata_dflag_pio.patch ide-io-increase-timeout-value-to-allow-for-slave-wakeup.patch +kbuild-fix-100-initramfs-bloat-in-2.6.17-versus-2.6.16.patch