From owner-svn-src-user@freebsd.org Wed Aug 22 09:27:40 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 DDD8A10831E6 for ; Wed, 22 Aug 2018 09:27:40 +0000 (UTC) (envelope-from pho@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 934958BF2B; Wed, 22 Aug 2018 09:27:40 +0000 (UTC) (envelope-from pho@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 723791116D; Wed, 22 Aug 2018 09:27:40 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7M9ReUp048170; Wed, 22 Aug 2018 09:27:40 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7M9RepP048169; Wed, 22 Aug 2018 09:27:40 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201808220927.w7M9RepP048169@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 22 Aug 2018 09:27:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r338186 - user/pho/stress2/misc X-SVN-Group: user X-SVN-Commit-Author: pho X-SVN-Commit-Paths: user/pho/stress2/misc X-SVN-Commit-Revision: 338186 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: Wed, 22 Aug 2018 09:27:41 -0000 Author: pho Date: Wed Aug 22 09:27:40 2018 New Revision: 338186 URL: https://svnweb.freebsd.org/changeset/base/338186 Log: Update the test to work with the new "block" output format of fsdb(8). Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/truncate6.sh Modified: user/pho/stress2/misc/truncate6.sh ============================================================================== --- user/pho/stress2/misc/truncate6.sh Wed Aug 22 08:31:35 2018 (r338185) +++ user/pho/stress2/misc/truncate6.sh Wed Aug 22 09:27:40 2018 (r338186) @@ -75,9 +75,10 @@ QUOTE ) full=`echo "$full" | sed '/Last Mounted/,+6d'` r=`echo "$full" | tail -1` -if [ "$r" != "0, 0, 0, 4704" ]; then +expect=" lbn 3 blkno 4704" +if [ "$r" != "$expect" ]; then e=1 - echo "FAIL Expected \"0, 0, 0, 4704\", got \"$r\"." + echo "FAIL Expected \"$expect\", got \"$r\"." echo "$full" else e=0 From owner-svn-src-user@freebsd.org Thu Aug 23 02:14:52 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 B6831109D686 for ; Thu, 23 Aug 2018 02:14:52 +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 6ABB3791E9; Thu, 23 Aug 2018 02:14:52 +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 344A01BA79; Thu, 23 Aug 2018 02:14:52 +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 w7N2Ep8x074273; Thu, 23 Aug 2018 02:14:51 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7N2Epcu074272; Thu, 23 Aug 2018 02:14:51 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201808230214.w7N2Epcu074272@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:14:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r338224 - 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: 338224 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:14:53 -0000 Author: delphij Date: Thu Aug 23 02:14:51 2018 New Revision: 338224 URL: https://svnweb.freebsd.org/changeset/base/338224 Log: join(1) at r320210 changed -v's behavior to output the join field as first field, while previously join(1) would act like grep(1). Compensate this by explicitly specify output order, which will work for both versions. Reviewed by: cperciva Modified: user/cperciva/portsnap-build/s/fileset-findnew.sh user/cperciva/portsnap-build/s/fileset-mergedb.sh Modified: user/cperciva/portsnap-build/s/fileset-findnew.sh ============================================================================== --- user/cperciva/portsnap-build/s/fileset-findnew.sh Thu Aug 23 02:14:39 2018 (r338223) +++ user/cperciva/portsnap-build/s/fileset-findnew.sh Thu Aug 23 02:14:51 2018 (r338224) @@ -18,7 +18,7 @@ echo "`date`: Identifying new files" # Find new port tarballs sort -k 3,3 -t '|' ${FSETDIR}/filedb > ${TMP}/filedb.sorted sort -k 2,2 -t '|' ${INDEX} | - join -1 3 -2 2 -t '|' -v 2 ${TMP}/filedb.sorted - | + join -1 3 -2 2 -t '|' -v 2 -o 2.1,2.2 ${TMP}/filedb.sorted - | sort -k 1,1 -t '|' > ${FSETDIR}/filedb.news # Report new files @@ -29,7 +29,7 @@ cut -f 1 -d '|' < ${FSETDIR}/filedb.news | # Find new metadata files sort -k 3,3 -t '|' ${FSETDIR}/metadb > ${TMP}/metadb.sorted sort -k 2,2 -t '|' ${tINDEX} | - join -1 3 -2 2 -t '|' -v 2 ${TMP}/metadb.sorted - | + join -1 3 -2 2 -t '|' -v 2 -o 2.1,2.2 ${TMP}/metadb.sorted - | sort -k 1,1 -t '|' > ${FSETDIR}/metadb.news # Clean up temporary files Modified: user/cperciva/portsnap-build/s/fileset-mergedb.sh ============================================================================== --- user/cperciva/portsnap-build/s/fileset-mergedb.sh Thu Aug 23 02:14:39 2018 (r338223) +++ user/cperciva/portsnap-build/s/fileset-mergedb.sh Thu Aug 23 02:14:51 2018 (r338224) @@ -29,7 +29,7 @@ echo "`date`: Updating databases" sed -e "s/|/|${SNAPDATE}|/" ${INDEX} | sort -k 3,3 -t '|' > ${TMP}/new.dated sort -k 3,3 -t '|' ${FSETDIR}/filedb | - join -1 3 -2 3 -t '|' -v 1 - ${TMP}/new.dated | + join -1 3 -2 3 -t '|' -v 1 -o 1.1,1.2,1.3 - ${TMP}/new.dated | sort -k 1,1 -t '|' - ${TMP}/new.dated > ${FSETDIR}/filedb.tmp mv ${FSETDIR}/filedb.tmp ${FSETDIR}/filedb @@ -37,7 +37,7 @@ mv ${FSETDIR}/filedb.tmp ${FSETDIR}/filedb sed -e "s/|/|${SNAPDATE}|/" ${tINDEX} | sort -k 3,3 -t '|' > ${TMP}/new.dated sort -k 3,3 -t '|' ${FSETDIR}/metadb | - join -1 3 -2 3 -t '|' -v 1 - ${TMP}/new.dated | + join -1 3 -2 3 -t '|' -v 1 -o 1.1,1.2,1.3 - ${TMP}/new.dated | sort -k 1,1 -t '|' - ${TMP}/new.dated > ${FSETDIR}/metadb.tmp mv ${FSETDIR}/metadb.tmp ${FSETDIR}/metadb From owner-svn-src-user@freebsd.org Thu Aug 23 02:17:37 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 5C2B8109D70F for ; Thu, 23 Aug 2018 02:17:37 +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 10E4F794D4; Thu, 23 Aug 2018 02:17:37 +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 E618C1BA87; Thu, 23 Aug 2018 02:17:36 +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 w7N2HaX8074519; Thu, 23 Aug 2018 02:17:36 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7N2Hami074518; Thu, 23 Aug 2018 02:17:36 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201808230217.w7N2Hami074518@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:17:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r338226 - user/cperciva/portsnap-build X-SVN-Group: user X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: user/cperciva/portsnap-build X-SVN-Commit-Revision: 338226 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:17:37 -0000 Author: delphij Date: Thu Aug 23 02:17:36 2018 New Revision: 338226 URL: https://svnweb.freebsd.org/changeset/base/338226 Log: Use noexec when mounting memory disk. Modified: user/cperciva/portsnap-build/build.sh Modified: user/cperciva/portsnap-build/build.sh ============================================================================== --- user/cperciva/portsnap-build/build.sh Thu Aug 23 02:15:45 2018 (r338225) +++ user/cperciva/portsnap-build/build.sh Thu Aug 23 02:17:36 2018 (r338226) @@ -33,7 +33,7 @@ fi # Create a memory disk for holding the snapshot files. SNAPMD=`mdconfig -a -t swap -s ${SNAPMDSIZE} -n` newfs -O 1 -n /dev/md${SNAPMD} >/dev/null -mount -onoatime,async /dev/md${SNAPMD} ${SNAPDIR} +mount -o noatime,noexec,async /dev/md${SNAPMD} ${SNAPDIR} # Build a snapshot sh -e s/treesnap-build.sh head@${NEWREV} "${DESCRIBES_BUILD}" \ @@ -86,7 +86,7 @@ rm ${SIGDIR}/*.ssl # Unmount and delete the snapshot disk while ! umount /dev/md${SNAPMD}; do - sleep 1 + sleep 1; done mdconfig -d -u ${SNAPMD} From owner-svn-src-user@freebsd.org Thu Aug 23 02:19:43 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 C9FAB109D7C0 for ; Thu, 23 Aug 2018 02:19:43 +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 7D48479732; Thu, 23 Aug 2018 02:19:43 +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 5D5731BA8D; Thu, 23 Aug 2018 02:19:43 +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 w7N2Jh4e074749; Thu, 23 Aug 2018 02:19:43 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7N2Jh3t074748; Thu, 23 Aug 2018 02:19:43 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201808230219.w7N2Jh3t074748@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:19:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r338228 - user/cperciva/portsnap-build X-SVN-Group: user X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: user/cperciva/portsnap-build X-SVN-Commit-Revision: 338228 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:19:44 -0000 Author: delphij Date: Thu Aug 23 02:19:42 2018 New Revision: 338228 URL: https://svnweb.freebsd.org/changeset/base/338228 Log: Diff reduction with production configuration (update build release list). Modified: user/cperciva/portsnap-build/build.conf Modified: user/cperciva/portsnap-build/build.conf ============================================================================== --- user/cperciva/portsnap-build/build.conf Thu Aug 23 02:19:00 2018 (r338227) +++ user/cperciva/portsnap-build/build.conf Thu Aug 23 02:19:42 2018 (r338228) @@ -43,10 +43,10 @@ export MAXAGE_META=691200 export MAXAGE_EXTRA=172800 # Describes files to build (on HEAD) -export DESCRIBES_BUILD="7 8 9" +export DESCRIBES_BUILD="10 11 12" # Describes files to publish (on HEAD) -export DESCRIBES_PUBLISH="4 5 6 7 8 9" +export DESCRIBES_PUBLISH="4 5 6 7 8 9 10 11 12" # Keys to sign builds with (get this from keygen.sh) export SIGNKEYS="XXXX" 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} From owner-svn-src-user@freebsd.org Thu Aug 23 02:15:46 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 4BA57109D6B0 for ; Thu, 23 Aug 2018 02:15:46 +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 02FDF792DB; Thu, 23 Aug 2018 02:15:46 +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 D81981BA82; Thu, 23 Aug 2018 02:15:45 +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 w7N2Fj6w074375; Thu, 23 Aug 2018 02:15:45 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7N2Fjjt074374; Thu, 23 Aug 2018 02:15:45 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201808230215.w7N2Fjjt074374@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:15:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r338225 - user/cperciva/portsnap-build X-SVN-Group: user X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: user/cperciva/portsnap-build X-SVN-Commit-Revision: 338225 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:15:46 -0000 Author: delphij Date: Thu Aug 23 02:15:45 2018 New Revision: 338225 URL: https://svnweb.freebsd.org/changeset/base/338225 Log: Support multiple recipients. Modified: user/cperciva/portsnap-build/loop.sh Modified: user/cperciva/portsnap-build/loop.sh ============================================================================== --- user/cperciva/portsnap-build/loop.sh Thu Aug 23 02:14:51 2018 (r338224) +++ user/cperciva/portsnap-build/loop.sh Thu Aug 23 02:15:45 2018 (r338225) @@ -43,5 +43,7 @@ while ! [ -f failed ] && ! [ -f adminlock ]; do done # Send a warning if builds stop running -echo "Subject: `hostname` Portsnap builds no longer running!" | - sendmail ${BUILDMAIL_TO} +for ADDR in ${BUILDMAIL_TO}; do + echo "Subject: `hostname` Portsnap builds no longer running!" | + sendmail ${ADDR} +done From owner-svn-src-user@freebsd.org Thu Aug 23 02:22:08 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 127DE109DB71 for ; Thu, 23 Aug 2018 02:22:08 +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 BDB9479BF0; Thu, 23 Aug 2018 02:22:07 +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 9F1151BBFE; Thu, 23 Aug 2018 02:22:07 +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 w7N2M7IT076554; Thu, 23 Aug 2018 02:22:07 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7N2M7iV076553; Thu, 23 Aug 2018 02:22:07 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201808230222.w7N2M7iV076553@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:22:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r338231 - user/cperciva/portsnap-build X-SVN-Group: user X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: user/cperciva/portsnap-build X-SVN-Commit-Revision: 338231 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:22:08 -0000 Author: delphij Date: Thu Aug 23 02:22:07 2018 New Revision: 338231 URL: https://svnweb.freebsd.org/changeset/base/338231 Log: Diff reduction with production version, no functional change. Modified: user/cperciva/portsnap-build/releasesnap.sh Modified: user/cperciva/portsnap-build/releasesnap.sh ============================================================================== --- user/cperciva/portsnap-build/releasesnap.sh Thu Aug 23 02:21:40 2018 (r338230) +++ user/cperciva/portsnap-build/releasesnap.sh Thu Aug 23 02:22:07 2018 (r338231) @@ -60,7 +60,7 @@ tar -czf ${TARBALL} -C ${WORKDIR} tag tINDEX INDEX.gz # Unmount and delete the snapshot disk while ! umount /dev/md${SNAPMD}; do - sleep 1 + sleep 1; done mdconfig -d -u ${SNAPMD}