--- trunk/pkgtools/add2svn-r11.sh	2013/01/03 10:02:24	2017
+++ trunk/pkgtools/add2svn-r11.sh	2013/05/13 11:49:49	2117
@@ -74,8 +74,8 @@
 SRCPKGNAME=${CURPNAME}-${CURPVER}-${CURPBUILD}.${SRCPKGSUFFIX}
 REPO="$(echo ${SMAGEFILE#*trunk/} | cut -d'/' -f1)"
 #REPO="$(echo ${SMAGEFILE#*branches/magellan-next/} | cut -d'/' -f1)"
-SSHLOGIN="tjoke@magellan-linux.de:/var/www/htdocs/magellan/magellan-dev/R11/packages"
-SRCTARBALL_URI="http://magellan-linux.de/magellan/magellan-dev/R11/packages/src"
+SSHLOGIN="tjoke@magellan-linux.de:/var/www/htdocs/magellan/R11/packages"
+SRCTARBALL_URI="http://magellan-linux.de/magellan/R11/packages/src"
 
 die()
 {
@@ -119,6 +119,9 @@
 	source /etc/mage.rc.global
 	source /etc/mage.rc
 
+	# set the right arch
+	ARCH="${CURARCH}"
+
 	# evaluate the value
 	source ${file} $> /dev/null
 
@@ -141,6 +144,9 @@
 	source /etc/mage.rc.global
 	source /etc/mage.rc
 
+	# set the right arch
+	ARCH="${CURARCH}"
+
 	# evaluate the value
 	source ${file} $> /dev/null
 	export -f ${function}
@@ -154,6 +160,7 @@
 	INSTALLDB_BUILDROOT=$(get_value_from_file INSTALLDB ${BUILDROOT}/etc/mage.rc)
 fi
 CURSPLITPACKAGES="$(get_value_from_file SPLIT_PACKAGES ${SMAGEFILE})"
+PKGTYPE="$(get_value_from_file PKGTYPE ${SMAGEFILE})"
 
 # set some proper traps
 trap "trap_exit" SIGINT SIGTERM
@@ -179,8 +186,7 @@
 then
 	if [[ -d ${BUILDROOT}/${INSTALLDB_BUILDROOT}/${CURPCAT}/${CURPNAME}-${CURPVER}-${CURPBUILD} ]]
 	then
-		echo "Package '${CURPCAT}/${CURPNAME}-${CURPVER}-${CURPBUILD}' already installed in ${BUILDROOT}. Aborting!"
-		exit 1
+		die "Package '${CURPCAT}/${CURPNAME}-${CURPVER}-${CURPBUILD}' already installed in ${BUILDROOT}. Aborting!"
 	fi
 else
 	for i in ${CURSPLITPACKAGES}
@@ -197,8 +203,7 @@
 		do
 			echo "     ${i}"
 		done
-		echo "Aborted."
-		exit 1
+		die "Aborted."
 	fi
 fi
 
@@ -259,6 +264,8 @@
 	echo '[[ -f \${SRCTARBALL} ]] && rm \${SRCTARBALL}' >> ${BUILDROOT}/.installrc
 	echo 'popd > /dev/null' >> ${BUILDROOT}/.installrc
 echo 'fi' >> ${BUILDROOT}/.installrc
+echo '[ ! -d /BUILDED ] && install -d /BUILDED' >> ${BUILDROOT}/.installrc
+echo '[ ! -d /BUILDED/sources ] && install -d /BUILDED/sources' >> ${BUILDROOT}/.installrc
 echo 'if [[ ! -z \${CURSPLITPACKAGES} ]]' >> ${BUILDROOT}/.installrc
 echo 'then' >> ${BUILDROOT}/.installrc
 	echo 'for package in \${CURSPLITPACKAGES}' >> ${BUILDROOT}/.installrc
@@ -274,7 +281,7 @@
 echo 'rm -rf /var/cache/mage/sources/${CURPNAME}' >> ${BUILDROOT}/.installrc
 EOF
 
-sudo -H /sbin/chroot ${BUILDROOT} /bin/bash /.installrc
+sudo -H chroot ${BUILDROOT} /bin/bash /.installrc
 sudo rm ${BUILDROOT}/.installrc
 
 if [[ ! -z ${CURSPLITPACKAGES} ]]
@@ -305,7 +312,11 @@
 		fi
 	done
 else
-	if [[ -f ${BUILDROOT}/BUILDED/${PKGNAME} ]]
+	if [[ ${PKGTYPE} = virtual ]]
+	then
+		unset PKGTYPE
+		echo "Virtual Package: nothing to upload"
+	elif [[ -f ${BUILDROOT}/BUILDED/${PKGNAME} ]]
 	then
 		scp ${BUILDROOT}/BUILDED/${PKGNAME} ${SSHLOGIN}/${CURARCH}/
 	else