--- trunk/mage-buildserver/buildserver-prepare.sh	2014/08/13 14:28:18	2749
+++ trunk/mage-buildserver/buildserver-prepare.sh	2014/08/28 09:38:38	2792
@@ -7,12 +7,12 @@
 
 source ${BUILDSERVER_LIB_DIR}/buildserver-functions.sh
 
-# override
-#BUILDROOT="/mnt/test-buildroot"
-#BUILD_ARCH=( x86_64 i686 )
-#BUILDROOT_PROFILE="R11"
-#SMAGE_SVN_REPO="svn://cvs.magellan-linux.de/smage/trunk"
-#MAGE_SVN_REPO="svn://cvs.magellan-linux.de/mage/trunk"
+# fallback
+if [[ -z ${MAGE_PROFILE} ]]
+then
+	echo "Warning: using '${BUILDROOT_PROFILE}' as MAGE_PROFILE. You should define MAGE_PROFILE in the profile.conf."
+	MAGE_PROFILE="${BUILDROOT_PROFILE}"
+fi
 
 if [ ! -f ${BUILDROOT}/.stamps/mage_svn-checkout-ok ]
 then
@@ -21,11 +21,11 @@
 
 # create buildroot layout
 install -d ${BUILDROOT}/.stamps
-install -d ${BUILDROOT}/tmp/mage-tree
 install -d ${BUILDROOT}/ssh
 for arch in ${BUILD_ARCH[*]} src
 do
 	install -d ${BUILDROOT}/${arch}
+	install -d ${BUILDROOT}/mage-tree/${arch}
 	install -d ${BUILDROOT}/packages/${arch}
 	install -d ${BUILDROOT}/meta/${arch}
 	install -d ${BUILDROOT}/build-info/${arch}
@@ -41,7 +41,7 @@
 		mage-bootstrap \
 			--root ${BUILDROOT}/${arch} \
 			--magerc ${BUILDSERVER_CONFIG_DIR}/profiles/${BUILDROOT_PROFILE}/${arch}/mage.rc \
-			--profile "${BUILDROOT_PROFILE}" \
+			--profile "${MAGE_PROFILE}" \
 			--basesystem "${BOOTSTRAP_BASESYSTEM}" \
 			|| die "'${arch}' bootstrap"
 		touch ${BUILDROOT}/.stamps/${arch}_bootstrap-ok