diff --git a/debian/changelog b/debian/changelog index 658a35cbd..10baed612 100644 --- a/debian/changelog +++ b/debian/changelog @@ -73,6 +73,9 @@ linux-2.6 (2.6.29-5) UNRELEASED; urgency=low - forcedeth: Fix resume from hibernation regression. * Ignore ABI change. + [ Jurij Smakov ] + * [sparc] Fix build + -- dann frazier Mon, 04 May 2009 13:40:51 -0600 linux-2.6 (2.6.29-4) unstable; urgency=low diff --git a/debian/patches/bugfix/sparc/ftbfs.patch b/debian/patches/bugfix/sparc/ftbfs.patch new file mode 100644 index 000000000..ff86e41e2 --- /dev/null +++ b/debian/patches/bugfix/sparc/ftbfs.patch @@ -0,0 +1,25 @@ +diff -urpN linux-source-2.6.29.orig/arch/sparc/boot/Makefile linux-source-2.6.29/arch/sparc/boot/Makefile +--- linux-source-2.6.29.orig/arch/sparc/boot/Makefile 2009-03-23 17:12:14.000000000 -0600 ++++ linux-source-2.6.29/arch/sparc/boot/Makefile 2009-05-15 16:14:09.000000000 -0600 +@@ -79,6 +79,9 @@ $(obj)/image: vmlinux FORCE + $(call if_changed,strip) + @echo ' kernel: $@ is ready' + ++$(obj)/zImage: $(obj)/image ++ $(call if_changed,gzip) ++ + $(obj)/tftpboot.img: vmlinux $(obj)/piggyback_64 System.map $(ROOT_IMG) FORCE + $(call if_changed,elftoaout) + $(call if_changed,piggy) +diff -urpN linux-source-2.6.29.orig/arch/sparc/Makefile linux-source-2.6.29/arch/sparc/Makefile +--- linux-source-2.6.29.orig/arch/sparc/Makefile 2009-03-23 17:12:14.000000000 -0600 ++++ linux-source-2.6.29/arch/sparc/Makefile 2009-05-15 16:14:44.000000000 -0600 +@@ -91,6 +91,8 @@ endif + + boot := arch/sparc/boot + ++all: zImage ++ + image zImage tftpboot.img vmlinux.aout: vmlinux + $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ + diff --git a/debian/patches/series/5 b/debian/patches/series/5 index afbcfe9db..6d08854c2 100644 --- a/debian/patches/series/5 +++ b/debian/patches/series/5 @@ -6,3 +6,4 @@ - bugfix/all/drm-intel.git-f544847fbaf099278343f875987a983f2b913134.patch + bugfix/all/stable/2.6.29.3.patch + bugfix/all/stable/2.6.29.3-abi-1.patch ++ bugfix/sparc/ftbfs.patch