[Xen-devel] [PATCH] fix 2.6.18 initramfs issues

[Ben Thomas <bthomas@xxxxxxxxxxxxxxx>]

2.6.18 has some issues with initramfs creation. After resolving the
issue, it was clear that this has also been fixed in 2.6.19. This
patch imports the changes from 2.6.19 to resolve the issue.

The signed-off-by line really only applies to the series file, as the
other changes are from 2.6.19

Signed-off-by: Ben Thomas (ben@xxxxxxxxxxxxxxx)

--
------------------------------------------------------------------------
Ben Thomas                                         Virtual Iron Software
bthomas@xxxxxxxxxxxxxxx                            Tower 1, Floor 2
978-849-1214                                       900 Chelmsford Street
                                                   Lowell, MA 01851

diff -r 00bacda7e268 patches/linux-2.6.18/linux-2.6.19-initramfs.patch
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/linux-2.6.18/linux-2.6.19-initramfs.patch Thu Jan 25 09:38:00 
2007 -0500
@@ -0,0 +1,41 @@
+diff -pruN ../orig-linux-2.6.18/usr/Makefile ./usr/Makefile
+--- ../orig-linux-2.6.18/usr/Makefile  2006-09-19 23:42:06.000000000 -0400
++++ ./usr/Makefile     2007-01-24 10:43:04.000000000 -0500
+@@ -3,6 +3,8 @@
+ #
+ 
+ klibcdirs:;
++PHONY += klibcdirs
++
+ 
+ # Generate builtin.o based on initramfs_data.o
+ obj-y := initramfs_data.o
+@@ -18,7 +20,7 @@
+ hostprogs-y := gen_init_cpio
+ initramfs   := $(CONFIG_SHELL) $(srctree)/scripts/gen_initramfs_list.sh
+ ramfs-input := $(if $(filter-out "",$(CONFIG_INITRAMFS_SOURCE)), \
+-                    $(CONFIG_INITRAMFS_SOURCE),-d)
++                      $(shell echo $(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))
+diff -pruN ../orig-linux-2.6.18/scripts/gen_initramfs_list.sh 
./scripts/gen_initramfs_list.sh
+--- ../orig-linux-2.6.18/scripts/gen_initramfs_list.sh 2007-01-24 
11:10:08.000000000 -0500
++++ ./scripts/gen_initramfs_list.sh    2007-01-10 14:10:37.000000000 -0500
+@@ -158,7 +158,7 @@
+ }
+ 
+ list_header() {
+-      echo "deps_initramfs := \\"
++      :
+ }
+ 
+ header() {
+@@ -227,6 +227,7 @@
+ case "$arg" in
+       "-l")   # files included in initramfs - used by kbuild
+               dep_list="list_"
++              echo "deps_initramfs := \\"
+               shift
+               ;;
+       "-o")   # generate gzipped cpio image named $1
diff -r 00bacda7e268 patches/linux-2.6.18/series
--- a/patches/linux-2.6.18/series       Thu Jan 25 09:38:00 2007 -0500
+++ b/patches/linux-2.6.18/series       Thu Jan 25 09:38:43 2007 -0500
@@ -18,3 +18,4 @@ x86-elfnote-as-preprocessor-macro.patch
 x86-elfnote-as-preprocessor-macro.patch
 fixaddr-top.patch
 git-c06cb8b1c4d25e5b4d7a2d7c2462619de1e0dbc4.patch
+linux-2.6.19-initramfs.patch

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel