]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blob - src/patches/suse-2.6.27.31/patches.rpmify/no-include-asm
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
[people/teissler/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.rpmify / no-include-asm
1 From: Takashi Iwai <tiwai@suse.de>
2 Subject: [PATCH] kbuild: correctly link include/asm in external builds
3 Patch-mainline: 2.6.27?
4
5 Looking at this problem now, and found that it's likely a bug in the
6 upstream. The patch below should fix the creation of include2/asm
7 symlink, which resulted in build errors.
8
9
10 Takashi
11
12 Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 ---
14
15 ---
16 Makefile | 6 +++++-
17 1 file changed, 5 insertions(+), 1 deletion(-)
18
19 --- a/Makefile
20 +++ b/Makefile
21 @@ -938,7 +938,11 @@ ifneq ($(KBUILD_SRC),)
22 fi;
23 $(Q)if [ ! -d include2 ]; then \
24 mkdir -p include2; \
25 - ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm; \
26 + if [ -d $(srctree)/arch/$(SRCARCH)/include/asm ]; then \
27 + ln -fsn $(srctree)/arch/$(SRCARCH)/include/asm include2/asm; \
28 + else \
29 + ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm; \
30 + fi; \
31 fi
32 endif
33