Magellan Linux

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

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

revision 2729 by niro, Thu Feb 6 13:07:22 2014 UTC revision 2730 by niro, Sun Aug 10 19:35:40 2014 UTC
# Line 59  runarch src smage2 --create-src-tarball Line 59  runarch src smage2 --create-src-tarball
59  for arch in ${BUILD_ARCH[*]}  for arch in ${BUILD_ARCH[*]}
60  do  do
61   echo "SMAGEFILE=\"${SMAGEFILE}\"" > ${BUILDROOT}/${arch}/.runrc   echo "SMAGEFILE=\"${SMAGEFILE}\"" > ${BUILDROOT}/${arch}/.runrc
62     echo "BUILDSERVER_CONFIG_DIR=\"${BUILDSERVER_CONFIG_DIR}\"" >> ${BUILDROOT}/${arch}/.runrc
63  cat >> ${BUILDROOT}/${arch}/.runrc << "EOF"  cat >> ${BUILDROOT}/${arch}/.runrc << "EOF"
64  env-rebuild  env-rebuild
65  source /etc/profile  source /etc/profile
# Line 201  do Line 202  do
202  done  done
203  echo "----------------------"  echo "----------------------"
204    
205  echo "DEBUG: paused"; read  #echo "DEBUG: paused"; read
206    
207  # override packages path  # override packages path
208  SAVED_PKGDIR="${PKGDIR}"  SAVED_PKGDIR="${PKGDIR}"
# Line 279  do Line 280  do
280   pcat="$(magename2pcat ${pkg})"   pcat="$(magename2pcat ${pkg})"
281   pver="$(magename2pver ${pkg})"   pver="$(magename2pver ${pkg})"
282   pbuild="$(magename2pbuild ${pkg})"   pbuild="$(magename2pbuild ${pkg})"
283   if is_installed ${pcat}/${pname}-${pver}-${pbuild}   if [ -f ${BUILDSERVER_CONFIG_DIR}/protected/${pname} ]
284   then   then
285   if [[ -z ${uninstall_list} ]]   echo "'${pcat}/${pname}-${pver}-${pbuild}' is protected - ignoring"
286     else
287     if is_installed ${pcat}/${pname}-${pver}-${pbuild}
288   then   then
289   uninstall_list="${pcat}/${pname}-${pver}-${pbuild}"   if [[ -z ${uninstall_list} ]]
290     then
291     uninstall_list="${pcat}/${pname}-${pver}-${pbuild}"
292     else
293     uninstall_list="${uninstall_list} ${pcat}/${pname}-${pver}-${pbuild}"
294     fi
295   else   else
296   uninstall_list="${uninstall_list} ${pcat}/${pname}-${pver}-${pbuild}"   echo "'${pcat}/${pname}-${pver}-${pbuild}' not installed - ignoring"
297     fi
298    
299     if [[ -n ${uninstall_list} ]]
300     then
301     uninstall_packages "${uninstall_list}" || die "cleaning buildroot: ${pkg}"
302     else
303     echo "uninstall_list is empty for pkg '${pcat}/${pname}-${pver}-${pbuild}' - doing nothing"
304   fi   fi
  else  
  echo "'${pcat}/${pname}-${pver}-${pbuild}' not installed - ignoring"  
  fi  
  if [[ -n ${uninstall_list} ]]  
  then  
  uninstall_packages "${uninstall_list}" || die "cleaning buildroot: ${pkg}"  
  else  
  echo "uninstall_list is empty for pkg '${pcat}/${pname}-${pver}-${pbuild}' - doing nothing"  
305   fi   fi
306  done  done
307    

Legend:
Removed from v.2729  
changed lines
  Added in v.2730