From owner-svn-src-user@freebsd.org Sun Jul 5 14:24:36 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D4C5396AB for ; Sun, 5 Jul 2015 14:24:36 +0000 (UTC) (envelope-from jceel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9ED1F1E99; Sun, 5 Jul 2015 14:24:36 +0000 (UTC) (envelope-from jceel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t65EOaki050744; Sun, 5 Jul 2015 14:24:36 GMT (envelope-from jceel@FreeBSD.org) Received: (from jceel@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t65EOah7050743; Sun, 5 Jul 2015 14:24:36 GMT (envelope-from jceel@FreeBSD.org) Message-Id: <201507051424.t65EOah7050743@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jceel set sender to jceel@FreeBSD.org using -f From: Jakub Wojciech Klama Date: Sun, 5 Jul 2015 14:24:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r285167 - user/jceel/soc2014_evdev/head/sys/dev/evdev 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.20 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: Sun, 05 Jul 2015 14:24:36 -0000 Author: jceel Date: Sun Jul 5 14:24:35 2015 New Revision: 285167 URL: https://svnweb.freebsd.org/changeset/base/285167 Log: Correctly handle data arguments in EV_SET_* ioctls. Modified: user/jceel/soc2014_evdev/head/sys/dev/evdev/uinput.c Modified: user/jceel/soc2014_evdev/head/sys/dev/evdev/uinput.c ============================================================================== --- user/jceel/soc2014_evdev/head/sys/dev/evdev/uinput.c Sun Jul 5 14:24:29 2015 (r285166) +++ user/jceel/soc2014_evdev/head/sys/dev/evdev/uinput.c Sun Jul 5 14:24:35 2015 (r285167) @@ -265,31 +265,31 @@ uinput_ioctl(struct cdev *dev, u_long cm break; case UI_SET_EVBIT: - evdev_support_event(state->ucs_evdev, (uint16_t)(uintptr_t)data); + evdev_support_event(state->ucs_evdev, (uint16_t)(uintptr_t)*data); break; case UI_SET_KEYBIT: - evdev_support_key(state->ucs_evdev, (uint16_t)(uintptr_t)data); + evdev_support_key(state->ucs_evdev, (uint16_t)(uintptr_t)*data); break; case UI_SET_RELBIT: - evdev_support_rel(state->ucs_evdev, (uint16_t)(uintptr_t)data); + evdev_support_rel(state->ucs_evdev, (uint16_t)(uintptr_t)*data); break; case UI_SET_ABSBIT: - evdev_support_abs(state->ucs_evdev, (uint16_t)(uintptr_t)data); + evdev_support_abs(state->ucs_evdev, (uint16_t)(uintptr_t)*data); break; case UI_SET_MSCBIT: - evdev_support_msc(state->ucs_evdev, (uint16_t)(uintptr_t)data); + evdev_support_msc(state->ucs_evdev, (uint16_t)(uintptr_t)*data); break; case UI_SET_LEDBIT: - evdev_support_led(state->ucs_evdev, (uint16_t)(uintptr_t)data); + evdev_support_led(state->ucs_evdev, (uint16_t)(uintptr_t)*data); break; case UI_SET_SNDBIT: - evdev_support_snd(state->ucs_evdev, (uint16_t)(uintptr_t)data); + evdev_support_snd(state->ucs_evdev, (uint16_t)(uintptr_t)*data); break; case UI_SET_PHYS: @@ -297,7 +297,7 @@ uinput_ioctl(struct cdev *dev, u_long cm break; case UI_SET_SWBIT: - evdev_support_sw(state->ucs_evdev, (uint16_t)(uintptr_t)data); + evdev_support_sw(state->ucs_evdev, (uint16_t)(uintptr_t)*data); break; case UI_SET_PROPBIT: From owner-svn-src-user@freebsd.org Mon Jul 6 05:57:42 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DDE08994EBF for ; Mon, 6 Jul 2015 05:57:42 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CE9F812BD; Mon, 6 Jul 2015 05:57:42 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t665vgvo032478; Mon, 6 Jul 2015 05:57:42 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t665vgou032477; Mon, 6 Jul 2015 05:57:42 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201507060557.t665vgou032477@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 6 Jul 2015 05:57:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r285196 - user/pho/stress2/misc 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.20 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: Mon, 06 Jul 2015 05:57:43 -0000 Author: pho Date: Mon Jul 6 05:57:41 2015 New Revision: 285196 URL: https://svnweb.freebsd.org/changeset/base/285196 Log: Added comment about issue found. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/mountu.sh Modified: user/pho/stress2/misc/mountu.sh ============================================================================== --- user/pho/stress2/misc/mountu.sh Mon Jul 6 05:08:57 2015 (r285195) +++ user/pho/stress2/misc/mountu.sh Mon Jul 6 05:57:41 2015 (r285196) @@ -31,6 +31,10 @@ # Change mount point from rw to ro with a file mapped rw # Currently fails for NFS +# Page fault seen: +# https://people.freebsd.org/~pho/stress/log/mountu.txt +# Fixed by: r285039. + [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 . ../default.cfg From owner-svn-src-user@freebsd.org Mon Jul 6 22:21:48 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 044299958B7 for ; Mon, 6 Jul 2015 22:21:48 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E5A6D1FC8; Mon, 6 Jul 2015 22:21:47 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t66MLlgc034417; Mon, 6 Jul 2015 22:21:47 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t66MLlvR034416; Mon, 6 Jul 2015 22:21:47 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201507062221.t66MLlvR034416@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 6 Jul 2015 22:21:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r285222 - user/gjb/thermite 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.20 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: Mon, 06 Jul 2015 22:21:48 -0000 Author: gjb Date: Mon Jul 6 22:21:46 2015 New Revision: 285222 URL: https://svnweb.freebsd.org/changeset/base/285222 Log: Pass WITH_DVD to ftp_stage() so dvd.iso images are renamed in the case of snapshot builds. Sponsored by: The FreeBSD Foundation Modified: user/gjb/thermite/thermite.sh Modified: user/gjb/thermite/thermite.sh ============================================================================== --- user/gjb/thermite/thermite.sh Mon Jul 6 20:56:59 2015 (r285221) +++ user/gjb/thermite/thermite.sh Mon Jul 6 22:21:46 2015 (r285222) @@ -261,6 +261,7 @@ ftp_stage() { -f Makefile.mirrors \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ KERNCONF=${KERNEL} WITH_VMIMAGES=${WITH_VMIMAGES} \ + WITH_DVD=${WITH_DVD} \ ftp-stage >> ${logdir}/${_build}.log 2>&1 if [ -z "${ftpdir}" ]; then From owner-svn-src-user@freebsd.org Tue Jul 7 07:28:16 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 84C1C99587C for ; Tue, 7 Jul 2015 07:28:16 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 75DFF1BA8; Tue, 7 Jul 2015 07:28:16 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t677SG0O012141; Tue, 7 Jul 2015 07:28:16 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t677SGq1012140; Tue, 7 Jul 2015 07:28:16 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201507070728.t677SGq1012140@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 7 Jul 2015 07:28:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r285238 - user/pho/stress2/misc 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.20 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: Tue, 07 Jul 2015 07:28:16 -0000 Author: pho Date: Tue Jul 7 07:28:15 2015 New Revision: 285238 URL: https://svnweb.freebsd.org/changeset/base/285238 Log: Make test lees verbose. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/quota10.sh Modified: user/pho/stress2/misc/quota10.sh ============================================================================== --- user/pho/stress2/misc/quota10.sh Tue Jul 7 06:34:28 2015 (r285237) +++ user/pho/stress2/misc/quota10.sh Tue Jul 7 07:28:15 2015 (r285238) @@ -84,7 +84,6 @@ else quotaoff ${mntpoint}$2 ) 2>&1 | egrep -v "No such file or directory" done - echo "Done 1 @ `date '+%T'`" else # The test: Parallel mount and unmounts @@ -98,6 +97,5 @@ else done done rm -f /tmp/$0 - echo "Done 2 @ `date '+%T'`" fi fi From owner-svn-src-user@freebsd.org Tue Jul 7 07:42:10 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0F139995B57 for ; Tue, 7 Jul 2015 07:42:10 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0029014E1; Tue, 7 Jul 2015 07:42:09 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t677g9nC021428; Tue, 7 Jul 2015 07:42:09 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t677g98g021427; Tue, 7 Jul 2015 07:42:09 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201507070742.t677g98g021427@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 7 Jul 2015 07:42:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r285239 - user/pho/stress2/misc 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.20 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: Tue, 07 Jul 2015 07:42:10 -0000 Author: pho Date: Tue Jul 7 07:42:08 2015 New Revision: 285239 URL: https://svnweb.freebsd.org/changeset/base/285239 Log: Added constant for number of test mount points to cleanup. Added minor improvements to the cleanup. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/cleanup.sh Modified: user/pho/stress2/misc/cleanup.sh ============================================================================== --- user/pho/stress2/misc/cleanup.sh Tue Jul 7 07:28:15 2015 (r285238) +++ user/pho/stress2/misc/cleanup.sh Tue Jul 7 07:42:08 2015 (r285239) @@ -32,21 +32,30 @@ . ../default.cfg -mount | grep -wq $mntpoint && umount -f $mntpoint +MOUNTS=31 +mount | grep -q "on $mntpoint " && umount -f $mntpoint rm -rf ${mntpoint}/stressX* -rm -f /tmp/.snap/pho* /var/.snap/pho* +rm -f /tmp/.snap/stress2* /var/.snap/stress2* rm -rf /tmp/stressX.control $RUNDIR /tmp/misc.name mkdir -p $RUNDIR chmod 0777 $RUNDIR -for i in `jot 16 0 | sort -nr` ""; do - while mount | grep -q "${mntpoint}$i "; do +for i in `jot $MOUNTS 0 | sort -nr` ""; do + while mount | grep -q "on ${mntpoint}$i "; do fstat ${mntpoint}$i | sed 1d | awk '{print $3}' | xargs kill umount -f ${mntpoint}$i > /dev/null 2>&1 done done +# Delete the test mount points /mnt0 .. /mnt31 +for i in `jot $MOUNTS 0`; do + if ! mount | grep -q "on ${mntpoint}$i "; then + [ -d ${mntpoint}$i ] && find ${mntpoint}$i -delete 2>/dev/null + rm -rf ${mntpoint}$i > /dev/null 2>&1 + fi +done +find $mntpoint/* -delete 2>/dev/null m=$mdstart -for i in `jot 15`; do - mdconfig -l | grep -q md$m && mdconfig -d -u $m +for i in `jot $MOUNTS`; do + [ -c /dev/md$m ] && mdconfig -d -u $m m=$((m + 1)) done From owner-svn-src-user@freebsd.org Wed Jul 8 16:20:21 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 71C7D9968ED for ; Wed, 8 Jul 2015 16:20:21 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 62A17127E; Wed, 8 Jul 2015 16:20:21 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t68GKLiA098496; Wed, 8 Jul 2015 16:20:21 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t68GKLGR098495; Wed, 8 Jul 2015 16:20:21 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201507081620.t68GKLGR098495@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 8 Jul 2015 16:20:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r285276 - user/pho/stress2/misc 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.20 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, 08 Jul 2015 16:20:21 -0000 Author: pho Date: Wed Jul 8 16:20:20 2015 New Revision: 285276 URL: https://svnweb.freebsd.org/changeset/base/285276 Log: Test scenario would seg fault on i386. Diagnosed by: kib Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/datamove2.sh Modified: user/pho/stress2/misc/datamove2.sh ============================================================================== --- user/pho/stress2/misc/datamove2.sh Wed Jul 8 16:19:32 2015 (r285275) +++ user/pho/stress2/misc/datamove2.sh Wed Jul 8 16:20:20 2015 (r285276) @@ -44,7 +44,7 @@ rm -f datamove2.c for i in `jot 2`; do $here/../testcases/swap/swap -t 10m -i 200 -h & - /tmp/datamove2 + /tmp/datamove2 || { echo FAIL; exit 1; } ps | grep swap | grep -v swap | awk '{print $1}' | xargs kill done rm -rf /tmp/datamove2 @@ -169,8 +169,16 @@ unmapBuffer(char *bufferp) { if (munmap(bufferp, pagesize * 2) == -1) err(1, "unmap 1. buffer"); + /* + The following unmaps something random, which could trigger: + Program received signal SIGSEGV, Segmentation fault. + free (cp=0x28070000) at /usr/src/libexec/rtld-elf/malloc.c:311 + */ + +#if 0 if (munmap(bufferp + pagesize * 2, pagesize * 2) == -1) err(1, "unmap 2. buffer"); +#endif } int From owner-svn-src-user@freebsd.org Fri Jul 10 21:17:51 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0E8F2997B38 for ; Fri, 10 Jul 2015 21:17:51 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F33921E7C; Fri, 10 Jul 2015 21:17:50 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6ALHoAe007324; Fri, 10 Jul 2015 21:17:50 GMT (envelope-from cperciva@FreeBSD.org) Received: (from cperciva@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6ALHoTl007323; Fri, 10 Jul 2015 21:17:50 GMT (envelope-from cperciva@FreeBSD.org) Message-Id: <201507102117.t6ALHoTl007323@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cperciva set sender to cperciva@FreeBSD.org using -f From: Colin Percival Date: Fri, 10 Jul 2015 21:17:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r285364 - user/cperciva/freebsd-update-build/scripts 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.20 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: Fri, 10 Jul 2015 21:17:51 -0000 Author: cperciva Date: Fri Jul 10 21:17:49 2015 New Revision: 285364 URL: https://svnweb.freebsd.org/changeset/base/285364 Log: When initializing a new set of builds, INDEX-NEW will be empty. When we filter out /boot/kernel/linker.hints from this empty file, we will be left with... an empty file. Unfortunately, fgrep, having read no lines and produced no output, returns an exit status of 1, which sh -e interprets as an error. Add a || true to the fgrep added in r276160 in order to unbreak init builds. Pointy Hat to: cperciva Modified: user/cperciva/freebsd-update-build/scripts/build.subr Modified: user/cperciva/freebsd-update-build/scripts/build.subr ============================================================================== --- user/cperciva/freebsd-update-build/scripts/build.subr Fri Jul 10 19:27:19 2015 (r285363) +++ user/cperciva/freebsd-update-build/scripts/build.subr Fri Jul 10 21:17:49 2015 (r285364) @@ -900,7 +900,7 @@ stageworld () { # Create publishable version indexpublish < ${WORKDIR}/${M}.new \ | fgrep -v 'kernel|generic|/boot/kernel/linker.hints' \ - > ${WORKDIR}/${M}.new.pub + > ${WORKDIR}/${M}.new.pub || true # Copy to staging area H=`sha256 -q ${WORKDIR}/${M}.new.pub`