[kernel] r7535 - dists/trunk/linux-2.6/debian/patches

[Bastian Blank]

Author: waldi
Date: Wed Sep 27 08:40:20 2006
New Revision: 7535

Modified:
   dists/trunk/linux-2.6/debian/patches/powerpc-build-links.patch

Log:
debian/patches/powerpc-build-links.patch:
Also fixup compatibility symlink in the ppc tree.


Modified: dists/trunk/linux-2.6/debian/patches/powerpc-build-links.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/powerpc-build-links.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/powerpc-build-links.patch	Wed Sep 27 08:40:20 2006
@@ -1,6 +1,8 @@
+diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
+index 01667d1..4d650e1 100644
 --- a/arch/powerpc/Makefile
 +++ b/arch/powerpc/Makefile
-@@ -179,7 +179,7 @@ ifeq ($(CONFIG_PPC32),y)
+@@ -177,7 +177,7 @@ # Temporary hack until we have migrated 
  include/asm: arch/$(ARCH)/include/asm
  arch/$(ARCH)/include/asm: FORCE
  	$(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$(ARCH)/include; fi
@@ -9,3 +11,16 @@
  endif
  
  # Use the file '.tmp_gas_check' for binutils tests, as gas won't output
+diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile
+index 0db66dc..8523a15 100644
+--- a/arch/ppc/Makefile
++++ b/arch/ppc/Makefile
+@@ -116,7 +116,7 @@ # Temporary hack until we have migrated 
+ include/asm: arch/$(ARCH)/include/asm
+ arch/$(ARCH)/include/asm:
+ 	$(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$(ARCH)/include; fi
+-	$(Q)ln -fsn $(srctree)/include/asm-powerpc arch/$(ARCH)/include/asm
++	$(Q)ln -fsn $(if $(KBUILD_SRC),$(KBUILD_SRC),../../..)/include/asm-powerpc arch/$(ARCH)/include/asm
+ 
+ # Use the file '.tmp_gas_check' for binutils tests, as gas won't output
+ # to stdout and these checks are run even on install targets.