Diff of /trunk/mage-buildserver/buildserver-functions.sh

Parent Directory | Revision Log | Patch

	revision 2776 by niro, Thu Aug 28 09:10:55 2014 UTC	revision 2816 by niro, Mon Sep 8 14:59:12 2014 UTC
#	Line 26  runarch-script()	Line 26  runarch-script()
26
27	# only allow the right arches	# only allow the right arches
28	case ${arch} in	case ${arch} in
29	i*86|x86_64) buildroot="${BUILDROOT}/${arch}"; os_arch="${arch}" ;;	i*86|x86_64|src|playground*) buildroot="${BUILDROOT}/${arch}"; os_arch="$(os-arch ${arch})" ;;
	src) os_arch="$(source ${BUILDSERVER_CONFIG_DIR}/profiles/${BUILDROOT_PROFILE}/src/mage.rc; echo ${ARCH})"; buildroot="${BUILDROOT}/src" ;;
30	*) die "unknown architecture '${arch}'" ;;	*) die "unknown architecture '${arch}'" ;;
31	esac	esac
32
#	Line 35  runarch-script()	Line 34  runarch-script()
34
35	setarch "${os_arch}" systemd-nspawn \	setarch "${os_arch}" systemd-nspawn \
36	--directory="${buildroot}" \	--directory="${buildroot}" \
37	--bind=${BUILDROOT}/tmp/mage-tree:/usr/mage \	--bind=${BUILDROOT}/mage-tree/${arch}:/usr/mage \
38	--bind=${BUILDROOT}/svn/mage/include:/usr/mage/include \	--bind=${BUILDROOT}/svn/mage/include:/usr/mage/include \
39	--bind=${BUILDROOT}/svn/mage/profiles:/usr/mage/profiles \	--bind=${BUILDROOT}/svn/mage/profiles:/usr/mage/profiles \
40	--bind=${BUILDROOT}/svn/smage:/var/cache/mage/smage \	--bind=${BUILDROOT}/svn/smage:/var/cache/mage/smage \
#	Line 45  runarch-script()	Line 44  runarch-script()
44	--bind=/usr/lib/mage-buildserver/helper:/usr/lib/mage-buildserver \	--bind=/usr/lib/mage-buildserver/helper:/usr/lib/mage-buildserver \
45	--bind=${BUILDROOT}/build-info/${arch}:/var/cache/mage-buildserver \	--bind=${BUILDROOT}/build-info/${arch}:/var/cache/mage-buildserver \
46	--bind=${BUILDROOT}/ssh:/root/.ssh \	--bind=${BUILDROOT}/ssh:/root/.ssh \
47		--bind=${BUILDROOT}/log/smage/${arch}:/var/log/smage \
48	bash --login "${script}" \	bash --login "${script}" \
49	|| die "runarch-script '${script}' for '${arch}' failed."	|| die "runarch-script '${script}' for '${arch}' failed."
50
#	Line 62  runarch()	Line 62  runarch()
62
63	# only allow the right arches	# only allow the right arches
64	case ${arch} in	case ${arch} in
65	i*86|x86_64|src) buildroot="${BUILDROOT}/${arch}"; runrc="${buildroot}/.runrc" ;;	i*86|x86_64|src|playground*) buildroot="${BUILDROOT}/${arch}"; runrc="${buildroot}/.runrc" ;;
66	*) die "unknown architecture '${arch}'" ;;	*) die "unknown architecture '${arch}'" ;;
67	esac	esac
68
69	# create runrc	# create runrc
70	echo "${cmd}" > "${runrc}"	echo "${cmd}" > "${runrc}"
71	runarch-script "${arch}" .runrc || die "runarch script execition of '${runrc}' failed."	runarch-script "${arch}" .runrc || die "runarch script execution of '${runrc}' failed."
72
73	if [ -f "${runrc}" ]	if [ -f "${runrc}" ]
74	then	then

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.2776   changed lines   Added in v.2816