Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/mage-buildserver/buildserver-functions.sh

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

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

    revision 2778 by niro, Thu Aug 28 09:17:35 2014 UTC revision 2817 by niro, Mon Sep 8 14:59:56 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 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    
    # Line 98  enum-build-arch-types() Line 98  enum-build-arch-types()
    98   echo "${BUILD_ARCH[*]}"   echo "${BUILD_ARCH[*]}"
    99  }  }
    100    
    101  enum-all-arch-types()  enum-playground-arch-types()
    102  {  {
    103   local arch   local arch
    104   local build_arch_types   local build_arch_types
    105    
      for arch in src ${BUILD_ARCH[*]}  
      do  
      if [ ! -e ${BUILDSERVER_CONFIG_DIR}/profiles/${BUILDROOT_PROFILE}/${arch}/mage.rc ]  
      then  
      echo "Warning: mage.rc of '${arch}' not found. Arch '${arch}' ignored." >&2  
      else  
      build_arch_types+=( "${arch}" )  
      fi  
      done  
       
    106   if [[ ${BUILD_PLAYGROUND} -eq 1 ]]   if [[ ${BUILD_PLAYGROUND} -eq 1 ]]
    107   then   then
    108   for arch in ${BUILD_ARCH[*]}   for arch in ${BUILD_ARCH[*]}
    # Line 128  enum-all-arch-types() Line 118  enum-all-arch-types()
    118    
    119   echo "${build_arch_types[*]}"   echo "${build_arch_types[*]}"
    120  }  }
    121    
    122    enum-all-arch-types()
    123    {
    124     local arch
    125     local build_arch_types
    126    
    127     for arch in src $(enum-build-arch-types) $(enum-playground-arch-types)
    128     do
    129     if [ ! -e ${BUILDSERVER_CONFIG_DIR}/profiles/${BUILDROOT_PROFILE}/${arch}/mage.rc ]
    130     then
    131     echo "Warning: mage.rc of '${arch}' not found. Arch '${arch}' ignored." >&2
    132     else
    133     build_arch_types+=( "${arch}" )
    134     fi
    135     done
    136    
    137     echo "${build_arch_types[*]}"
    138    }
    Legend:
    Removed from v.2778  
    changed lines
      Added in v.2817