From owner-svn-src-user@FreeBSD.ORG Sat Jul 20 14:54:44 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 12224C7B; Sat, 20 Jul 2013 14:54:44 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id DF6B5633; Sat, 20 Jul 2013 14:54:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6KEshqN015076; Sat, 20 Jul 2013 14:54:43 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6KEshcd015073; Sat, 20 Jul 2013 14:54:43 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201307201454.r6KEshcd015073@svn.freebsd.org> From: Nathan Whitehorn Date: Sat, 20 Jul 2013 14:54:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r253500 - user/nwhitehorn/condorports X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Jul 2013 14:54:44 -0000 Author: nwhitehorn Date: Sat Jul 20 14:54:43 2013 New Revision: 253500 URL: http://svnweb.freebsd.org/changeset/base/253500 Log: Add infrastructure for real multi-arch support. Modified: user/nwhitehorn/condorports/buildportsdag.sh user/nwhitehorn/condorports/fetchandlinks.sh user/nwhitehorn/condorports/package.sub Modified: user/nwhitehorn/condorports/buildportsdag.sh ============================================================================== --- user/nwhitehorn/condorports/buildportsdag.sh Sat Jul 20 14:54:20 2013 (r253499) +++ user/nwhitehorn/condorports/buildportsdag.sh Sat Jul 20 14:54:43 2013 (r253500) @@ -1,6 +1,7 @@ #!/bin/sh -PORTSDIR=/usr/ports -PKGSDIR=/usr/ports/packages +: ${PORTSDIR=/usr/ports} +: ${PKGSDIR=/usr/ports/packages} +: ${ARCH=`uname -p`} #(cd $PORTSDIR && make index) ports="$(cut -f 2 -d '|' $PORTSDIR/INDEX-`uname -r | cut -f 1 -d .`)" ports="/usr/ports/games/sl /usr/ports/ports-mgmt/pkg /usr/ports/japanese/nkf" @@ -11,8 +12,11 @@ rm -f $dagjobs $dagdeps for job in $ports; do cd $job echo JOB $job package.sub >> $dagjobs - # One fetch for all archs with dummy fetch job? UNAME_p etc. - echo SCRIPT PRE $job fetchandlinks.sh $job $PKGSDIR >> $dagjobs + # One fetch for all archs with dummy fetch job? + echo SCRIPT PRE $job fetchandlinks.sh $job $PKGSDIR $ARCH >> $dagjobs + + export UNAME_p=$ARCH + echo VARS $job BuildArch=\"$ARCH\" >> $dagjobs echo VARS $job port=\"$job\" >> $dagjobs echo VARS $job pkg=\"`make package-name`.txz\" >> $dagjobs echo VARS $job pkgdir=\"$PKGSDIR/All\" >> $dagjobs Modified: user/nwhitehorn/condorports/fetchandlinks.sh ============================================================================== --- user/nwhitehorn/condorports/fetchandlinks.sh Sat Jul 20 14:54:20 2013 (r253499) +++ user/nwhitehorn/condorports/fetchandlinks.sh Sat Jul 20 14:54:43 2013 (r253500) @@ -1,6 +1,10 @@ #!/bin/sh +# Build tarball of interesting subset of ports tree, relevant distfiles, +# dependent packages? + set -e +export UNAME_p=$3 cd $1 make fetch make package-links PACKAGES=$2 Modified: user/nwhitehorn/condorports/package.sub ============================================================================== --- user/nwhitehorn/condorports/package.sub Sat Jul 20 14:54:20 2013 (r253499) +++ user/nwhitehorn/condorports/package.sub Sat Jul 20 14:54:43 2013 (r253500) @@ -2,13 +2,7 @@ executable = buildport.sh universe = vanilla notification = never # failure? -# TODO: Set architecture using custom classad for uname -p values that each -# build host can execute -# Build host example: START= TARGET.UnameP=="amd64" || TARGET.UnameP=="i386" -# Job classad example: UnameP="amd64" - -requirements = Arch == "X86_64" && OpSys == "FREEBSD" -#requirements = Arch == "powerpc" && OpSys == "FREEBSD" +requirements = stringListMember($(BuildArch), SupportedABIs) log=/tmp/condorlog output=logs/$(pkg).out