Permalink
Browse files

Merge branch 'master' of github.com:pcbsd/pcbsd

  • Loading branch information...
2 parents 9cc1b3c + f233898 commit b3ebed5e75c2437e4787678a5d19c5e11327affd Ken Moore committed Oct 29, 2013
Showing with 0 additions and 17 deletions.
  1. +0 −16 src-sh/pbi-manager10/pbi-manager
  2. +0 −1 src-sh/pbi-manager10/pbime/pbimount
@@ -6188,9 +6188,6 @@ start_ext_ab() {
if [ -e "${_od}/build.log.bz2" ] ; then
rm "${_od}/build.log.bz2"
fi
- if [ -e "${_od}/.failed-csum" ] ; then
- rm ${_od}/.failed-csum
- fi
# Move old PBIs to archived folder
oldVersion=`cat ${_od}/pbi-version 2>/dev/null`
@@ -6257,9 +6254,6 @@ ab_post_build()
bzip2 "${_od}/build.log"
else
- # Save the md5sum of the ports directory
- tar cvf - -C "${PORTSDIR}/${_mp}" . 2>/dev/null | md5 -q >${_od}/.failed-csum
-
echo "Failed" > "${_od}/pbi-result"
if [ -n "${PBI_AB_HELPS}" ] ; then
${PBI_AB_HELPS} "FAILED" "${_od}"
@@ -6741,16 +6735,6 @@ check_ab_needed() {
#echo "Checking $_port for rebuild in ${PBI_AB_OUTDIR}/$_cd with key of $_bk"
- # Check if this is a failed port we should be skipping until its fixed
- if [ -e "${PBI_AB_OUTDIR}/${_cd}/.failed-csum" ] ; then
- _fcsum="`cat ${PBI_AB_OUTDIR}/${_cd}/.failed-csum`"
- _ncsum="`tar cvf - -C "${PORTSDIR}/${_port}" . 2>/dev/null | md5 -q`"
- if [ "$_fcsum" = "$_ncsum" ] ; then
- #echo "$_port - Skipping failed"
- return 1
- fi
- fi
-
# See if we have an existing PBI
ls ${PBI_AB_OUTDIR}/${_cd}/*.pbi >/dev/null 2>/dev/null
if [ "${?}" != "0" ]; then
@@ -40,7 +40,6 @@ mount_dirs() {
is_mounted "${pDir}/virtbase/dev" || mount -t devfs devfs ${pDir}/virtbase/dev
is_mounted "${pDir}/virtbase/usr/local" || $NULLFS ${1}/local ${pDir}/virtbase/usr/local
is_mounted "${pDir}/virtbase/var/run" || $NULLFS ${pDir}/run ${pDir}/virtbase/var/run
- is_mounted "${pDir}/virtbase/usr/local/etc" || mount -t unionfs -o noatime ${1}/etc ${pDir}/virtbase/usr/local/etc
is_mounted "${pDir}/virtbase/compat/linux" || $NULLFS ${1}/linux ${pDir}/virtbase/compat/linux
if [ -d "${pDir}/virtbase/usr/local/etc/fonts" ] ; then
is_mounted "${pDir}/virtbase/usr/local/etc/fonts" || $NULLFS /usr/local/etc/fonts ${pDir}/virtbase/usr/local/etc/fonts

0 comments on commit b3ebed5

Please sign in to comment.