]> Zhao Yanbai Git Server - minix.git/commitdiff
build:Only keep one ref to .settings and allow to override it.
authorKees Jongenburger <kees.jongenburger@gmail.com>
Mon, 26 May 2014 14:47:45 +0000 (16:47 +0200)
committerLionel Sambuc <lionel@minix3.org>
Mon, 28 Jul 2014 15:05:38 +0000 (17:05 +0200)
Rreleasetools/arm_sdimage.sh uses a ".settings" file to allow to override
the defaults settings found in arm_sdimage. This change allows to use an
alternate file for this purpose. We figured out more programs (like eclipse)
use a ".settings" file.

One can tweak the settings files to use by settings the SETTINGS_MINIX
variable

 SETTING_MINIX=.settings_minix

Change-Id: I57f5ca64d2ac27c9e015ab24b864b9a5f14c42fb

http://gerrit.minix3.org/#/c/2687/

releasetools/arm_sdimage.sh

index 6b777595a0f323d83987530a9da0fb4197cc36bc..03ab49e46a75f851a0d0083f4c5005482065f0b6 100755 (executable)
@@ -4,13 +4,14 @@ set -e
 #
 # Source settings if present
 #
-if [ -f .settings  ]
+: ${SETTINGS_MINIX=.settings}
+if [ -f "${SETTINGS_MINIX}"  ]
 then
-       echo "Sourcing settings from .settings"
+       echo "Sourcing settings from ${SETTINGS_MINIX}"
        # Display the content (so we can check in the build logs
        # what the settings contain.
-       cat .settings | sed "s,^,CONTENT ,g"
-       . .settings
+       cat ${SETTINGS_MINIX} | sed "s,^,CONTENT ,g"
+       . ${SETTINGS_MINIX}
 fi
 
 : ${ARCH=evbearm-el}