Magellan Linux

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

    Diff of /trunk/mage-buildserver/buildserver-upload-smage.sh

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

    revision 2733 by niro, Sun Aug 10 19:38:18 2014 UTC revision 2837 by niro, Wed Sep 24 09:31:17 2014 UTC
    # Line 6  source ${BUILDSERVER_CONFIG_DIR}/buildse Line 6  source ${BUILDSERVER_CONFIG_DIR}/buildse
    6    
    7  source ${BUILDSERVER_LIB_DIR}/buildserver-functions.sh  source ${BUILDSERVER_LIB_DIR}/buildserver-functions.sh
    8    
     # 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"  
       
    9  SMAGEFILE="$1"  SMAGEFILE="$1"
    10    
    11  if [[ -z ${SMAGEFILE} ]]  if [[ -z ${SMAGEFILE} ]]
    # Line 20  then Line 13  then
    13   die "no smage file given. call '$(basename $0) with/relative/path/from/buildroot/svn/smage/to/smagefile'"   die "no smage file given. call '$(basename $0) with/relative/path/from/buildroot/svn/smage/to/smagefile'"
    14  fi  fi
    15    
    16  for arch in ${BUILD_ARCH[*]} src  for arch in src $(enum-build-arch-types)
    17  do  do
    18    
    19   echo "SMAGEFILE=\"${SMAGEFILE}\"" > ${BUILDROOT}/${arch}/.runrc   echo "SMAGEFILE=\"${SMAGEFILE}\"" > ${BUILDROOT}/${arch}/.runrc
    20   echo "PKG_SCP_REPO=\"${PKG_SCP_REPO}\"" >> ${BUILDROOT}/${arch}/.runrc   echo "PKG_SCP_REPO=\"${PKG_SCP_REPO}\"" >> ${BUILDROOT}/${arch}/.runrc
    21   echo "BUILD_ARCH=\"${arch}\"" >> ${BUILDROOT}/${arch}/.runrc   echo "BUILD_ARCH=\"${arch}\"" >> ${BUILDROOT}/${arch}/.runrc
    22  cat >> ${BUILDROOT}/${arch}/.runrc << "EOF"  cat >> ${BUILDROOT}/${arch}/.runrc << "EOF"
     env-rebuild  
     source /etc/profile  
       
    23  if [ -f /etc/rc.d/init.d/functions ]  if [ -f /etc/rc.d/init.d/functions ]
    24  then  then
    25   source /etc/rc.d/init.d/functions   source /etc/rc.d/init.d/functions
    # Line 61  else Line 51  else
    51   die "${MLIBDIR}/smage2.functions.sh not found"   die "${MLIBDIR}/smage2.functions.sh not found"
    52  fi  fi
    53    
    54    env-rebuild
    55    source /etc/profile
    56    
    57  # override die function  # override die function
    58  die()  die()
    59  {  {
    # Line 71  die() Line 64  die()
    64  load_mage_features  load_mage_features
    65  mage_setup  mage_setup
    66    
    67  if [ -f /var/cache/mage/smage/${SMAGEFILE} ]  if [ -f ${SMAGESCRIPTSDIR}/${SMAGEFILE} ]
    68  then  then
    69   smagesource /var/cache/mage/smage/${SMAGEFILE}   # be silent
    70     FVERBOSE=off \
    71     SILENT=1 \
    72     smagesource ${SMAGESCRIPTSDIR}/${SMAGEFILE}
    73  else  else
    74   die "smagefile '/var/cache/mage/smage/${SMAGEFILE}' not found."   die "smagefile '${SMAGESCRIPTSDIR}/${SMAGEFILE}' not found."
    75  fi  fi
    76    
    77  if [[ ${BUILD_ARCH} = src ]]  if [[ ${BUILD_ARCH} = src ]]
    # Line 101  else Line 97  else
    97   export PNAME="${subpackage}"   export PNAME="${subpackage}"
    98   split_info_${PNAME}   split_info_${PNAME}
    99    
    100   TARGET_PKGFILE+=( "/var/cache/mage/packages/${PNAME}-${PVER}-${BUILD_ARCH}$(print_distrotag)-${PBUILD}.${PKGSUFFIX}" )   if [[ ${PKGTYPE} != virtual ]]
    101     then
    102     TARGET_PKGFILE+=( "${PKGDIR}/${PNAME}-${PVER}-${BUILD_ARCH}$(print_distrotag)-${PBUILD}.${PKGSUFFIX}" )
    103     fi
    104    
    105   # restore smage environment   # restore smage environment
    106   split_restore_variables   split_restore_variables
    # Line 109  else Line 108  else
    108   # unset all saved smage variables   # unset all saved smage variables
    109   split_unset_variables   split_unset_variables
    110   else   else
    111   TARGET_PKGFILE=( "/var/cache/mage/packages/${PNAME}-${PVER}-${BUILD_ARCH}$(print_distrotag)-${PBUILD}.${PKGSUFFIX}" )   if [[ ${PKGTYPE} != virtual ]]
    112     then
    113     TARGET_PKGFILE=( "${PKGDIR}/${PNAME}-${PVER}-${BUILD_ARCH}$(print_distrotag)-${PBUILD}.${PKGSUFFIX}" )
    114     fi
    115   fi   fi
    116    
    117   for i in ${TARGET_PKGFILE}   for i in ${TARGET_PKGFILE[*]}
    118   do   do
    119   if [ ! -f ${i} ]   if [ ! -f ${i} ]
    120   then   then
    Legend:
    Removed from v.2733  
    changed lines
      Added in v.2837