Date: Mon, 30 Jul 2007 12:01:47 GMT From: Gabor Kovesdan <gabor@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 124347 for review Message-ID: <200707301201.l6UC1lOi000963@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=124347 Change 124347 by gabor@gabor_server on 2007/07/30 12:01:13 IFC Affected files ... .. //depot/projects/soc2006/gabor_destdir/CHANGES#11 integrate .. //depot/projects/soc2006/gabor_destdir/LEGAL#8 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.python.mk#5 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/README#2 delete .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/portbuild.conf#2 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/buildenv#3 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/buildscript#3 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/claim-chroot#2 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/clean-chroot#3 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/cleanup-chroots#3 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/dologs#2 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/dopackages#3 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/dosetupnode#3 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/getmachine#2 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/makeindex#2 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/mkbindist#2 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/pnohang.c#2 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/pollmachine#2 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/portbuild#3 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/straslivy.py#1 branch .. //depot/projects/soc2006/gabor_destdir/UPDATING#13 integrate Differences ... ==== //depot/projects/soc2006/gabor_destdir/CHANGES#11 (text+ko) ==== @@ -10,6 +10,19 @@ All ports committers are allowed to commit to this file. +20070730: +AUTHOR: python@FreeBSD.org + + * The default Python version has been changed from 2.4.x to 2.5.x. + + * A number of variables have been added to bsd.python.mk to support + the more integrated support for Python eggs, including: + PYDISTUTILS_PKGNAME, PYDISTUTILS_PKGVERSION, PYEASYINSTALL_EGG, + PYDISTUTILS_NOEGGINFO, PYDISTUTILS_EGGINFO, PYEASYINSTALL_ARCHDEP + + * More detailed descriptions of the variables can be found in the comments + in bsd.python.mk. + 20070723: AUTHOR: rafan@FreeBSD.org @@ -1372,4 +1385,4 @@ Contact Erwin Lansing if you have any questions about your use of this document. -$FreeBSD: ports/CHANGES,v 1.75 2007/07/24 01:43:31 rafan Exp $ +$FreeBSD: ports/CHANGES,v 1.76 2007/07/30 09:40:55 alexbl Exp $ ==== //depot/projects/soc2006/gabor_destdir/LEGAL#8 (text+ko) ==== @@ -1,5 +1,5 @@ # Creator: Jordan Hubbard -# $FreeBSD: ports/LEGAL,v 1.543 2007/07/23 02:09:24 rafan Exp $ +# $FreeBSD: ports/LEGAL,v 1.544 2007/07/29 15:51:07 pav Exp $ ********************************************************************** *** NOTE TO COMMITTERS *** @@ -34,6 +34,7 @@ interface 5400s_fbsd_cli_v10.zip sysutils/aaccli May not be redistributed in binary form +aacplusenc-* audio/aacplusenc Unclear legal status ac3dlx* graphics/linux-ac3d Commercial license, no distribution acroread/AdobeReader_* print/acroread7 Must fill out redistribution ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.python.mk#5 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.python.mk,v 1.95 2007/02/26 07:32:02 alexbl Exp $ +# $FreeBSD: ports/Mk/bsd.python.mk,v 1.96 2007/07/30 09:40:56 alexbl Exp $ # .if !defined(_POSTMKINCLUDED) && !defined(Python_Pre_Include) @@ -81,6 +81,12 @@ # want to build extensions with an older binary. # default: depends on the version of your python binary # +# PYTHON_DEFAULT_VERSION +# - Version of the default python binary in your ${PATH}, in +# the format "python2.5". Set this in your /etc/make.conf +# in case you want to use an older version as a default. +# default: python2.5 +# # PYTHON_WRKSRC - The ${WRKSRC} for your python version. Needed for # extensions like Tkinter, py-gdbm and py-expat, which # are built from sources contained in the Python @@ -122,6 +128,17 @@ # USE_PYDISTUTILS - Use distutils as do-configure, do-build and do-install # targets. # +# PYSETUP - Name of the setup script used by the distutils package. +# default: setup.py +# +# PYDISTUTILS_PKGNAME +# - Internal name in the distutils for egg-info. +# default: ${PORTNAME} +# +# PYDISTUTILS_PKGVERSION +# - Internal version in the distutils for egg-info. +# default: ${PORTVERSION} +# # PYDISTUTILS_CONFIGURE_TARGET # - Pass this command to distutils on configure stage. # default: config @@ -146,8 +163,32 @@ # - Arguments to install with distutils. # default: -c -O1 --prefix=${PREFIX} # -# PYSETUP - Name of the setup script used by the distutils package. -# default: setup.py +# PYDISTUTILS_EGGINFO +# - Canonical name for egg-info. +# default: ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}.egg-info +# +# PYDISTUTILS_NOEGGINFO +# - Skip an egg-info entry from plist when defined. +# +# PYEASYINSTALL_EGG +# - Canonical directory name for easy_install egg packages. +# default: ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}${PYEASYINSTALL_OSARCH}.egg +# +# PYEASYINSATLL_OSARCH +# - Platform identifier for easy_install. +# default: -${OPSYS:L}-${_OSRELEASE}-${ARCH} +# if PYEASYINSTALL_ARCHDEP is defined. +# +# PYEASYINSTALL_CMD - Full file path to easy_install command. +# default: ${LOCALBASE}/bin/easy_install-${PYTHON_VER} +# +# PYEASYINSTALL_INSTALL_ARGS +# - Arguments to easy_install command for egg installation. +# default: -q -N -S ${PYTHON_SITELIBDIR} ${PYDISTUTILS_PKGNAME}==${PYDISTUTILS_PKGVERSION} +# +# PYEASYINSTALL_UNINSTALL_ARGS +# - Arguments to easy_install command for egg uninstallation. +# default: -q -m -S ${PYTHON_SITELIBDIR} ${PYDISTUTILS_PKGNAME}==${PYDISTUTILS_PKGVERSION} # # USE_TWISTED - If this option is just yes then build and run # the dependence to twistedCore is added. Alternatively @@ -173,8 +214,8 @@ # specific version of zope. # -_PYTHON_PORTBRANCH= 2.4 -_PYTHON_ALLBRANCHES= 2.4 2.5 2.3 # preferred first +_PYTHON_PORTBRANCH= 2.5 +_PYTHON_ALLBRANCHES= 2.5 2.4 2.3 # preferred first _ZOPE_PORTBRANCH= 2.7 _ZOPE_ALLBRANCHES= 2.7 2.8 2.9 2.10 3.2 @@ -237,22 +278,24 @@ # Determine version number of Python to use +.if !defined(PYTHON_DEFAULT_VERSION) +. if exists(${LOCALBASE}/bin/python) +_PYTHON_DEFAULT_VERSION!= (${LOCALBASE}/bin/python -c \ + 'import sys; print sys.version[:3]' 2> /dev/null \ + || ${ECHO_CMD} ${_PYTHON_PORTBRANCH}) | ${TAIL} -1 +. else +_PYTHON_DEFAULT_VERSION= ${_PYTHON_PORTBRANCH} +. endif +PYTHON_DEFAULT_VERSION= python${_PYTHON_DEFAULT_VERSION} +.endif + .if defined(PYTHON_VERSION) _PYTHON_VERSION:= ${PYTHON_VERSION:S/^python//} _PYTHON_CMD= ${LOCALBASE}/bin/${PYTHON_VERSION} .else -# Determine the currently installed version. If Python is not installed, a -# default version number is substituted and the corresponding Python -# distribution will be built through the dependency processing. -.if defined(PYTHON_CMD) -_PYTHON_CMD= ${PYTHON_CMD} -.else -_PYTHON_CMD= ${LOCALBASE}/bin/python +_PYTHON_VERSION:= ${PYTHON_DEFAULT_VERSION:S/^python//} +_PYTHON_CMD= ${LOCALBASE}/bin/${PYTHON_DEFAULT_VERSION} .endif -_PYTHON_VERSION!= (${_PYTHON_CMD} -c \ - 'import sys; print sys.version[:3]' 2> /dev/null \ - || ${ECHO_CMD} ${_PYTHON_PORTBRANCH}) | ${TAIL} -1 -.endif # defined(PYTHON_VERSION) .if !defined(USE_PYTHON) .if defined(USE_PYTHON_BUILD) @@ -323,9 +366,9 @@ # Python-2.5 .if ${PYTHON_VERSION} == "python2.5" -PYTHON_PORTVERSION?=2.5 +PYTHON_PORTVERSION?=2.5.1 PYTHON_PORTSDIR= ${PORTSDIR}/lang/python25 -PYTHON_REL= 250 +PYTHON_REL= 251 PYTHON_SUFFIX= 25 PYTHON_VER= 2.5 @@ -360,8 +403,8 @@ @${ECHO} "Makefile error: bad value for PYTHON_VERSION: ${PYTHON_VERSION}." @${ECHO} "Legal values are:" @${ECHO} " python2.3" - @${ECHO} " python2.4 (default)" - @${ECHO} " python2.5" + @${ECHO} " python2.4" + @${ECHO} " python2.5 (default)" @${FALSE} .endif @@ -381,10 +424,58 @@ PYTHONPREFIX_LIBDIR= ${PYTHON_LIBDIR:S;${PYTHONBASE};${PREFIX};} PYTHONPREFIX_SITELIBDIR= ${PYTHON_SITELIBDIR:S;${PYTHONBASE};${PREFIX};} +# setuptools support +.if defined(USE_PYDISTUTILS) && ${USE_PYDISTUTILS} == "easy_install" +BUILD_DEPENDS+= ${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-setuptools +RUN_DEPENDS+= ${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-setuptools + +PYDISTUTILS_BUILD_TARGET?= bdist_egg +PYDISTUTILS_INSTALL_TARGET?= easy_install +PYDISTUTILS_INSTALLARGS?= -O 1 -N -S ${PYTHON_SITELIBDIR} ${WRKSRC}/dist/${PYEASYINSTALL_EGG} + +.if defined(PYEASYINSTALL_ARCHDEP) +_OSRELEASE!= ${UNAME} -r +PYEASYINSTALL_OSARCH?= -${OPSYS:L}-${_OSRELEASE}-${ARCH} +.endif +PYEASYINSTALL_EGG?= ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}${PYEASYINSTALL_OSARCH}.egg +PYEASYINSTALL_CMD?= ${LOCALBASE}/bin/easy_install-${PYTHON_VER} +PYEASYINSTALL_INSTALLARGS?= -q -N -S ${PYTHON_SITELIBDIR} \ + ${PYDISTUTILS_PKGNAME}==${PYDISTUTILS_PKGVERSION} +PYEASYINSTALL_UNINSTALLARGS?= -q -m -S ${PYTHON_SITELIBDIR} \ + ${PYDISTUTILS_PKGNAME}==${PYDISTUTILS_PKGVERSION} + +PLIST_SUB+= PYEASYINSTALL_EGG=${PYEASYINSTALL_EGG} + +add-plist-post: add-plist-easyinstall +add-plist-easyinstall: + @# @unexec line must be located before any other line while @exec must not. + @${CAT} ${TMPPLIST} > ${TMPPLIST}.pei_tmp + @${ECHO_CMD} "@unexec ${PYEASYINSTALL_CMD} ${PYEASYINSTALL_UNINSTALLARGS}" \ + > ${TMPPLIST} + @${CAT} ${TMPPLIST}.pei_tmp >> ${TMPPLIST} + @${ECHO_CMD} "@exec ${PYEASYINSTALL_CMD} ${PYEASYINSTALL_INSTALLARGS}" \ + >> ${TMPPLIST} +.endif # defined(USE_PYDISTUTILS) && ${USE_PYDISTUTILS} == "easy_install" + +# distutils support PYSETUP?= setup.py PYDISTUTILS_CONFIGUREARGS?= PYDISTUTILS_BUILDARGS?= PYDISTUTILS_INSTALLARGS?= -c -O1 --prefix=${PREFIX} +PYDISTUTILS_PKGNAME?= ${PORTNAME} +PYDISTUTILS_PKGVERSION?=${PORTVERSION} +PYDISTUTILS_EGGINFO?= ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}.egg-info +PYDISTUTILS_EGGINFODIR?=${PYTHON_SITELIBDIR} + +.if !defined(PYDISTUTILS_NOEGGINFO) && \ + (defined(INSTALLS_EGGINFO) || \ + (defined(USE_PYDISTUTILS) && \ + ${USE_PYDISTUTILS} != "easy_install")) && \ + defined(PYTHON_REL) && ${PYTHON_REL} >= 250 +. for egg in ${PYDISTUTILS_EGGINFO} +PLIST_FILES+= ${PYDISTUTILS_EGGINFODIR:S;${PREFIX}/;;}/${egg} +. endfor +.endif # Fix for programs that build python from a GNU auto* enviornment CONFIGURE_ENV+= PYTHON="${PYTHON_CMD}" @@ -436,7 +527,7 @@ .if defined(PYTHON_REL) && ${PYTHON_REL} < 250 PYCTYPES= ${PYTHON_SITELIBDIR}/ctypes/__init__.py:${PORTSDIR}/devel/py-ctypes .else -PYCTYPES= ${PYTHON_LIBDIR}/ctypes/__init__py:${PYTHON_PORTSDIR} +PYCTYPES= ${PYTHON_LIBDIR}/ctypes/__init__.py:${PYTHON_PORTSDIR} .endif .if defined(PYTHON_REL) && ${PYTHON_REL} < 250 ==== //depot/projects/soc2006/gabor_destdir/Tools/portbuild/portbuild.conf#2 (text+ko) ==== @@ -1,17 +1,28 @@ -# $FreeBSD: ports/Tools/portbuild/portbuild.conf,v 1.2 2000/12/18 04:43:46 asami Exp $ +# $FreeBSD: ports/Tools/portbuild/portbuild.conf,v 1.3 2007/07/29 20:06:05 kris Exp $ # sample configuration file for package build arch=i386 domain=FreeBSD.org -ftpsite=ftp.$domain +ftpsite=ftp-master.$domain distfiledir=w/ports/distfiles packagedir=w/ports/${arch}/tmp -master=bento +master=pointyhat.freebsd.org pb=/var/portbuild -user=asami -mailto=$user@$domain -scratchdir=/x/tmp +user=ports-${arch} +client_user=root +mailto=kris@FreeBSD.org,linimon@FreeBSD.org,pav@FreeBSD.org +scratchpart=/x +scratchdir=${scratchpart}/tmp +branches="5 6 7 5-exp 6-exp 6-exp2 7-exp" +squid_dir=${scratchpart}/squid +maxjobs=3 +sudo_cmd= +use_md_swap=0 +md_size=11g +use_jail=1 +#ccache_dir=dumpster:/vol/vol3/ccache +#ccache_dir_nfs=1 # # add your own variables down here to avoid CVS merge conflicts ==== //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/buildenv#3 (text+ko) ==== @@ -7,51 +7,25 @@ arch=$2 branch=$3 - export X11BASE=/usr/X11R6 - export LOCALBASE=/usr/local case "x$branch" in - x4) - export PKGSUFFIX=.tgz - export PKGZIPCMD=gzip - export INDEXFILE=INDEX - export X_WINDOW_SYSTEM=xfree86-4 - ;; - x4-exp) - export PKGSUFFIX=.tgz - export PKGZIPCMD=gzip - export PORTS_AUDIT=1 - export INDEXFILE=INDEX - export X_WINDOW_SYSTEM=xfree86-4 - ;; x5) - export PKGSUFFIX=.tbz - export PKGZIPCMD=bzip2 export INDEXFILE=INDEX-5 - export X_WINDOW_SYSTEM=xorg + export USE_NONDEFAULT_X11BASE=1 ;; x5-exp) - export PKGSUFFIX=.tbz - export PKGZIPCMD=bzip2 - export INDEXFILE=INDEX-5 - export X_WINDOW_SYSTEM=xorg + export INDEXFILE=INDEX-6 ;; x6) - export PKGSUFFIX=.tbz - export PKGZIPCMD=bzip2 export INDEXFILE=INDEX-6 - export X_WINDOW_SYSTEM=xorg ;; x6-exp) - export PKGSUFFIX=.tbz - export PKGZIPCMD=bzip2 + export INDEXFILE=INDEX-6 + ;; + x6-exp2) export INDEXFILE=INDEX-6 - export X_WINDOW_SYSTEM=xorg ;; x7) - export PKGSUFFIX=.tbz - export PKGZIPCMD=bzip2 export INDEXFILE=INDEX-7 - export X_WINDOW_SYSTEM=xorg ;; *) echo "buildenv: invalid branch" @@ -62,6 +36,13 @@ export ARCH=${arch} export MACHINE_ARCH=${arch} + export X11BASE=/usr/local + export LOCALBASE=/usr/local + export PKGSUFFIX=.tbz + export PKGZIPCMD=bzip2 + export X_WINDOW_SYSTEM=xorg + export XORG_UPGRADE=1 + # Have to use realpath because 'make index' doesn't deal with symlinks in PORTSDIR # - kk 020311 export PORTSDIR=$(realpath ${pb}/${arch}/${branch}/ports) @@ -92,10 +73,6 @@ export USA_RESIDENT=yes - # Old and mouldy? - export PARALLEL_PACKAGE_BUILD=1 - export HAVE_MOTIF=1 - export FTP_PASSIVE_MODE=yes #export FETCH_BEFORE_ARGS=-vvv } ==== //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/buildscript#3 (text+ko) ==== @@ -3,33 +3,15 @@ # usage: $0 DIRNAME PHASE # PHASE is 1 (checksum) or 2 (package) -mountprocfs() { - arch=$1 - - if [ ${arch} = "i386" -o ${arch} = "amd64" ]; then - # JDK ports need linprocfs :( - mkdir -p /compat/linux/proc - mount_linprocfs linprocfs /compat/linux/proc - fi -} - -umountprocfs() { - arch=$1 - - if [ ${arch} = "i386" -o ${arch} = "amd64" ]; then - umount -f /compat/linux/proc 2> /dev/null > /dev/null - fi -} - cleanup() { status=$1 # Don't keep distfiles if 'make checksum' failed - if [ ${status} -ne 1 ]; then + keep_distfiles=$(make -V ALWAYS_KEEP_DISTFILES) + if [ ${status} -eq 1 -o -z "${keep_distfiles}" ]; then cd ${dir} - keep_distfiles=$(make -V ALWAYS_KEEP_DISTFILES) distdir=$(make -V DISTDIR) - if [ -z "${keep_distfiles}" -a ! -z "${distdir}" ]; then + if [ ! -z "${distdir}" ]; then rm -rf ${distdir}/* fi fi @@ -155,6 +137,11 @@ #Allow ports to notice they're being run on bento export PACKAGE_BUILDING=1 + # Stash a copy of /etc/master.passwd and /etc/group to detect whether someone modifies it + + cp /etc/master.passwd /etc/master.passwd-save + cp /etc/group /etc/group-save + # Files we do not care about changing between pre-build and post-cleanup cat > /tmp/mtree.preexclude <<EOF ./root/* @@ -171,6 +158,7 @@ ./usr/local/share/xml ./usr/X11R6/etc/gconf ./usr/local/etc/gconf +./var/db/fontconfig EOF # Record a "pristine" mtree. mtree -X /tmp/mtree.preexclude -xcn -k uid,gid,mode -p / > /tmp/mtree.pristine @@ -237,6 +225,7 @@ ./usr/local/share/xml ./usr/X11R6/etc/gconf ./usr/local/etc/gconf +./var/db/fontconfig EOF # Record a "pristine" mtree. mtree -X /tmp/mtree.buildexclude -xcn -k uid,gid,mode -p / > /tmp/mtree.prebuild @@ -260,7 +249,7 @@ cd $dir /pnohang $TIMEOUT /tmp/make.log5 ${pkgname} make -k regression-test cat /tmp/make.log5 - mtree -X /tmp/mtree.buildexclude -x -f /tmp/mtree.prebuild -p / | egrep -v "^(${L}/var|${X}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|usr/(X11R6|local)/man/..( |/man. )|${X}/lib/X11/fonts/TrueType|${X}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|${L}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml )" > /tmp/list.preinstall + mtree -X /tmp/mtree.buildexclude -x -f /tmp/mtree.prebuild -p / | egrep -v "^(${L}/var|${X}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|usr/(X11R6|local)/man/..( |/man. )|${X}/lib/X11/fonts/TrueType|${X}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|${L}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|var/db/fontconfig/* )" > /tmp/list.preinstall if [ -s /tmp/list.preinstall ]; then echo "================================================================" @@ -306,7 +295,7 @@ cleanup 7 fi - mtree -X /tmp/mtree.exclude -x -f /tmp/mtree -p / | egrep -v "^(${L}/var|${X}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|usr/(X11R6|local)/man/..( |/man. )|${X}/lib/X11/fonts/TrueType|${X}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|${L}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml )" > /tmp/list3 + mtree -X /tmp/mtree.exclude -x -f /tmp/mtree -p / | egrep -v "^(${L}/var|${X}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|usr/(X11R6|local)/man/..( |/man. )|${X}/lib/X11/fonts/TrueType|${X}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|${L}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|var/db/fontconfig/* )" > /tmp/list3 # Compare the state of the filesystem now to before the 'make install' phase dirty=0 @@ -397,6 +386,9 @@ fi fi + cmp /etc/group /etc/group-save || (echo "=== /etc/group was modified:"; diff -du /etc/group-save /etc/group) + cmp /etc/master.passwd /etc/master.passwd-save || (echo "=== /etc/master.passwd was modified:"; diff -du /etc/master.passwd-save /etc/master.passwd) + if [ ${xvfb} = 1 ]; then kill $(jobid %1) fi ==== //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/claim-chroot#2 (text+ko) ==== @@ -27,7 +27,11 @@ pkgname=$(basename $1 ${PKGSUFFIX}) -chrootdir=${buildroot}/${branch}/chroot +if [ "${use_zfs}" = 1 ]; then + chrootdir=${buildroot}/${branch} +else + chrootdir=${buildroot}/${branch}/chroot +fi # Perform initial sanity check @@ -73,7 +77,11 @@ chrootnum=$$ # If we didn't find a pre-existing directory, create and claim a new one. while [ ${found} != 1 ]; do - if [ "${use_md_swap}" = "1" ]; then + if [ "${use_zfs}" = "1" ]; then + chroot=${chrootdir}/${chrootnum} + zfs clone y/${branch}@base $(echo ${chrootdir} | sed -e 's,/,,')/${chrootnum} + mkdir ${chroot}/used + elif [ "${use_md_swap}" = "1" ]; then unit=$(mdconfig -a -t swap -s ${md_size}) newfs /dev/${unit} > /dev/null chrootnum=$(echo ${unit} | sed 's,md,,') @@ -85,14 +93,21 @@ touch ${chroot}/used/used/${pkgname} umount ${chroot}/used mount -o async /dev/${unit} ${chroot}/ + touch ${chroot}/.notready else chrootnum=$(($chrootnum+1)) chroot=${chrootdir}/${chrootnum} - mkdir -p ${chroot} 2>/dev/null || continue + mkdir -p ${chrootdir} 2> /dev/null || continue + mkdir ${chroot} 2>/dev/null || continue mkdir ${chroot}/used 2>/dev/null || continue + touch ${chroot}/.notready fi + if [ "${use_tmpfs}" = "1" ]; then + mount -t tmpfs -o "size=${tmpfs_size}" foo ${chroot} + mkdir ${chroot}/used 2>/dev/null || echo "ERROR: mkdir race" + touch ${chroot}/.notready + fi touch ${chroot}/used/${pkgname} - touch ${chroot}/.notready found=1 done ==== //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/clean-chroot#3 (text+ko) ==== @@ -73,10 +73,24 @@ #kill_procs ${chroot} -if [ "${use_md_swap}" = "1" -a \( "${md_persistent}" != "1" -a "${clean}" -gt "0" \) -o "${clean}" = "2" ]; then +if [ "${use_zfs}" = "1" ]; then + cleanup_mount ${chroot} "" + zfs destroy $(echo ${chroot} | sed -e 's,/,,' ) +elif [ "${use_tmpfs}" = "1" -a "${clean}" = "2" ]; then + cleanup_mount ${chroot} "" + if ! rm -rf ${chroot} >/dev/null 2>&1; then + chflags -R noschg ${chroot} >/dev/null 2>&1 + rm -rf ${chroot} >/dev/null 2>&1 + fi + # XXX possible race from cleanup and claim by next build? +elif [ "${use_md_swap}" = "1" -a \( "${md_persistent}" != "1" -a "${clean}" -gt "0" \) -o "${clean}" = "2" ]; then + cleanup_mount ${chroot} /used cleanup_mount ${chroot} "" mdconfig -d -u $(basename ${chroot}) - rm -rf ${chroot} + if ! rm -rf ${chroot} >/dev/null 2>&1; then + chflags -R noschg ${chroot} >/dev/null 2>&1 + rm -rf ${chroot} >/dev/null 2>&1 + fi else if [ "${clean}" = 1 ]; then rm -rf ${chroot}/tmp/* ==== //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/cleanup-chroots#3 (text+ko) ==== @@ -42,7 +42,11 @@ . ${pb}/${arch}/portbuild.conf -old=$(find ${scratchdir}/*/chroot/* -prune -mmin +20 2> /dev/null) +if [ "${use_zfs}" = "1" ]; then + old=$(find ${scratchdir}/*/* -prune -mmin +20 2> /dev/null) +else + old=$(find ${scratchdir}/*/chroot/* -prune -mmin +20 2> /dev/null) +endif if [ -z "${old}" ]; then exit 0 ==== //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/dologs#2 (text+ko) ==== @@ -9,16 +9,16 @@ scripts=${pb}/scripts for ver in latest full; do - for num in 4 4-exp 5 5-exp 6 6-exp 7; do + for num in 5 5-exp 6 6-exp 6-exp2 7; do cd $home/$arch-$num-$ver && ${scripts}/processlogs ${arch} cd ${pb}/${arch}/${num} && ${scripts}/processfail ${arch} ${num} done - for num in 4 4-exp 5 5-exp 6 6-exp 7; do + for num in 5 5-exp 6 6-exp 6-exp2 7; do cd $home/$arch-$num-$ver-logs && ${scripts}/processlogs2 done # for num in 5 6 6-exp 7; do # cd $home && ${scripts}/comparelogs ${arch} $num-$ver 4-$ver # cd $home && ${scripts}/comparelogs ${arch} 4-$ver $num-$ver # done - cd $home && ${scripts}/bothlogs ${arch} 4-$ver 5-$ver +# cd $home && ${scripts}/bothlogs ${arch} 4-$ver 5-$ver done ==== //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/dopackages#3 (text+ko) ==== @@ -253,7 +253,7 @@ branch=$1 date=$2 -if [ "x$branch" != x4 -a "x$branch" != x4-exp -a "x$branch" != x5 -a "x$branch" != x5-exp -a "x$branch" != x6 -a "x$branch" != x6-exp -a "x$branch" != x7 ]; then +if [ "x$branch" != x5 -a "x$branch" != x5-exp -a "x$branch" != x6 -a "x$branch" != x6-exp -a "x$branch" != "x6-exp2" -a "x$branch" != x7 ]; then usage fi @@ -397,11 +397,12 @@ fi # Create hardlinks to previous set of logs - cd ${oldlogs} && find . | cpio -dumpl ${newlogs} - cd ${olderrors} && find . | cpio -dumpl ${newerrors} + cd ${oldlogs} && find . -name \*.log\* | cpio -dumpl ${newlogs} + cd ${olderrors} && find . -name \*.log\* | cpio -dumpl ${newerrors} # Identify the ports that have changed and need to be removed before rebuilding # XXX Need to also remove stale distfiles + # XXX and logs? cd ${PORTSDIR} cut -f 1,2,3,8,9,11,12,13 -d \| ${INDEXFILE}.old | sort > ${INDEXFILE}.old1 cut -f 1,2,3,8,9,11,12,13 -d \| ${INDEXFILE} | sort > ${INDEXFILE}.1 ==== //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/dosetupnode#3 (text+ko) ==== @@ -36,8 +36,8 @@ if [ "${disconnected}" = 1 -a "${norsync}" = 0 ]; then rsync ${rsync_gzip} -r -l -p --delete ${pb}/scripts ${client_user}@${node}:${pb}/ rsync ${rsync_gzip} -r -l -p --delete ${pb}/${arch}/portbuild* ${client_user}@${node}:${pb}/${arch} - rsync ${rsync_gzip} -r -l -p --delete ${pb}/${arch}/${branch}/ports ${client_user}@${node}:${pb}/${arch}/${branch} - rsync ${rsync_gzip} -r -l -p --delete ${pb}/${arch}/${branch}/src ${client_user}@${node}:${pb}/${arch}/${branch} + rsync ${rsync_gzip} -r -L -p --delete ${pb}/${arch}/${branch}/ports ${client_user}@${node}:${pb}/${arch}/${branch} + rsync ${rsync_gzip} -r -L -p --delete ${pb}/${arch}/${branch}/src ${client_user}@${node}:${pb}/${arch}/${branch} rsync ${rsync_gzip} -r -L -p --delete ${pb}/${arch}/${branch}/tarballs/ ${client_user}@${node}:${pb}/${arch}/${branch}/tarballs/ fi ==== //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/getmachine#2 (text+ko) ==== @@ -17,20 +17,28 @@ exit 1 fi -min=9999 + +min=999999 while [ $# -gt 0 ]; do m=$1 - num=$(cat $m) - if [ $num -lt $min ]; then + + # Pull in maxjobs + . ${pb}/${arch}/portbuild.conf + test -f ${pb}/${arch}/portbuild.${m} && . ${pb}/${arch}/portbuild.${m} + + curjobs=$(cat $m) + weight=$((${curjobs}*1000/${maxjobs})) + + if [ $weight -lt $min ]; then mach=$m - min=$num - elif [ $num -eq $min ]; then + min=$weight + elif [ $weight -eq $min ]; then mach="${mach} ${m}" fi shift done -if [ "$min" = 9999 -o -z "${mach}" ]; then +if [ "$min" = 999999 -o -z "${mach}" ]; then echo "" exit 1 fi @@ -45,11 +53,12 @@ . ${pb}/${arch}/portbuild.conf test -f ${pb}/${arch}/portbuild.${mach} && . ${pb}/${arch}/portbuild.${mach} +curjobs=$(cat $mach) # Now that we've found a machine, register our claim in the queue -if [ "$((${min}+1))" -ge "${maxjobs}" ]; then +if [ "$((${curjobs}+1))" -ge "${maxjobs}" ]; then rm ${mach} else - echo $(($min+1)) > ${mach} + echo $(($curjobs+1)) > ${mach} fi # Report to caller ==== //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/makeindex#2 (text+ko) ==== @@ -8,7 +8,7 @@ INDEX_QUIET=1 # Concurrency of index build -INDEX_JOBS=2 +INDEX_JOBS=6 pb=/var/portbuild arch=$1 @@ -26,14 +26,6 @@ fi case "x$1" in - x4) - branch=4 - INDEXFILE=INDEX - ;; - x4-exp) - branch=4-exp - INDEXFILE=INDEX - ;; x5) branch=5 INDEXFILE=INDEX-5 @@ -50,6 +42,10 @@ branch=6-exp INDEXFILE=INDEX-6 ;; + x6-exp2) + branch=6-exp2 + INDEXFILE=INDEX-6 + ;; x7) branch=7 INDEXFILE=INDEX-7 ==== //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/mkbindist#2 (text+ko) ==== @@ -10,7 +10,7 @@ arch=$1 branch=$2 -if [ "x$branch" != x4 -a "x$branch" != x5 -a "x$branch" != x6-exp -a "x$branch" != x6 -a "x$branch" != x7 ]; then +if [ "x$branch" != x5 -a "x$branch" != x5-exp -a "x$branch" != x6-exp -a "x$branch" != x6-exp2 -a "x$branch" != x6 -a "x$branch" != x7 ]; then usage fi @@ -53,7 +53,6 @@ mtree -deU -f ${here}/src/etc/mtree/BSD.root.dist -p ${tmpdir}/ mtree -deU -f ${here}/src/etc/mtree/BSD.var.dist -p ${tmpdir}/var mtree -deU -f ${here}/src/etc/mtree/BSD.usr.dist -p ${tmpdir}/usr -mtree -deU -f ${here}/src/etc/mtree/BSD.local.dist -p ${tmpdir}/usr/local # Copy the files into the tmpdir. Use an existing built world, or the ftp # files. ==== //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/pnohang.c#2 (text+ko) ==== @@ -91,7 +91,7 @@ /*snprintf(logstr, BUFSIZ, "logger -t %s killing %s %s, pid %d since no output in %d seconds", argv[0], args, message, pid, timeout); system(logstr);*/ printf("%s: killing %s (%s, pid %d and %d) since no output in %d seconds since %s", argv[0], args, message, pid1, pid, timeout, ctime(&now)); - printf("ps jgx before the singal\n"); + printf("ps jgx before the signal\n"); system("ps jgxww"); sleep(1); /* give it a chance to output the message */ kill(pid1, SIGTERM); ==== //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/pollmachine#2 (text+ko) ==== @@ -10,7 +10,7 @@ queue=0 fi -infoseek_port=infoseek +infoseek_port=414 . ${buildroot}/${i}/portbuild.conf if [ -f ${buildroot}/${i}/portbuild.${m} ]; then . ${buildroot}/${i}/portbuild.${m} @@ -18,7 +18,7 @@ if [ -z "${infoseek_host}" ]; then infoseek_host=$m fi -if (/usr/local/bin/nc -w 15 ${infoseek_host} ${infoseek_port} > ${buildroot}/${i}/loads/$m < /dev/null); then +if (/usr/bin/nc -w 15 ${infoseek_host} ${infoseek_port} > ${buildroot}/${i}/loads/$m < /dev/null); then if [ "${queue}" = 1 ]; then num=$(awk '{print $1}' ${buildroot}/${i}/loads/$m) if [ "$num" -lt "${maxjobs}" ]; then ==== //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/portbuild#3 (text+ko) ==== @@ -158,26 +158,11 @@ tar -C ${chroot} -xpf ${bindistlocal} fi - # to be able to run ps and killall inside chroot area - if [ "${branch}" = "4" -o "${branch}" = "4-exp" ]; then - mkdir -p ${chroot}/libexec - mkdir -p ${chroot}/lib - if [ "${arch}" = "i386" ]; then - cp -p /sbin/mount_linprocfs /sbin/mount /sbin/umount ${chroot}/sbin - cp -p /lib/libufs.so.2 ${chroot}/lib - fi - cp -p /libexec/ld-elf.so.1 ${chroot}/libexec - cp -p /lib/libkvm.so.2 /lib/libm.so.3 ${chroot}/lib - if [ -f /lib/libc.so.6 ]; then - cp -p /lib/libc.so.6 ${chroot}/lib - else - cp -p /lib/libc.so.5 ${chroot}/lib - fi - elif [ "${branch}" = "6" ]; then - cp -p /lib/libc.so.5 ${chroot}/lib - fi + # to be able to run certain kernel-dependent binaries + # inside the chroot area + cp -p /rescue/mount /rescue/umount ${chroot}/sbin cp -p /rescue/ps ${chroot}/bin - cp -p /usr/bin/killall ${chroot}/usr/bin + rm ${chroot}/.notready touch ${chroot}/.ready fi @@ -215,7 +200,11 @@ if [ ! -z "${ccache_dir}" ]; then mkdir -p ${chroot}/root/.ccache/ - mount -o rw -t nullfs ${ccache_dir} ${chroot}/root/.ccache/ + if [ "${ccache_dir_nfs}" = "1" ]; then + mount_nfs -o rw -T -3 ${ccache_dir} ${chroot}/root/.ccache/ + else + mount -o rw -t nullfs ${ccache_dir} ${chroot}/root/.ccache/ + fi fi mount_fs ${pb}/${arch}/${branch}/ports ${chroot}/a/ports ${master} @@ -226,7 +215,6 @@ mount_fs ${pb}/${arch}/${branch}/src ${chroot}/usr/src ${master} mount -t devfs foo ${chroot}/dev - umount -f ${chroot}/compat/linux/proc > /dev/null 2>&1 # just in case... @@ -246,22 +234,13 @@ mtree -deU -f ${chroot}/usr/src/etc/mtree/BSD.usr.dist -p ${chroot}/usr \ >/dev/null 2>&1 mkdir -p ${chroot}${LOCALBASE} -mtree -deU -f ${chroot}/usr/src/etc/mtree/BSD.local.dist -p ${chroot}${LOCALBASE} \ +mtree -deU -f ${chroot}/a/ports/Templates/BSD.local.dist -p ${chroot}${LOCALBASE} \ >/dev/null 2>&1 -mkdir -p ${chroot}${X11BASE} -if [ $X_WINDOW_SYSTEM = "xfree86-3" ]; then - mtree -deU -f ${chroot}/usr/src/etc/mtree/BSD.x11.dist -p ${chroot}${X11BASE} \ - >/dev/null 2>&1 -else - mtree -deU -f ${chroot}/usr/src/etc/mtree/BSD.x11-4.dist -p ${chroot}${X11BASE} \ - >/dev/null 2>&1 -fi - if [ ${arch} = "i386" -o ${arch} = "amd64" ]; then # JDK ports need linprocfs :( mkdir -p ${chroot}/compat/linux/proc - mount_linprocfs linprocfs ${chroot}/compat/linux/proc + mount -t linprocfs linprocfs ${chroot}/compat/linux/proc fi _ldconfig_dirs="/lib /usr/lib /usr/lib/compat" @@ -285,7 +264,7 @@ # Test for copy failure and bail if [ ! -f ${chroot}/tmp/depends/$1 ]; then - echo "ERROR: Couldn't copy $1" + echo "ERROR: Couldn't copy $1" | tee -a ${chroot}/tmp/${pkgname}.log bailout ${chroot} ${clean} 255 ${pkgname} fi fi ==== //depot/projects/soc2006/gabor_destdir/UPDATING#13 (text+ko) ==== @@ -6,6 +6,30 @@ time you update your ports collection, before attempting any port upgrades. +20070730: + AFFECTS: users of py-* + AUTHOR: python@FreeBSD.org + +The default version of Python has been changed from 2.4.x to 2.5.x. +If you have 2.4.x installed, perform an upgrade of lang/python24 to +lang/python25 with a command like: + + # portupgrade -o lang/python25 lang/python24 + +If want to keep 2.4.x installed alongside 2.5.x, set the PYTHON_DEFAULT_VERSION +variable to 'python2.5' without quotes in make.conf, then go to lang/python and +execute + + # portupgrade -R python + +Once the installed Python has been updated to 2.5, by using one of the methods +above, it is required to run the upgrade-site-packages target in lang/python to +assure that site-packages are made available to the new Python version. + + # cd /usr/ports/lang/python && make upgrade-site-packages + +This Makefile target requires ports-mgmt/portupgrade to be installed. + 20070727: AFFECTS: autotools AUTHOR: ade@FreeBSD.org @@ -5465,4 +5489,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.530 2007/07/28 06:33:42 ade Exp $ +$FreeBSD: ports/UPDATING,v 1.531 2007/07/30 09:40:56 alexbl Exp $
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200707301201.l6UC1lOi000963>