From c4a8cb3d4b476886b53ff4c94d3bfa2958228070 Mon Sep 17 00:00:00 2001 From: Kees Jongenburger Date: Mon, 26 May 2014 16:47:45 +0200 Subject: [PATCH] build:Only keep one ref to .settings and allow to override it. 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 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/releasetools/arm_sdimage.sh b/releasetools/arm_sdimage.sh index 6b777595a..03ab49e46 100755 --- a/releasetools/arm_sdimage.sh +++ b/releasetools/arm_sdimage.sh @@ -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}