Patchwork [U-Boot] mkconfig: fix failure on boards that don't define soc

login
register
mail settings
Submitter Allen Martin
Date Aug. 7, 2012, 12:04 a.m.
Message ID <1344297868-20469-1-git-send-email-amartin@nvidia.com>
Download mbox | patch
Permalink /patch/175477/
State Superseded
Delegated to: Albert ARIBAUD
Headers show

Comments

Allen Martin - Aug. 7, 2012, 12:04 a.m.
Fix a configure failure on boards that don't define soc.  The exit
status of the subshell was propogating up and causing mkconfig to
fail.  Add an explicit exit 0 to the subshell to fix this.

Signed-off-by: Allen Martin <amartin@nvidia.com>
---
 mkconfig |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Allen Martin - Aug. 7, 2012, 12:07 a.m.
On Mon, Aug 06, 2012 at 05:04:28PM -0700, Allen Martin wrote:
> Fix a configure failure on boards that don't define soc.  The exit
> status of the subshell was propogating up and causing mkconfig to
> fail.  Add an explicit exit 0 to the subshell to fix this.
> 
> Signed-off-by: Allen Martin <amartin@nvidia.com>

I ran a full MAKEALL -a arm on a system where I reproduced the failure
on jornada previously and it ran clean.


-Allen
Mike Frysinger - Aug. 7, 2012, 12:11 a.m.
Acked-by: Mike Frysinger <vapier@gentoo.org>
-mike
Albert ARIBAUD - Aug. 7, 2012, 6:54 a.m.
Hi Allen,

On Mon, 6 Aug 2012 17:07:25 -0700, Allen Martin <amartin@nvidia.com> wrote:
> On Mon, Aug 06, 2012 at 05:04:28PM -0700, Allen Martin wrote:
> > Fix a configure failure on boards that don't define soc.  The exit
> > status of the subshell was propogating up and causing mkconfig to
> > fail.  Add an explicit exit 0 to the subshell to fix this.
> > 
> > Signed-off-by: Allen Martin <amartin@nvidia.com>
> 
> I ran a full MAKEALL -a arm on a system where I reproduced the failure
> on jornada previously and it ran clean.
> 
> 
> -Allen

Sorry, Allen, missed this. I'd rather have this fix directly corrected in the
original tegra/master commit so that bisecting remains feasible around this.
 
Amicalement,

Patch

diff --git a/mkconfig b/mkconfig
index 07031c6..d3363c6 100755
--- a/mkconfig
+++ b/mkconfig
@@ -144,7 +144,8 @@  fi
     echo "BOARD  = ${board}"
 
     [ "${vendor}" ] && echo "VENDOR = ${vendor}"
-    [ "${soc}"    ] && echo "SOC    = ${soc}" ) > config.mk
+    [ "${soc}"    ] && echo "SOC    = ${soc}"
+    exit 0 ) > config.mk
 
 # Assign board directory to BOARDIR variable
 if [ -z "${vendor}" ] ; then