Magellan Linux

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

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2747 by niro, Thu Feb 6 13:07:22 2014 UTC revision 2748 by niro, Wed Aug 13 14:04:10 2014 UTC
# Line 9  runarch-script() Line 9  runarch-script()
9   local arch="$1"   local arch="$1"
10   local script="$2"   local script="$2"
11   local buildroot   local buildroot
12     local os_arch
13    
14   # only allow the right arches   # only allow the right arches
15   case ${arch} in   case ${arch} in
16   i*86|x86_64) buildroot="${BUILDROOT}/${arch}" ;;   i*86|x86_64) buildroot="${BUILDROOT}/${arch}"; os_arch="${arch}" ;;
17   src) arch="$(source ${BUILDSERVER_CONFIG_DIR}/profiles/${BUILDROOT_PROFILE}/src/mage.rc; echo ${ARCH})"; buildroot="${BUILDROOT}/src" ;;   src) os_arch="$(source ${BUILDSERVER_CONFIG_DIR}/profiles/${BUILDROOT_PROFILE}/src/mage.rc; echo ${ARCH})"; buildroot="${BUILDROOT}/src" ;;
18   *) die "unknown architecture '${arch}'" ;;   *) die "unknown architecture '${arch}'" ;;
19   esac   esac
20    
21   [ -f ${buildroot}/${script} ] || die "'${buildroot}/${script}' does not exist."   [ -f ${buildroot}/${script} ] || die "'${buildroot}/${script}' does not exist."
22    
23   setarch "${arch}" systemd-nspawn \   setarch "${os_arch}" systemd-nspawn \
24   --directory="${buildroot}" \   --directory="${buildroot}" \
25   --bind=${BUILDROOT}/tmp/mage-tree:/usr/mage \   --bind=${BUILDROOT}/tmp/mage-tree:/usr/mage \
26   --bind=${BUILDROOT}/svn/mage/include:/usr/mage/include \   --bind=${BUILDROOT}/svn/mage/include:/usr/mage/include \
# Line 28  runarch-script() Line 29  runarch-script()
29   --bind=${BUILDROOT}/packages/${arch}:/var/cache/mage/packages \   --bind=${BUILDROOT}/packages/${arch}:/var/cache/mage/packages \
30   --bind=${BUILDROOT}/packages/src:/var/cache/mage/src-packages \   --bind=${BUILDROOT}/packages/src:/var/cache/mage/src-packages \
31   --bind=${BUILDROOT}/meta/${arch}:/var/cache/mage/meta \   --bind=${BUILDROOT}/meta/${arch}:/var/cache/mage/meta \
32     --bind=/usr/lib/mage-buildserver/helper:/usr/lib/mage-buildserver \
33     --bind=${BUILDROOT}/build-info/${arch}:/var/cache/mage-buildserver \
34     --bind=${BUILDROOT}/ssh:/root/.ssh \
35   bash --login "${script}" \   bash --login "${script}" \
36   || die "runarch-script '${script}' for '${arch}' failed."   || die "runarch-script '${script}' for '${arch}' failed."
37    
38     # wait for container to exit
39     sleep 1
40  }  }
41    
42  runarch()  runarch()

Legend:
Removed from v.2747  
changed lines
  Added in v.2748