svn commit: r295757 - in head: lib/libc/tests/gen/posix_spawn lib/libc/tests/sys sys/boot/efi/boot1 sys/boot/i386/boot2 sys/boot/i386/pxeldr sys/boot/i386/zfsboot

[Bryan Drewery]

On 2/18/2016 6:17 AM, Ed Maste wrote:
> Author: emaste
> Date: Thu Feb 18 14:17:28 2016
> New Revision: 295757
> URL: https://svnweb.freebsd.org/changeset/base/295757
> 
> Log:
>   Remove dd xfer stats emitted during buildworld
>   
>   They result in gratuitous differences when comparing build log output.
> 
> Modified:
>   head/lib/libc/tests/gen/posix_spawn/Makefile
>   head/lib/libc/tests/sys/Makefile
>   head/sys/boot/efi/boot1/Makefile
>   head/sys/boot/i386/boot2/Makefile
>   head/sys/boot/i386/pxeldr/Makefile
>   head/sys/boot/i386/zfsboot/Makefile
> 
> Modified: head/lib/libc/tests/gen/posix_spawn/Makefile
> ==============================================================================
> --- head/lib/libc/tests/gen/posix_spawn/Makefile	Thu Feb 18 13:07:21 2016	(r295756)
> +++ head/lib/libc/tests/gen/posix_spawn/Makefile	Thu Feb 18 14:17:28 2016	(r295757)
> @@ -20,7 +20,7 @@ CLEANFILES+=	h_nonexec
>  .include "../../Makefile.netbsd-tests"
>  
>  h_zero:
> -	dd if=/dev/zero of=h_zero bs=1k count=2
> +	dd if=/dev/zero of=h_zero bs=1k count=2 status=none
>  	chmod a+x h_zero
>  
>  CLEANFILES+=	h_zero
> 
> Modified: head/lib/libc/tests/sys/Makefile
> ==============================================================================
> --- head/lib/libc/tests/sys/Makefile	Thu Feb 18 13:07:21 2016	(r295756)
> +++ head/lib/libc/tests/sys/Makefile	Thu Feb 18 14:17:28 2016	(r295757)
> @@ -78,6 +78,6 @@ truncate_test_FILESGRP= wheel
>  
>  CLEANFILES=	truncate_test.root_owned
>  truncate_test.root_owned:
> -	dd if=/dev/null bs=1 count=1 of=${.TARGET}
> +	dd if=/dev/null bs=1 count=1 of=${.TARGET} status=none
>  
>  .include <bsd.test.mk>
> 
> Modified: head/sys/boot/efi/boot1/Makefile
> ==============================================================================
> --- head/sys/boot/efi/boot1/Makefile	Thu Feb 18 13:07:21 2016	(r295756)
> +++ head/sys/boot/efi/boot1/Makefile	Thu Feb 18 14:17:28 2016	(r295757)
> @@ -113,7 +113,8 @@ boot1.efifat: boot1.efi
>  	uudecode ${.CURDIR}/fat-${MACHINE}.tmpl.bz2.uu
>  	mv fat-${MACHINE}.tmpl.bz2 ${.TARGET}.bz2
>  	bzip2 -f -d ${.TARGET}.bz2
> -	dd if=boot1.efi of=${.TARGET} seek=${BOOT1_OFFSET} conv=notrunc
> +	dd if=boot1.efi of=${.TARGET} seek=${BOOT1_OFFSET} conv=notrunc \
> +	    status=none
>  
>  CLEANFILES= boot1.efi boot1.efifat
>  
> 
> Modified: head/sys/boot/i386/boot2/Makefile
> ==============================================================================
> --- head/sys/boot/i386/boot2/Makefile	Thu Feb 18 13:07:21 2016	(r295756)
> +++ head/sys/boot/i386/boot2/Makefile	Thu Feb 18 14:17:28 2016	(r295757)
> @@ -72,14 +72,14 @@ CLEANFILES+=	boot2 boot2.ld boot2.ldr bo
>  boot2: boot2.ld
>  	@set -- `ls -l boot2.ld`; x=$$((7680-$$5)); \
>  	    echo "$$x bytes available"; test $$x -ge 0
> -	dd if=boot2.ld of=${.TARGET} obs=7680 conv=osync
> +	dd if=boot2.ld of=${.TARGET} obs=7680 conv=osync status=none
>  
>  boot2.ld: boot2.ldr boot2.bin ${BTXKERN}
>  	btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l boot2.ldr \
>  	    -o ${.TARGET} -P 1 boot2.bin
>  
>  boot2.ldr:
> -	dd if=/dev/zero of=${.TARGET} bs=512 count=1
> +	dd if=/dev/zero of=${.TARGET} bs=512 count=1 status=none
>  
>  boot2.bin: boot2.out
>  	${OBJCOPY} -S -O binary boot2.out ${.TARGET}
> 
> Modified: head/sys/boot/i386/pxeldr/Makefile
> ==============================================================================
> --- head/sys/boot/i386/pxeldr/Makefile	Thu Feb 18 13:07:21 2016	(r295756)
> +++ head/sys/boot/i386/pxeldr/Makefile	Thu Feb 18 14:17:28 2016	(r295757)
> @@ -31,7 +31,7 @@ CLEANFILES+= ${BOOT}.tmp
>  
>  ${BOOT}: ${LDR} ${LOADER}
>  	cat ${LDR} ${LOADER} > ${.TARGET}.tmp
> -	dd if=${.TARGET}.tmp of=${.TARGET} obs=2k conv=osync
> +	dd if=${.TARGET}.tmp of=${.TARGET} obs=2k conv=osync status=none
>  	rm ${.TARGET}.tmp
>  
>  LDFLAGS+=-e start -Ttext ${ORG} -Wl,-N,-S,--oformat,binary
> 
> Modified: head/sys/boot/i386/zfsboot/Makefile
> ==============================================================================
> --- head/sys/boot/i386/zfsboot/Makefile	Thu Feb 18 13:07:21 2016	(r295756)
> +++ head/sys/boot/i386/zfsboot/Makefile	Thu Feb 18 14:17:28 2016	(r295757)
> @@ -65,7 +65,7 @@ BOOT2SIZE=	65536
>  zfsboot2: zfsboot.ld
>  	@set -- `ls -l zfsboot.ld`; x=$$((${BOOT2SIZE}-$$5)); \
>  	    echo "$$x bytes available"; test $$x -ge 0
> -	dd if=zfsboot.ld of=${.TARGET} obs=${BOOT2SIZE} conv=osync
> +	dd if=zfsboot.ld of=${.TARGET} obs=${BOOT2SIZE} conv=osync status=none
>  
>  zfsboot.ld: zfsboot.ldr zfsboot.bin ${BTXKERN}
>  	btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l zfsboot.ldr \
> 

(From Peter) You'll need to add bin/dd to bootstrap-tools now. It only
learned status= support in 2014 in r264059.

-- 
Regards,
Bryan Drewery

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20160302/468bd39f/attachment.sig>