Date: Fri, 8 Mar 2013 15:01:41 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r248056 - projects/portbuild/scripts Message-ID: <201303081501.r28F1fK3050936@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Fri Mar 8 15:01:40 2013 New Revision: 248056 URL: http://svnweb.freebsd.org/changeset/base/248056 Log: determine if the build will be a pkgng build or a pkg_install build base on bsd.port.mk, not on /etc/make.conf, this allows build to autodetermine that on current the default is pkgng Tested by: erwin Modified: projects/portbuild/scripts/buildscript projects/portbuild/scripts/portbuild Modified: projects/portbuild/scripts/buildscript ============================================================================== --- projects/portbuild/scripts/buildscript Fri Mar 8 13:11:45 2013 (r248055) +++ projects/portbuild/scripts/buildscript Fri Mar 8 15:01:40 2013 (r248056) @@ -180,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 -q "[Yy][Ee][Ss]$" && use_pkgng="yes" +make -f /usr/ports/Mk/bsd.port.mk -V WITH_PKGNG | grep -q "[Yy][Ee][Ss]$" && use_pkgng="yes" # Keep restricted distfiles in a subdirectory for extra protection # against leakage Modified: projects/portbuild/scripts/portbuild ============================================================================== --- projects/portbuild/scripts/portbuild Fri Mar 8 13:11:45 2013 (r248055) +++ projects/portbuild/scripts/portbuild Fri Mar 8 15:01:40 2013 (r248056) @@ -260,7 +260,12 @@ mount_fs ${builddir}/src ${chroot}${CLIE # set overrides for uname buildenv.client ${arch} ${chroot}${CLIENT_SRCBASE} -mount -t devfs foo ${chroot}/dev +devfspath="null zero random urandom stdin stdout stderr fd fd/*" +mount -t devfs devfs ${chroot}/dev +devfs -m ${chroot}/dev rule apply hide +for p in ${devfspath} ; do + devfs -m ${chroot}/dev/ rule apply path "${p}" unhide +done mount -t fdescfs fdesc ${chroot}/dev/fd umount -f ${chroot}/compat/linux/proc > /dev/null 2>&1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303081501.r28F1fK3050936>