Date: Mon, 16 Jun 2014 16:21:06 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r267545 - user/nwhitehorn/condorports Message-ID: <201406161621.s5GGL6sr089362@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nwhitehorn Date: Mon Jun 16 16:21:05 2014 New Revision: 267545 URL: http://svnweb.freebsd.org/changeset/base/267545 Log: Do a better job of setting UNAME_r in build jails. FETCH_DEPENDS and COMPILER_FEATURES are remaining mysteries. Modified: user/nwhitehorn/condorports/buildport.sh user/nwhitehorn/condorports/buildportsdag.sh user/nwhitehorn/condorports/package.sub Modified: user/nwhitehorn/condorports/buildport.sh ============================================================================== --- user/nwhitehorn/condorports/buildport.sh Mon Jun 16 14:55:09 2014 (r267544) +++ user/nwhitehorn/condorports/buildport.sh Mon Jun 16 16:21:05 2014 (r267545) @@ -9,14 +9,15 @@ pkg=$2 release=$3 tarballname=$(basename $4) portsdir=$5 +build_arch=$6 scratchdir=$(pwd) -echo Building $pkg \(origin $port\) for $release on `hostname` -# XXX: set UNAME_r? +echo Building $pkg \(origin $port\) for $release on `hostname` at `date` +release_tarball=$build_arch-`echo $release | tr . -` set -e -sudo /pkgscripts/prepbuildjail $_CONDOR_SLOT $release $portsdir +sudo /pkgscripts/prepbuildjail $_CONDOR_SLOT $release_tarball $portsdir cat $tarballname | sudo jexec $_CONDOR_SLOT tar xvf - # XXX: work around bug in pkg @@ -27,9 +28,9 @@ portsdir=/buildshare/ports/$portsdir echo 'Make depends' sudo jexec $_CONDOR_SLOT make -C $port depends USE_PACKAGE_DEPENDS=true BATCH=true WRKDIRPREFIX=/obj DISABLE_MAKE_JOBS=true PKGREPOSITORY=/packages PACKAGES=/packages DISTDIR=/distfiles PORTSDIR=$portsdir PACKAGE_BUILDING=1 echo 'Make install' -sudo jexec $_CONDOR_SLOT make -C $port install USE_PACKAGE_DEPENDS=true BATCH=true WRKDIRPREFIX=/obj DISABLE_MAKE_JOBS=true PKGREPOSITORY=/packages PACKAGES=/packages DISTDIR=/distfiles PORTSDIR=$portsdir PACKAGE_BUILDING=1 +sudo jexec $_CONDOR_SLOT make -C $port install USE_PACKAGE_DEPENDS=true BATCH=true WRKDIRPREFIX=/obj DISABLE_MAKE_JOBS=true PKGREPOSITORY=/packages PACKAGES=/packages DISTDIR=/distfiles PORTSDIR=$portsdir PACKAGE_BUILDING=1 UNAME_r=$release echo 'Make package' -sudo jexec $_CONDOR_SLOT make -C $port package PKGREPOSITORY=/packages PACKAGES=/packages BATCH=true NO_LATEST_LINK=true WRKDIRPREFIX=/obj PORTSDIR=$portsdir PACKAGE_BUILDING=1 +sudo jexec $_CONDOR_SLOT make -C $port package PKGREPOSITORY=/packages PACKAGES=/packages BATCH=true NO_LATEST_LINK=true WRKDIRPREFIX=/obj PORTSDIR=$portsdir PACKAGE_BUILDING=1 UNAME_r=$release sudo jexec $_CONDOR_SLOT cat /packages/$pkg > $scratchdir/$pkg sudo /pkgscripts/reapbuildjail $_CONDOR_SLOT set +e Modified: user/nwhitehorn/condorports/buildportsdag.sh ============================================================================== --- user/nwhitehorn/condorports/buildportsdag.sh Mon Jun 16 14:55:09 2014 (r267544) +++ user/nwhitehorn/condorports/buildportsdag.sh Mon Jun 16 16:21:05 2014 (r267545) @@ -1,25 +1,27 @@ #!/bin/sh # Example: -# DISTHORDE=/scratch/horde ARCH=powerpc RELEASE=powerpc-10-0 PKGSDIR=/scratch/output/powerpc ./buildportsdag.sh 355755 ports-ppc.dag - +# DISTHORDE=/scratch/horde ARCH=powerpc RELEASE=10.0-RELEASE PKGSDIR=/scratch/output/powerpc ./buildportsdag.sh 355755 ports-ppc.dag export PORTSDIR=/buildshare/ports/$1 : ${PKGSDIR=$PORTSDIR/packages} : ${DISTHORDE=$PORTSDIR/distfiles} : ${ARCH=`uname -p`} -: ${RELEASE=$ARCH-`uname -r | cut -f 1 -d - | tr . -`} +: ${RELEASE=`uname -r`} : ${STAGEDIR=$(pwd)/stage-$ARCH/$PKGSDIR} : ${__MAKE_CONF=/dev/null}; export __MAKE_CONF export PORT_DBDIR=/var/empty # Avoid host contamination +export PACKAGE_BUILDING=1 # Some things have different dependencies OUTDAG=$2 PORTSET=$1 +release_tarball=$ARCH-`echo $RELEASE | tr . -` + mkdir -p $STAGEDIR -export OSVERSION=$(tar xOf /buildshare/releases/$RELEASE.tar usr/include/sys/param.h | awk '/^\#define[[:blank:]]__FreeBSD_version/ {print $3}') +export OSVERSION=$(tar xOf /buildshare/releases/$release_tarball.tar usr/include/sys/param.h | awk '/^\#define[[:blank:]]__FreeBSD_version/ {print $3}') dagjobs=$(pwd)/ports.dagjobs dagdeps=$(pwd)/ports.dagdeps Modified: user/nwhitehorn/condorports/package.sub ============================================================================== --- user/nwhitehorn/condorports/package.sub Mon Jun 16 14:55:09 2014 (r267544) +++ user/nwhitehorn/condorports/package.sub Mon Jun 16 16:21:05 2014 (r267545) @@ -15,5 +15,5 @@ when_to_transfer_output=ON_EXIT transfer_output_remaps="$(pkg)=$(pkgdir)/$(pkg)" transfer_input_files=$(stagetarball) -arguments= $(port) $(pkg) $(release) $(stagetarball) $(portsdir) +arguments= $(port) $(pkg) $(release) $(stagetarball) $(portsdir) $(BuildArch) queue
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406161621.s5GGL6sr089362>