Patchwork unfs-server: Fix do_configure so it can be re-executed safely

login
register
mail settings
Submitter Richard Purdie
Date April 15, 2012, 1:02 p.m.
Message ID <1334494922.16992.10.camel@ted>
Download mbox | patch
Permalink /patch/25865/
State Accepted
Commit 43e6fec78e36beb770fd47b0c4631d7382025d6b
Headers show

Comments

Richard Purdie - April 15, 2012, 1:02 p.m.
[YOCTO #2194]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
Khem Raj - April 16, 2012, 6:35 a.m.
On Sun, Apr 15, 2012 at 6:02 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> [YOCTO #2194]
>

this was my issue I guess too since I was chosing gold for default
linker on arm and x86
and that was causing issues of rexecuting this. This was due to the
fact that I had a variabled called
LDISGOLD which differed in sstate signatures between mips and x86

> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> diff --git a/meta/recipes-devtools/unfs-server/unfs-server_2.1+2.2beta47.bb b/meta/recipes-devtools/unfs-server/unfs-server_2.1+2.2beta47.bb
> index 4e619c5..d03c153 100644
> --- a/meta/recipes-devtools/unfs-server/unfs-server_2.1+2.2beta47.bb
> +++ b/meta/recipes-devtools/unfs-server/unfs-server_2.1+2.2beta47.bb
> @@ -62,7 +62,9 @@ do_configure_prepend () {
>     # 64-bit architectures:
>     rm -f *_xdr.c
>
> -    mv aclocal.m4 acinclude.m4
> +    if [ ! -f ${S}/acinclude.m4 ]; then
> +        mv ${S}/aclocal.m4 ${S}/acinclude.m4
> +    fi
>  }
>
>  # This recipe is intended for -native and -nativesdk builds only,
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-devtools/unfs-server/unfs-server_2.1+2.2beta47.bb b/meta/recipes-devtools/unfs-server/unfs-server_2.1+2.2beta47.bb
index 4e619c5..d03c153 100644
--- a/meta/recipes-devtools/unfs-server/unfs-server_2.1+2.2beta47.bb
+++ b/meta/recipes-devtools/unfs-server/unfs-server_2.1+2.2beta47.bb
@@ -62,7 +62,9 @@  do_configure_prepend () {
     # 64-bit architectures:
     rm -f *_xdr.c
 
-    mv aclocal.m4 acinclude.m4
+    if [ ! -f ${S}/acinclude.m4 ]; then
+        mv ${S}/aclocal.m4 ${S}/acinclude.m4
+    fi
 }
 
 # This recipe is intended for -native and -nativesdk builds only,