[PATCH] kbuild: Fix creation of include2/asm symlink

[PATCH] kbuild: Fix creation of include2/asm symlink

[Takashi Iwai]

The directory include2/asm can point wrongly to a non-existing
directory on architectures that have moved include/asm under arch/*.

This patch fixes it by checking firstly whether arch/*/include/asm is
available.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
diff --git a/Makefile b/Makefile
index 53bf6ec..bcbb764 100644
--- a/Makefile
+++ b/Makefile
@@ -934,7 +934,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
 

Re: [PATCH] kbuild: Fix creation of include2/asm symlink

[Sam Ravnborg]

On Fri, Aug 15, 2008 at 03:45:58PM +0200, Takashi Iwai wrote:
> The directory include2/asm can point wrongly to a non-existing
> directory on architectures that have moved include/asm under arch/*.
> 
> This patch fixes it by checking firstly whether arch/*/include/asm is
> available.

Hi Takashi.

I understand why you try to avoid include2/asm as it is not pretty.
And I had a similar patch once - but I dropped it as the symlink do
not harm and it will anyway be gone when the remaining architectures
has shifted to use arch/$ARCH/include/...

So I will not apply it.

	Sam

Re: [PATCH] kbuild: Fix creation of include2/asm symlink

[Takashi Iwai]

At Fri, 15 Aug 2008 21:49:54 +0200,
Sam Ravnborg wrote:
> 
> On Fri, Aug 15, 2008 at 03:45:58PM +0200, Takashi Iwai wrote:
> > The directory include2/asm can point wrongly to a non-existing
> > directory on architectures that have moved include/asm under arch/*.
> > 
> > This patch fixes it by checking firstly whether arch/*/include/asm is
> > available.
> 
> Hi Takashi.
> 
> I understand why you try to avoid include2/asm as it is not pretty.
> And I had a similar patch once - but I dropped it as the symlink do
> not harm and it will anyway be gone when the remaining architectures
> has shifted to use arch/$ARCH/include/...
> 
> So I will not apply it.

Hm, OK.  Originally I fixed it because our build system has a sanity
check against bogus symlinks and refused to package the latest kernel.
If you don't want to put it in, we can keep it locally, of course.
But, a bogus symlink is definitely not pretty...


thanks,

Takashi

Re: [PATCH] kbuild: Fix creation of include2/asm symlink

[Sam Ravnborg]

On Sat, Aug 16, 2008 at 11:03:51AM +0200, Takashi Iwai wrote:
> At Fri, 15 Aug 2008 21:49:54 +0200,
> Sam Ravnborg wrote:
> > 
> > On Fri, Aug 15, 2008 at 03:45:58PM +0200, Takashi Iwai wrote:
> > > The directory include2/asm can point wrongly to a non-existing
> > > directory on architectures that have moved include/asm under arch/*.
> > > 
> > > This patch fixes it by checking firstly whether arch/*/include/asm is
> > > available.
> > 
> > Hi Takashi.
> > 
> > I understand why you try to avoid include2/asm as it is not pretty.
> > And I had a similar patch once - but I dropped it as the symlink do
> > not harm and it will anyway be gone when the remaining architectures
> > has shifted to use arch/$ARCH/include/...
> > 
> > So I will not apply it.
> 
> Hm, OK.  Originally I fixed it because our build system has a sanity
> check against bogus symlinks and refused to package the latest kernel.
> If you don't want to put it in, we can keep it locally, of course.
> But, a bogus symlink is definitely not pretty...

It will go away as soon as all architextures are moved to use arch/$ARCH/include

	Sam

Re: [PATCH] kbuild: Fix creation of include2/asm symlink

[Takashi Iwai]

At Sun, 17 Aug 2008 20:37:14 +0200,
Sam Ravnborg wrote:
> 
> On Sat, Aug 16, 2008 at 11:03:51AM +0200, Takashi Iwai wrote:
> > At Fri, 15 Aug 2008 21:49:54 +0200,
> > Sam Ravnborg wrote:
> > > 
> > > On Fri, Aug 15, 2008 at 03:45:58PM +0200, Takashi Iwai wrote:
> > > > The directory include2/asm can point wrongly to a non-existing
> > > > directory on architectures that have moved include/asm under arch/*.
> > > > 
> > > > This patch fixes it by checking firstly whether arch/*/include/asm is
> > > > available.
> > > 
> > > Hi Takashi.
> > > 
> > > I understand why you try to avoid include2/asm as it is not pretty.
> > > And I had a similar patch once - but I dropped it as the symlink do
> > > not harm and it will anyway be gone when the remaining architectures
> > > has shifted to use arch/$ARCH/include/...
> > > 
> > > So I will not apply it.
> > 
> > Hm, OK.  Originally I fixed it because our build system has a sanity
> > check against bogus symlinks and refused to package the latest kernel.
> > If you don't want to put it in, we can keep it locally, of course.
> > But, a bogus symlink is definitely not pretty...
> 
> It will go away as soon as all architextures are moved to use arch/$ARCH/include

Yes, if it's removed, then that's fine, of course.
But I wonder whether this will be finished during 2.6.27...?


thanks,

Takashi