From owner-svn-src-user@freebsd.org Thu Aug 23 02:21:41 2018 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9CA45109DA39 for ; Thu, 23 Aug 2018 02:21:41 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 74D0E79A3D; Thu, 23 Aug 2018 02:21:41 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 571701BBDB; Thu, 23 Aug 2018 02:21:41 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7N2LffJ076462; Thu, 23 Aug 2018 02:21:41 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7N2LfMY076460; Thu, 23 Aug 2018 02:21:41 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201808230221.w7N2LfMY076460@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Thu, 23 Aug 2018 02:21:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r338230 - user/cperciva/portsnap-build/s X-SVN-Group: user X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: user/cperciva/portsnap-build/s X-SVN-Commit-Revision: 338230 X-SVN-Commit-Repository: base 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.27 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: Thu, 23 Aug 2018 02:21:42 -0000 Author: delphij Date: Thu Aug 23 02:21:40 2018 New Revision: 338230 URL: https://svnweb.freebsd.org/changeset/base/338230 Log: Pass UNAME_r to describes-run.sh. Modified: user/cperciva/portsnap-build/s/describes-run.sh user/cperciva/portsnap-build/s/treesnap-build.sh Modified: user/cperciva/portsnap-build/s/describes-run.sh ============================================================================== --- user/cperciva/portsnap-build/s/describes-run.sh Thu Aug 23 02:20:09 2018 (r338229) +++ user/cperciva/portsnap-build/s/describes-run.sh Thu Aug 23 02:21:40 2018 (r338230) @@ -6,12 +6,13 @@ if [ -z "$PORTSNAP_BUILD_CONF_READ" ]; then exit 1 fi -# usage: sh -e describes-run.sh PORTSDISK WORLDTAR JAILDIR OSVERSION DESCFILE +# usage: sh -e describes-run.sh PORTSDISK WORLDTAR JAILDIR OSVERSION DESCFILE UNAMER PORTSDISK="$1" WORLDTAR="$2" JAILDIR="$3" OSVERSION="$4" DESCFILE="$5" +UNAMER="$6" # helper function findruleset () { @@ -62,6 +63,7 @@ if env - PATH=${PATH} jail -c path=${JAILDIR} host.hos > ${DESCFILE} <<- EOF export __MAKE_CONF=/nonexistant export OSVERSION=${OSVERSION} + export UNAME_r=${UNAMER} export PORTOBJFORMAT=elf export INDEX_TMPDIR=/tmp export WRKDIRPREFIX=/tmp @@ -82,16 +84,16 @@ fi # Clean up while ! umount ${JAILDIR}/dev; do - sleep 1 + sleep 1; done while ! umount ${JAILDIR}/tmp; do - sleep 1 + sleep 1; done while ! umount ${JAILDIR}/usr/ports; do - sleep 1 + sleep 1; done while ! umount ${JAILDIR}; do - sleep 1 + sleep 1; done mdconfig -d -u ${JAILMD} mdconfig -d -u ${TMPMD} Modified: user/cperciva/portsnap-build/s/treesnap-build.sh ============================================================================== --- user/cperciva/portsnap-build/s/treesnap-build.sh Thu Aug 23 02:20:09 2018 (r338229) +++ user/cperciva/portsnap-build/s/treesnap-build.sh Thu Aug 23 02:21:40 2018 (r338230) @@ -36,14 +36,15 @@ sh -e s/treesnap-mktars-all.sh ${PORTSDIR} ${SNAP} ${S # Unmount the ports tree while ! umount /dev/md${PORTSMD}; do - sleep 1 + sleep 1; done # Perform index describes for N in ${DESCRIBES}; do echo "`date`: Starting describe run for ${N}.x" if ! sh -e s/describes-run.sh /dev/md${PORTSMD} $WORLDTAR $JAILDIR \ - ${N}99999 ${SNAP}/DESCRIBE.${N} 2>${SNAP}/DESCRIBE.${N}.err; then + ${N}99999 ${SNAP}/DESCRIBE.${N} ${N}.x-STABLE \ + 2>${SNAP}/DESCRIBE.${N}.err; then echo "`date`: ${N}.x describes failed" cat ${SNAP}/DESCRIBE.${N}.err rm ${SNAP}/DESCRIBE.${N}