From: Chris Wright <chrisw@sous-sol.org>
Date: Thu, 29 Jun 2006 21:40:22 +0000 (-0700)
Subject: replace kbuild initramfs fix with proper fix from Linus' tree
X-Git-Tag: v2.6.17.2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0560d32dc51676e4a9495302f04b5b0bd95ee7d9;p=thirdparty%2Fkernel%2Fstable-queue.git

replace kbuild initramfs fix with proper fix from Linus' tree
---

diff --git a/review-2.6.17/kbuild-fix-100-initramfs-bloat-in-2.6.17-versus-2.6.16.patch b/rejects/kbuild-fix-100-initramfs-bloat-in-2.6.17-versus-2.6.16.patch
similarity index 100%
rename from review-2.6.17/kbuild-fix-100-initramfs-bloat-in-2.6.17-versus-2.6.16.patch
rename to rejects/kbuild-fix-100-initramfs-bloat-in-2.6.17-versus-2.6.16.patch
diff --git a/review-2.6.17/kbuild-bugfix-with-initramfs.patch b/review-2.6.17/kbuild-bugfix-with-initramfs.patch
new file mode 100644
index 00000000000..73b26bae9a5
--- /dev/null
+++ b/review-2.6.17/kbuild-bugfix-with-initramfs.patch
@@ -0,0 +1,26 @@
+From ff5417107b7615fcef772cabcb717f4a715ffadc Mon Sep 17 00:00:00 2001
+From: Nickolay <nickolay@protei.ru>
+Date: Fri, 9 Jun 2006 21:24:14 +0400
+Subject: kbuild: bugfix with initramfs
+
+This patch fix double inclusion of ramfs-input.
+
+Signed-off-by: Nickolay Vinogradov <nickolay@protei.ru>
+Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+ usr/Makefile |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- linux-2.6.17.1.orig/usr/Makefile
++++ linux-2.6.17.1/usr/Makefile
+@@ -21,8 +21,7 @@ ramfs-input := $(if $(filter-out "",$(CO
+                     $(CONFIG_INITRAMFS_SOURCE),-d)
+ ramfs-args  := \
+         $(if $(CONFIG_INITRAMFS_ROOT_UID), -u $(CONFIG_INITRAMFS_ROOT_UID)) \
+-        $(if $(CONFIG_INITRAMFS_ROOT_GID), -g $(CONFIG_INITRAMFS_ROOT_GID)) \
+-        $(ramfs-input)
++        $(if $(CONFIG_INITRAMFS_ROOT_GID), -g $(CONFIG_INITRAMFS_ROOT_GID))
+ 
+ # .initramfs_data.cpio.gz.d is used to identify all files included
+ # in initramfs and to detect if any files are added/removed.
diff --git a/review-2.6.17/series b/review-2.6.17/series
index 2a5a4e77352..f163dc1157c 100644
--- a/review-2.6.17/series
+++ b/review-2.6.17/series
@@ -18,7 +18,7 @@ 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
+kbuild-bugfix-with-initramfs.patch
 link-error-when-futexes-are-disabled-on-64bit-architectures.patch
 idr-fix-race-in-idr-code.patch
 input-return-correct-size-when-reading-modalias-attribute.patch