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/
This commit is contained in:
		
							parent
							
								
									51b1cfd6ea
								
							
						
					
					
						commit
						c4a8cb3d4b
					
				@ -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}
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user