Module Name: src
Committed By: tls
Date: Sun Aug 10 06:47:47 UTC 2014
Modified Files:
src/distrib/alpha/floppy-GENERIC [tls-earlyentropy]: Makefile
src/distrib/alpha/instkernel/ramdisk [tls-earlyentropy]: list
src/distrib/alpha/rz25dist [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.21.2.1 src/distrib/alpha/floppy-GENERIC/Makefile
cvs rdiff -u -r1.44 -r1.44.20.1 src/distrib/alpha/instkernel/ramdisk/list
cvs rdiff -u -r1.30 -r1.30.2.1 src/distrib/alpha/rz25dist/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/alpha/floppy-GENERIC/Makefile
diff -u src/distrib/alpha/floppy-GENERIC/Makefile:1.21 src/distrib/alpha/floppy-GENERIC/Makefile:1.21.2.1
--- src/distrib/alpha/floppy-GENERIC/Makefile:1.21 Mon Jan 27 08:18:07 2014
+++ src/distrib/alpha/floppy-GENERIC/Makefile Sun Aug 10 06:47:47 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2014/01/27 08:18:07 apb Exp $
+# $NetBSD: Makefile,v 1.21.2.1 2014/08/10 06:47:47 tls Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -42,7 +42,7 @@ netbsd: ${FLOPPYKERNEL}
@rm -f ${.TARGET} ${.TARGET}.tmp
cp ${.ALLSRC} ${.TARGET}.tmp
${STRIP} ${.TARGET}.tmp
- ${TOOL_GZIP} -9nf ${.TARGET}.tmp
+ ${TOOL_GZIP_N} -9f ${.TARGET}.tmp
mv ${.TARGET}.tmp.gz ${.TARGET}
CLEANFILES+= netbsd netbsd.tmp netbsd.tmp.gz
Index: src/distrib/alpha/instkernel/ramdisk/list
diff -u src/distrib/alpha/instkernel/ramdisk/list:1.44 src/distrib/alpha/instkernel/ramdisk/list:1.44.20.1
--- src/distrib/alpha/instkernel/ramdisk/list:1.44 Sun Jul 3 23:11:31 2011
+++ src/distrib/alpha/instkernel/ramdisk/list Sun Aug 10 06:47:47 2014
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.44 2011/07/03 23:11:31 tron Exp $
+# $NetBSD: list,v 1.44.20.1 2014/08/10 06:47:47 tls Exp $
SRCDIRS bin sbin external/bsd/less/bin usr.bin usr.sbin
@@ -35,6 +35,7 @@ PROG sbin/mount_msdos
PROG sbin/mount_nfs
PROG sbin/newfs sbin/mount_mfs
PROG sbin/ping
+PROG sbin/raidctl
PROG sbin/reboot sbin/halt
PROG sbin/restore sbin/rrestore
PROG sbin/route
Index: src/distrib/alpha/rz25dist/Makefile
diff -u src/distrib/alpha/rz25dist/Makefile:1.30 src/distrib/alpha/rz25dist/Makefile:1.30.2.1
--- src/distrib/alpha/rz25dist/Makefile:1.30 Mon Jan 27 08:18:07 2014
+++ src/distrib/alpha/rz25dist/Makefile Sun Aug 10 06:47:47 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2014/01/27 08:18:07 apb Exp $
+# $NetBSD: Makefile,v 1.30.2.1 2014/08/10 06:47:47 tls Exp $
.include "../../../Makefile.inc"
@@ -77,21 +77,21 @@ diskimage.gz: mount-fs build-fs unmount-
umount ${DESTDIR}/usr ${DESTDIR}
/bin/rm -f $@
dd if=/dev/r${DESTDISK}c bs=`expr ${SECPERCYL} \* 512` \
- count=${CYLS} | ${TOOL_GZIP} -9n > $@
+ count=${CYLS} | ${TOOL_GZIP_N} -9 > $@
bin.tar.gz: mount-fs build-fs
/bin/rm -f $@
(cd ${DESTDIR} ; find . | grep -v '^./etc' | \
grep -v '^./usr/X11R6' | grep -v '^./netbsd' | \
- grep -v '^./boot' | pax -w -d | ${TOOL_GZIP} -9n) > $@
+ grep -v '^./boot' | pax -w -d | ${TOOL_GZIP_N} -9) > $@
etc.tar.gz: mount-fs build-fs
/bin/rm -f $@
- (cd ${DESTDIR} ; find ./etc | pax -w -d | ${TOOL_GZIP} -9n) > $@
+ (cd ${DESTDIR} ; find ./etc | pax -w -d | ${TOOL_GZIP_N} -9) > $@
x11.tar.gz: mount-fs build-fs
/bin/rm -f $@
- (cd ${DESTDIR} ; find ./usr/X11R6 | pax -w -d | ${TOOL_GZIP} -9n) > $@
+ (cd ${DESTDIR} ; find ./usr/X11R6 | pax -w -d | ${TOOL_GZIP_N} -9) > $@
.endif
