]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - src/patches/suse-2.6.27.31/patches.rpmify/no-include-asm
Move xen patchset to new version's subdir.
[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.rpmify / no-include-asm
diff --git a/src/patches/suse-2.6.27.31/patches.rpmify/no-include-asm b/src/patches/suse-2.6.27.31/patches.rpmify/no-include-asm
new file mode 100644 (file)
index 0000000..9ad2644
--- /dev/null
@@ -0,0 +1,33 @@
+From: Takashi Iwai <tiwai@suse.de>
+Subject: [PATCH] kbuild: correctly link include/asm in external builds
+Patch-mainline: 2.6.27?
+
+Looking at this problem now, and found that it's likely a bug in the
+upstream.  The patch below should fix the creation of include2/asm
+symlink, which resulted in build errors.
+
+
+Takashi
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+
+---
+ Makefile |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/Makefile
++++ b/Makefile
+@@ -937,7 +937,11 @@ ifneq ($(KBUILD_SRC),)
+       fi;
+       $(Q)if [ ! -d include2 ]; then                                  \
+           mkdir -p include2;                                          \
+-          ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm;     \
++          if [ -d $(srctree)/arch/$(SRCARCH)/include/asm ]; then      \
++              ln -fsn $(srctree)/arch/$(SRCARCH)/include/asm include2/asm; \
++          else                                                        \
++              ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm; \
++          fi;                                                         \
+       fi
+ endif