Date: Mon, 30 Jul 2012 15:37:47 +0000 (UTC) From: Mark Linimon <linimon@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r238911 - projects/portbuild/scripts Message-ID: <201207301537.q6UFblFD008009@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: linimon (doc,ports committer) Date: Mon Jul 30 15:37:47 2012 New Revision: 238911 URL: http://svn.freebsd.org/changeset/base/238911 Log: One more try. Modified: projects/portbuild/scripts/buildscript Modified: projects/portbuild/scripts/buildscript ============================================================================== --- projects/portbuild/scripts/buildscript Mon Jul 30 15:30:42 2012 (r238910) +++ projects/portbuild/scripts/buildscript Mon Jul 30 15:37:47 2012 (r238911) @@ -70,6 +70,20 @@ add_pkg() { else eval $pkg_cmd_add $i if [ $? -ne 0 ]; then +# XXX MCL this is where the truncated packages kill us. +# echo "begin debug block" +# echo +# echo "remember, you are in a chroot, with dir ${dir}" +# echo +# echo "PKG_PATH is $PKG_PATH and contains" +# ls -al $PKG_PATH +# echo +# df -g +# echo +# ps axwwl +# echo +# echo "end debug block" +# XXX MCL this is where the truncated packages kill us. echo "error in dependency $i, exiting" cleanup 0 fi @@ -166,7 +180,7 @@ pkg_sufx=${PKG_SUFX} # Use pkgng if available. #if [ -x /usr/sbin/pkg ]; then use_pkgng="no" -grep "^WITH_PKGNG[ ]*=" /etc/make.conf | sed -e "s/.*=//;s/ //" | grep "[Yy][Ee][Ss]$" && use_pkgng="yes" +grep "^WITH_PKGNG[ ]*=" /etc/make.conf | sed -e "s/.*=//;s/ //" | grep -q "[Yy][Ee][Ss]$" && use_pkgng="yes" # Keep restricted distfiles in a subdirectory for extra protection # against leakage @@ -267,6 +281,7 @@ else echo "================================================================" echo "====================<phase 4: make build>====================" +# XXX MCL this is where the truncated packages kill us. add_pkg ${BD} # Files we do not care about changing between pre-build and post-cleanup @@ -429,10 +444,10 @@ EOF grep -vE ' (extra|missing)$' /tmp/list3 > /tmp/list6 if [ "x${NOPLISTCHECK}" = "x" ]; then if grep -vq "$L/etc/" /tmp/list4; then - #echo "1" > /tmp/status + echo "1" > /tmp/status fi if [ -s /tmp/list5 ]; then - #echo "1" > /tmp/status + echo "1" > /tmp/status fi fi echo "================================================================"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207301537.q6UFblFD008009>