From 1364ce009ece39d7cc496fdf9109dbbb80bfea36 Mon Sep 17 00:00:00 2001 From: patacongo Date: Fri, 11 Feb 2011 01:30:40 +0000 Subject: [PATCH] Don' depend on uname -o working git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3281 42af7a65-404d-4744-a932-0658087f49c3 --- configs/mcu123-lpc214x/nsh/Make.defs | 4 ++-- configs/mcu123-lpc214x/ostest/Make.defs | 4 ++-- configs/mcu123-lpc214x/usbserial/Make.defs | 4 ++-- configs/mcu123-lpc214x/usbstorage/Make.defs | 4 ++-- configs/olimex-strp711/nettest/Make.defs | 4 ++-- configs/olimex-strp711/nsh/Make.defs | 4 ++-- configs/olimex-strp711/ostest/Make.defs | 4 ++-- configs/olimex-strp711/scripts/oocd.sh | 2 +- configs/sim/mount/Make.defs | 4 ++-- configs/sim/nettest/Make.defs | 4 ++-- configs/sim/nsh/Make.defs | 4 ++-- configs/sim/nx/Make.defs | 4 ++-- configs/sim/ostest/Make.defs | 4 ++-- configs/sim/pashello/Make.defs | 4 ++-- 14 files changed, 27 insertions(+), 27 deletions(-) diff --git a/configs/mcu123-lpc214x/nsh/Make.defs b/configs/mcu123-lpc214x/nsh/Make.defs index b869bec359c..2cdf1e01165 100644 --- a/configs/mcu123-lpc214x/nsh/Make.defs +++ b/configs/mcu123-lpc214x/nsh/Make.defs @@ -1,7 +1,7 @@ ############################################################################## # configs/mcu123-lpc214x/nsh/Make.defs # -# Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -51,7 +51,7 @@ NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump -HOSTOS = ${shell uname -o} +HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"} ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'} ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1} diff --git a/configs/mcu123-lpc214x/ostest/Make.defs b/configs/mcu123-lpc214x/ostest/Make.defs index b2f12b6774f..ce5c685d750 100644 --- a/configs/mcu123-lpc214x/ostest/Make.defs +++ b/configs/mcu123-lpc214x/ostest/Make.defs @@ -1,7 +1,7 @@ ############################################################################## # configs/mcu123-lpc214x/ostest/Make.defs # -# Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -51,7 +51,7 @@ NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump -HOSTOS = ${shell uname -o} +HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"} ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'} ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1} diff --git a/configs/mcu123-lpc214x/usbserial/Make.defs b/configs/mcu123-lpc214x/usbserial/Make.defs index f572099b8a2..dcea1189b44 100644 --- a/configs/mcu123-lpc214x/usbserial/Make.defs +++ b/configs/mcu123-lpc214x/usbserial/Make.defs @@ -1,7 +1,7 @@ ############################################################################## # configs/mcu123-lpc214x/usbserial/Make.defs # -# Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -51,7 +51,7 @@ NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump -HOSTOS = ${shell uname -o} +HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"} ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'} ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1} diff --git a/configs/mcu123-lpc214x/usbstorage/Make.defs b/configs/mcu123-lpc214x/usbstorage/Make.defs index 8640374922b..6167faa265c 100644 --- a/configs/mcu123-lpc214x/usbstorage/Make.defs +++ b/configs/mcu123-lpc214x/usbstorage/Make.defs @@ -1,7 +1,7 @@ ############################################################################## # configs/mcu123-lpc214x/usbstorage/Make.defs # -# Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -51,7 +51,7 @@ NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump -HOSTOS = ${shell uname -o} +HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"} ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'} ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1} diff --git a/configs/olimex-strp711/nettest/Make.defs b/configs/olimex-strp711/nettest/Make.defs index 391691e8f1c..718a9385193 100755 --- a/configs/olimex-strp711/nettest/Make.defs +++ b/configs/olimex-strp711/nettest/Make.defs @@ -1,7 +1,7 @@ ############################################################################## # configs/olimex-strp711/nettest/Make.defs # -# Copyright (C) 2010 Gregory Nutt. All rights reserved. +# Copyright (C) 2010-2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -51,7 +51,7 @@ NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump -HOSTOS = ${shell uname -o} +HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"} ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'} ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1} diff --git a/configs/olimex-strp711/nsh/Make.defs b/configs/olimex-strp711/nsh/Make.defs index 3cff99873ec..094b6c23929 100644 --- a/configs/olimex-strp711/nsh/Make.defs +++ b/configs/olimex-strp711/nsh/Make.defs @@ -1,7 +1,7 @@ ############################################################################## # configs/olimex-strp711/nsh/Make.defs # -# Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -51,7 +51,7 @@ NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump -HOSTOS = ${shell uname -o} +HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"} ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'} ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1} diff --git a/configs/olimex-strp711/ostest/Make.defs b/configs/olimex-strp711/ostest/Make.defs index 1fdfb750dd6..498fdf52dc8 100644 --- a/configs/olimex-strp711/ostest/Make.defs +++ b/configs/olimex-strp711/ostest/Make.defs @@ -1,7 +1,7 @@ ############################################################################## # configs/olimex-strp711/ostest/Make.defs # -# Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -51,7 +51,7 @@ NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump -HOSTOS = ${shell uname -o} +HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"} ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'} ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1} diff --git a/configs/olimex-strp711/scripts/oocd.sh b/configs/olimex-strp711/scripts/oocd.sh index 556d9779801..f0ba817618b 100755 --- a/configs/olimex-strp711/scripts/oocd.sh +++ b/configs/olimex-strp711/scripts/oocd.sh @@ -2,7 +2,7 @@ # Set up pathes to binaries, scripts, configuration files -hostos=`uname -o` +hostos=`uname -o 2>/dev/null || echo "Other"` if [ "X${hostos}" = "XCygwin" ]; then installdir=/cygdrive/c/gccfd/openocd/bin ft2exe=$installdir/openocd-ftd2xx.exe diff --git a/configs/sim/mount/Make.defs b/configs/sim/mount/Make.defs index 4bad4c1835c..ea1921f185a 100644 --- a/configs/sim/mount/Make.defs +++ b/configs/sim/mount/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/sim/mount/Make.defs # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ include ${TOPDIR}/.config -HOSTOS = ${shell uname -o} +HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"} ifeq ($(CONFIG_DEBUG_SYMBOLS),y) ARCHOPTIMIZATION = -g diff --git a/configs/sim/nettest/Make.defs b/configs/sim/nettest/Make.defs index d00f5e923b5..087debc1e4c 100644 --- a/configs/sim/nettest/Make.defs +++ b/configs/sim/nettest/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/sim/Make.defs # -# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2008, 2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ include ${TOPDIR}/.config -HOSTOS = ${shell uname -o} +HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"} ifeq ($(CONFIG_DEBUG_SYMBOLS),y) ARCHOPTIMIZATION = -g diff --git a/configs/sim/nsh/Make.defs b/configs/sim/nsh/Make.defs index 163224b7af9..74086dccd98 100644 --- a/configs/sim/nsh/Make.defs +++ b/configs/sim/nsh/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/sim/nsh/Make.defs # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ include ${TOPDIR}/.config -HOSTOS = ${shell uname -o} +HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"} ifeq ($(CONFIG_DEBUG_SYMBOLS),y) ARCHOPTIMIZATION = -g diff --git a/configs/sim/nx/Make.defs b/configs/sim/nx/Make.defs index 2c5ae3ced16..47ebec10104 100644 --- a/configs/sim/nx/Make.defs +++ b/configs/sim/nx/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/sim/nx/Make.defs # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ include ${TOPDIR}/.config -HOSTOS = ${shell uname -o} +HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"} ifeq ($(CONFIG_DEBUG_SYMBOLS),y) ARCHOPTIMIZATION = -g diff --git a/configs/sim/ostest/Make.defs b/configs/sim/ostest/Make.defs index d00f5e923b5..087debc1e4c 100644 --- a/configs/sim/ostest/Make.defs +++ b/configs/sim/ostest/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/sim/Make.defs # -# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2008, 2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ include ${TOPDIR}/.config -HOSTOS = ${shell uname -o} +HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"} ifeq ($(CONFIG_DEBUG_SYMBOLS),y) ARCHOPTIMIZATION = -g diff --git a/configs/sim/pashello/Make.defs b/configs/sim/pashello/Make.defs index 7060ae542b6..0ec9e909b10 100644 --- a/configs/sim/pashello/Make.defs +++ b/configs/sim/pashello/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/sim/pashello/Make.defs # -# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2008, 2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ include ${TOPDIR}/.config -HOSTOS = ${shell uname -o} +HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"} ifeq ($(CONFIG_DEBUG_SYMBOLS),y) ARCHOPTIMIZATION = -g