Re: [U-Boot] [PATCH] Don't add symlink in srctree when using an objtree
On Fri, Dec 17, 2010, Wolfgang Denk wrote:
Thanks for the fix. A tiny change request, though:
- @rm -f $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
- @rm -f $(obj)include/asm/proc $(obj)include/asm/arch
- @[ ! -h $(obj)include/asm ] || rm -f $(obj)include/asm
- @[ ! -d $(obj)include/asm ] || rmdir $(obj)include/asm
Don't make it that complicated. Just change the line into @rm -fr$(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
I think I had this in my first version, but had an issue with it; I will retest
Also a question: how has this change been tested?
I did something like: a) start fresh: git clean -x -d b) configure with or without objdir make CROSS_COMPILE=arm-linux-gnueabi- O=$PWD/obj omap3_beagle_config c) build (with or without objdir) d) distclean (with or without objdir)
and tested combinations like a-d-d, a-b-d-d, a-b-c-d-d, then checked whether any file remained with git clean -x -d -n
On Sat, Dec 18, 2010, Loïc Minier wrote:
Don't make it that complicated. Just change the line into @rm -fr$(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
I think I had this in my first version, but had an issue with it; I will retest
This works just fine and is much simpler; thanks. I will send an updated patch to use this
Also a question: how has this change been tested?
I'm attaching a test script which, starting from a clean tree, will try to distclean, to configure + distclean, and finally to configure + build + distclean. It tries both with and without an objdir in all make calls, and checks whether the tree is really clean with: git clean -d -x -n.
This script uncovered another issue with .boards.depend which was not cleaned up by distclean O=foo because it's created in the srctree.
I will send a separate patch for this issue as well.
participants (1)
-
Loïc Minier