CVS commit: [tls-earlyentropy] src/etc/etc.mac68k
Module Name:src Committed By: tls Date: Sun Aug 10 06:49:08 UTC 2014 Modified Files: src/etc/etc.mac68k [tls-earlyentropy]: Makefile.inc Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.20.42.1 src/etc/etc.mac68k/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.mac68k/Makefile.inc diff -u src/etc/etc.mac68k/Makefile.inc:1.20 src/etc/etc.mac68k/Makefile.inc:1.20.42.1 --- src/etc/etc.mac68k/Makefile.inc:1.20 Tue Mar 18 04:20:37 2008 +++ src/etc/etc.mac68k/Makefile.inc Sun Aug 10 06:49:08 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.20 2008/03/18 04:20:37 lukem Exp $ +# $NetBSD: Makefile.inc,v 1.20.42.1 2014/08/10 06:49:08 tls Exp $ # # etc.mac68k/Makefile.inc -- mac68k-specific etc Makefile targets #
CVS commit: [tls-earlyentropy] src/etc/etc.evbarm
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:49:05 UTC 2014
Modified Files:
src/etc/etc.evbarm [tls-earlyentropy]: Makefile.inc
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.62.2.1 src/etc/etc.evbarm/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.62 src/etc/etc.evbarm/Makefile.inc:1.62.2.1
--- src/etc/etc.evbarm/Makefile.inc:1.62 Sun Mar 30 16:00:48 2014
+++ src/etc/etc.evbarm/Makefile.inc Sun Aug 10 06:49:05 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.62 2014/03/30 16:00:48 matt Exp $
+# $NetBSD: Makefile.inc,v 1.62.2.1 2014/08/10 06:49:05 tls Exp $
#
# etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
#
@@ -91,6 +91,8 @@ EVBARM_BOARDS.armv7hf+= OMAP5EVM
#EVBARM_BOARDS.armv7+= OVERO
EVBARM_BOARDS.armv7+= PANDABOARD
EVBARM_BOARDS.armv7hf+= PANDABOARD
+EVBARM_BOARDS.armv7+= KOBO
+EVBARM_BOARDS.armv7hf+= KOBO
.endif
IMAGE.rel= ${RELEASEDIR}/${RELEASEMACHINEDIR}
CVS commit: [tls-earlyentropy] src/etc/defaults
Module Name:src Committed By: tls Date: Sun Aug 10 06:49:03 UTC 2014 Modified Files: src/etc/defaults [tls-earlyentropy]: rc.conf Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.122 -r1.122.8.1 src/etc/defaults/rc.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/defaults/rc.conf diff -u src/etc/defaults/rc.conf:1.122 src/etc/defaults/rc.conf:1.122.8.1 --- src/etc/defaults/rc.conf:1.122 Sun Jan 13 18:47:57 2013 +++ src/etc/defaults/rc.conf Sun Aug 10 06:49:03 2014 @@ -1,4 +1,4 @@ -# $NetBSD: rc.conf,v 1.122 2013/01/13 18:47:57 prlw1 Exp $ +# $NetBSD: rc.conf,v 1.122.8.1 2014/08/10 06:49:03 tls Exp $ # # /etc/defaults/rc.conf -- # default configuration of /etc/rc.conf @@ -42,7 +42,7 @@ rc_silent_cmd=twiddle rc_rcorder_flags= # The directories searched for rc scripts. -# These directories must be part of the root filesystem. +# These directories must be part of the root file system. rc_directories=/etc/rc.d # If this is set to NO, shutdown(8) will not run /etc/rc.shutdown. @@ -140,7 +140,7 @@ rtclocaltime=NO # NOTE: default coredump name now set in /etc/sysctl.conf # -# File system check flags; default to preen mode, checking filesystems +# File system check flags; default to preen mode, checking file systems # that are listed in /etc/fstab in parallel as the fsck pass number # permits. Fix minor faults automatically, and exit with non 0 only # when major errors occur.
CVS commit: [tls-earlyentropy] src/etc/etc.macppc
Module Name:src Committed By: tls Date: Sun Aug 10 06:49:15 UTC 2014 Modified Files: src/etc/etc.macppc [tls-earlyentropy]: Makefile.inc Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.8.56.1 src/etc/etc.macppc/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.macppc/Makefile.inc diff -u src/etc/etc.macppc/Makefile.inc:1.8 src/etc/etc.macppc/Makefile.inc:1.8.56.1 --- src/etc/etc.macppc/Makefile.inc:1.8 Tue Jul 24 10:49:26 2007 +++ src/etc/etc.macppc/Makefile.inc Sun Aug 10 06:49:15 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.8 2007/07/24 10:49:26 pavel Exp $ +# $NetBSD: Makefile.inc,v 1.8.56.1 2014/08/10 06:49:15 tls Exp $ # # etc.macppc/Makefile.inc -- macppc-specific etc Makefile targets # @@ -6,7 +6,7 @@ # If you change the list of distributed kernels, don't forget # to update the release documentation in distrib/notes/common/contents -KERNEL_SETS= GENERIC GENERIC.MP +KERNEL_SETS= GENERIC GENERIC.MP GENERIC_601 BUILD_KERNELS+= INSTALL GENERIC_MD
CVS commit: [tls-earlyentropy] src/etc/namedb
Module Name:src Committed By: tls Date: Sun Aug 10 06:49:21 UTC 2014 Modified Files: src/etc/namedb [tls-earlyentropy]: root.cache Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.17.8.1 src/etc/namedb/root.cache Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/namedb/root.cache diff -u src/etc/namedb/root.cache:1.17 src/etc/namedb/root.cache:1.17.8.1 --- src/etc/namedb/root.cache:1.17 Tue Jan 8 11:15:49 2013 +++ src/etc/namedb/root.cache Sun Aug 10 06:49:21 2014 @@ -1,4 +1,4 @@ -; $NetBSD: root.cache,v 1.17 2013/01/08 11:15:49 taca Exp $ +; $NetBSD: root.cache,v 1.17.8.1 2014/08/10 06:49:21 tls Exp $ ; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the cache . file @@ -10,8 +10,8 @@ ; on server FTP.INTERNIC.NET ; -OR-RS.INTERNIC.NET ; -; last update:Jan 3, 2013 -; related version of root zone: 2013010300 +; last update:June 2, 2014 +; related version of root zone: 2014060201 ; ; formerly NS.INTERNIC.NET ; @@ -23,11 +23,13 @@ A.ROOT-SERVERS.NET. 360 AA ; .360 NSB.ROOT-SERVERS.NET. B.ROOT-SERVERS.NET. 360 A 192.228.79.201 +B.ROOT-SERVERS.NET. 360 2001:500:84::B ; ; FORMERLY C.PSI.NET ; .360 NSC.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 360 A 192.33.4.12 +C.ROOT-SERVERS.NET. 360 2001:500:2::C ; ; FORMERLY TERP.UMD.EDU ;
CVS commit: [tls-earlyentropy] src/etc/rc.d
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:49:24 UTC 2014
Modified Files:
src/etc/rc.d [tls-earlyentropy]: dhcpcd dhcpd mountall mountcritlocal
mountcritremote named network random_seed
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.4.1 src/etc/rc.d/dhcpcd
cvs rdiff -u -r1.6 -r1.6.70.1 src/etc/rc.d/dhcpd
cvs rdiff -u -r1.8 -r1.8.24.1 src/etc/rc.d/mountall
cvs rdiff -u -r1.13 -r1.13.24.1 src/etc/rc.d/mountcritlocal
cvs rdiff -u -r1.8 -r1.8.70.1 src/etc/rc.d/mountcritremote
cvs rdiff -u -r1.23 -r1.23.8.1 src/etc/rc.d/named
cvs rdiff -u -r1.63 -r1.63.6.1 src/etc/rc.d/network
cvs rdiff -u -r1.6 -r1.6.8.1 src/etc/rc.d/random_seed
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/dhcpcd
diff -u src/etc/rc.d/dhcpcd:1.2 src/etc/rc.d/dhcpcd:1.2.4.1
--- src/etc/rc.d/dhcpcd:1.2 Tue Jun 25 13:02:53 2013
+++ src/etc/rc.d/dhcpcd Sun Aug 10 06:49:24 2014
@@ -9,6 +9,7 @@ $_rc_subr_loaded . /etc/rc.subr
name=dhcpcd
rcvar=$name
command=/sbin/$name
+extra_commands=reload
load_rc_config $name
Index: src/etc/rc.d/dhcpd
diff -u src/etc/rc.d/dhcpd:1.6 src/etc/rc.d/dhcpd:1.6.70.1
--- src/etc/rc.d/dhcpd:1.6 Fri Aug 13 18:08:03 2004
+++ src/etc/rc.d/dhcpd Sun Aug 10 06:49:24 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: dhcpd,v 1.6 2004/08/13 18:08:03 mycroft Exp $
+# $NetBSD: dhcpd,v 1.6.70.1 2014/08/10 06:49:24 tls Exp $
#
# PROVIDE: dhcpd
@@ -12,8 +12,17 @@ $_rc_subr_loaded . /etc/rc.subr
name=dhcpd
rcvar=$name
command=/usr/sbin/${name}
+start_precmd=dhcpd_precmd
pidfile=/var/run/${name}.pid
-required_files=/etc/${name}.conf /var/db/${name}.leases
+required_files=/etc/${name}.conf
+
+dhcpd_precmd()
+{
+if [ ! -e /var/db/${name}.leases ]; then
+echo Creating /var/db/${name}.leases
+touch /var/db/${name}.leases
+fi
+}
load_rc_config $name
run_rc_command $1
Index: src/etc/rc.d/mountall
diff -u src/etc/rc.d/mountall:1.8 src/etc/rc.d/mountall:1.8.24.1
--- src/etc/rc.d/mountall:1.8 Sun Oct 18 21:58:37 2009
+++ src/etc/rc.d/mountall Sun Aug 10 06:49:24 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: mountall,v 1.8 2009/10/18 21:58:37 haad Exp $
+# $NetBSD: mountall,v 1.8.24.1 2014/08/10 06:49:24 tls Exp $
#
# REQUIRE: mountcritremote named ypbind
@@ -14,7 +14,7 @@ stop_cmd=mountall_stop
mountall_start()
{
- echo 'Mounting all filesystems...'
+ echo 'Mounting all file systems...'
if [ -f /etc/zfs/zpool.cache ]; then
# Get ZFS module loaded (and thereby, zvols created).
zfs list /dev/null 21
@@ -32,7 +32,7 @@ mountall_start()
mountall_stop()
{
- echo 'Unmounting all filesystems...'
+ echo 'Unmounting all file systems...'
if [ -f /etc/zfs/zpool.cache ]; then
# Unmount ZFS file systems.
zfs unmount -a
Index: src/etc/rc.d/mountcritlocal
diff -u src/etc/rc.d/mountcritlocal:1.13 src/etc/rc.d/mountcritlocal:1.13.24.1
--- src/etc/rc.d/mountcritlocal:1.13 Thu Jan 13 22:30:09 2011
+++ src/etc/rc.d/mountcritlocal Sun Aug 10 06:49:24 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: mountcritlocal,v 1.13 2011/01/13 22:30:09 haad Exp $
+# $NetBSD: mountcritlocal,v 1.13.24.1 2014/08/10 06:49:24 tls Exp $
#
# PROVIDE: mountcritlocal
@@ -14,7 +14,7 @@ stop_cmd=:
mountcritlocal_start()
{
- # Mount critical filesystems that are `local'
+ # Mount critical file systems that are `local'
# (as specified in $critical_filesystems_local)
# This usually includes /var.
#
Index: src/etc/rc.d/mountcritremote
diff -u src/etc/rc.d/mountcritremote:1.8 src/etc/rc.d/mountcritremote:1.8.70.1
--- src/etc/rc.d/mountcritremote:1.8 Fri Aug 13 18:08:03 2004
+++ src/etc/rc.d/mountcritremote Sun Aug 10 06:49:24 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: mountcritremote,v 1.8 2004/08/13 18:08:03 mycroft Exp $
+# $NetBSD: mountcritremote,v 1.8.70.1 2014/08/10 06:49:24 tls Exp $
#
# PROVIDE: mountcritremote
@@ -14,7 +14,7 @@ stop_cmd=:
mountcritremote_start()
{
- # Mount critical filesystems that may be `remote'.
+ # Mount critical file systems that may be `remote'.
# (as specified in $critical_filesystems_remote)
# This usually includes /usr.
#
Index: src/etc/rc.d/named
diff -u src/etc/rc.d/named:1.23 src/etc/rc.d/named:1.23.8.1
--- src/etc/rc.d/named:1.23 Mon Oct 1 18:46:43 2012
+++ src/etc/rc.d/named Sun Aug 10 06:49:24 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: named,v 1.23 2012/10/01 18:46:43 christos Exp $
+# $NetBSD: named,v 1.23.8.1 2014/08/10 06:49:24 tls Exp $
#
# PROVIDE: named
@@ -63,6 +63,11 @@ named_migrate()
named_precmd()
{
+ if [ ! -e /etc/rndc.key ]; then
+ echo Generating rndc.key
+ /usr/sbin/rndc-confgen -a
+ fi
+
if [ -z $named_chrootdir ]; then
if [ ! -d /etc/namedb/keys ]; then
mkdir -m 775 /etc/namedb/keys
@@ -96,7 +101,7 @@ named_precmd()
;;
esac
- for i in null random; do
+ for i in null random urandom; do
if [
CVS commit: [tls-earlyentropy] src/etc/mtree
Module Name:src Committed By: tls Date: Sun Aug 10 06:49:17 UTC 2014 Modified Files: src/etc/mtree [tls-earlyentropy]: NetBSD.dist.base NetBSD.dist.earm NetBSD.dist.mips64eb NetBSD.dist.mips64el NetBSD.dist.powerpc64 NetBSD.dist.sparc64 NetBSD.dist.tests NetBSD.dist.x86_64 special Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.135 -r1.135.2.1 src/etc/mtree/NetBSD.dist.base cvs rdiff -u -r1.1 -r1.1.8.1 src/etc/mtree/NetBSD.dist.earm cvs rdiff -u -r1.7 -r1.7.4.1 src/etc/mtree/NetBSD.dist.mips64eb cvs rdiff -u -r1.8 -r1.8.4.1 src/etc/mtree/NetBSD.dist.mips64el cvs rdiff -u -r1.1 -r1.1.2.1 src/etc/mtree/NetBSD.dist.powerpc64 cvs rdiff -u -r1.8 -r1.8.2.1 src/etc/mtree/NetBSD.dist.sparc64 cvs rdiff -u -r1.103 -r1.103.2.1 src/etc/mtree/NetBSD.dist.tests cvs rdiff -u -r1.7 -r1.7.2.1 src/etc/mtree/NetBSD.dist.x86_64 cvs rdiff -u -r1.146 -r1.146.4.1 src/etc/mtree/special Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.135 src/etc/mtree/NetBSD.dist.base:1.135.2.1 --- src/etc/mtree/NetBSD.dist.base:1.135 Mon Mar 31 11:25:48 2014 +++ src/etc/mtree/NetBSD.dist.base Sun Aug 10 06:49:17 2014 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.135 2014/03/31 11:25:48 martin Exp $ +# $NetBSD: NetBSD.dist.base,v 1.135.2.1 2014/08/10 06:49:17 tls Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -231,7 +231,7 @@ ./usr/lib ./usr/lib/i18n ./usr/lib/lua -./usr/lib/lua/5.1 +./usr/lib/lua/5.3 ./usr/lib/pkgconfig ./usr/lib/security ./usr/libdata @@ -271,95 +271,67 @@ ./usr/share/dict/papers ./usr/share/dict/special ./usr/share/doc -./usr/share/doc/atf -./usr/share/doc/groff -./usr/share/doc/groff/mom -./usr/share/doc/html -./usr/share/doc/html/bind9 -./usr/share/doc/html/bind9/arm -./usr/share/doc/html/bzip2 -./usr/share/doc/html/groff -./usr/share/doc/html/groff/mom -./usr/share/doc/html/ntp -./usr/share/doc/html/ntp/build -./usr/share/doc/html/ntp/drivers -./usr/share/doc/html/ntp/drivers/icons -./usr/share/doc/html/ntp/drivers/scripts -./usr/share/doc/html/ntp/icons -./usr/share/doc/html/ntp/scripts -./usr/share/doc/html/postfix -./usr/share/doc/kyua-atf-compat -./usr/share/doc/kyua-cli -./usr/share/doc/kyua-testers +./usr/share/doc/papers +./usr/share/doc/papers/mckusick84-ffs +./usr/share/doc/papers/mckusick85-fsck +./usr/share/doc/papers/morris78-password ./usr/share/doc/psd -./usr/share/doc/psd/01.cacm -./usr/share/doc/psd/02.implement -./usr/share/doc/psd/03.iosys -./usr/share/doc/psd/04.uprog -./usr/share/doc/psd/05.sysman -./usr/share/doc/psd/06.Clang -./usr/share/doc/psd/07.pascal -./usr/share/doc/psd/08.f77 -./usr/share/doc/psd/09.f77io -./usr/share/doc/psd/10.gdb -./usr/share/doc/psd/11.adb -./usr/share/doc/psd/12.make -./usr/share/doc/psd/13.rcs -./usr/share/doc/psd/14.sccs -./usr/share/doc/psd/15.yacc -./usr/share/doc/psd/16.lex -./usr/share/doc/psd/17.m4 -./usr/share/doc/psd/18.gprof -./usr/share/doc/psd/19.curses -./usr/share/doc/psd/20.ipctut -./usr/share/doc/psd/21.ipc +./usr/share/doc/reference +./usr/share/doc/reference/ref1 +./usr/share/doc/reference/ref1/atf +./usr/share/doc/reference/ref1/bzip2 +./usr/share/doc/reference/ref1/config +./usr/share/doc/reference/ref1/csh +./usr/share/doc/reference/ref1/ex +./usr/share/doc/reference/ref1/gprof +./usr/share/doc/reference/ref1/kyua +./usr/share/doc/reference/ref1/kyua/kyua-atf-compat +./usr/share/doc/reference/ref1/kyua/kyua-cli +./usr/share/doc/reference/ref1/kyua/kyua-testers +./usr/share/doc/reference/ref1/mail +./usr/share/doc/reference/ref1/make +./usr/share/doc/reference/ref1/roff +./usr/share/doc/reference/ref1/roff/memacros +./usr/share/doc/reference/ref1/roff/meref +./usr/share/doc/reference/ref1/roff/msdiffs +./usr/share/doc/reference/ref1/roff/msmacros +./usr/share/doc/reference/ref1/roff/mom +./usr/share/doc/reference/ref1/roff/mom_examples +./usr/share/doc/reference/ref1/sh +./usr/share/doc/reference/ref1/vi +./usr/share/doc/reference/ref2 +./usr/share/doc/reference/ref3 +./usr/share/doc/reference/ref3/curses +./usr/share/doc/reference/ref3/sockets +./usr/share/doc/reference/ref3/sockets-advanced +./usr/share/doc/reference/ref3/sysman +./usr/share/doc/reference/ref4 +./usr/share/doc/reference/ref5 +./usr/share/doc/reference/ref5/timed +./usr/share/doc/reference/ref6 +./usr/share/doc/reference/ref6/rogue +./usr/share/doc/reference/ref6/trek +./usr/share/doc/reference/ref7 +./usr/share/doc/reference/ref7/quotas +./usr/share/doc/reference/ref8 +./usr/share/doc/reference/ref8/bind9 +./usr/share/doc/reference/ref8/bind9/arm +./usr/share/doc/reference/ref8/lpd +./usr/share/doc/reference/ref8/ntp +./usr/share/doc/reference/ref8/ntp/drivers +./usr/share/doc/reference/ref8/ntp/drivers/scripts +./usr/share/doc/reference/ref8/ntp/scripts
CVS commit: [tls-earlyentropy] src/etc
Module Name:src
Committed By: tls
Date: Sun Aug 10 07:03:07 UTC 2014
Modified Files:
src/etc [tls-earlyentropy]: Makefile Makefile.params daily locate.conf
rc rc.conf rc.subr services
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.412 -r1.412.2.1 src/etc/Makefile
cvs rdiff -u -r1.11 -r1.11.2.1 src/etc/Makefile.params
cvs rdiff -u -r1.90 -r1.90.2.1 src/etc/daily
cvs rdiff -u -r1.1 -r1.1.76.1 src/etc/locate.conf
cvs rdiff -u -r1.166 -r1.166.20.1 src/etc/rc
cvs rdiff -u -r1.96 -r1.96.78.1 src/etc/rc.conf
cvs rdiff -u -r1.92 -r1.92.8.1 src/etc/rc.subr
cvs rdiff -u -r1.97 -r1.97.8.1 src/etc/services
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.412 src/etc/Makefile:1.412.2.1
--- src/etc/Makefile:1.412 Mon Jan 27 21:37:17 2014
+++ src/etc/Makefile Sun Aug 10 07:03:06 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.412 2014/01/27 21:37:17 apb Exp $
+# $NetBSD: Makefile,v 1.412.2.1 2014/08/10 07:03:06 tls Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -47,6 +47,8 @@ CKSUM?= ${TOOL_CKSUM}
MAKESUMS= MAKE=${MAKE:Q} CKSUM=${CKSUM:Q} ${HOST_SH} ${NETBSDSRCDIR}/distrib/sets/makesums
DISTRIBVER!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
+GZIP_FLAGS= -9 ${GZIP_N_FLAG}
+
# Flags for creating ISO CDROM image
# mkisofs is expected to be in $PATH, install via pkgsrc/sysutils/cdrtools
# Note: At least mkisofs 2.0 should be used.
@@ -193,9 +195,20 @@ etc-release: .EXEC .MAKE
echo ; \
cat ${NETBSDSRCDIR}/sys/conf/copyright; \
echo ; \
- echo Build settings:; \
+ echo Build information:; \
printf %20s %s\n Build date $$(date -u); \
printf %20s %s\n Built by $${USER-root}@$$(hostname); \
+ if [ -n ${BUILDID} ]; then \
+ printf %20s %s\n Build ID ${BUILDID} ; \
+ fi ; \
+ if [ -n ${BUILDINFO} ]; then \
+ echo ; \
+ info=$$(printf %b ${BUILDINFO:Q}) ; \
+ printf %s\n $${info} \
+ | ${TOOL_SED} -e 's/^//' ; \
+ fi ; \
+ echo ; \
+ echo Build settings:; \
echo ; \
${PRINT_PARAMS} ; \
) ${.OBJDIR}/${.TARGET}
@@ -402,7 +415,7 @@ release snapshot: .PHONY .MAKE check_DES
# Note: At least mkisofs 2.0 should be used.
#
CDROM_NAME_ADD?=
-CDROM_IMAGE?=${RELEASEDIR}/iso/NetBSD-${DISTRIBVER}-${MACHINE}.iso
+CDROM_IMAGE?=${RELEASEDIR}/images/NetBSD-${DISTRIBVER}-${MACHINE}.iso
CDROM.dir= ${.OBJDIR}/cdrom.dir
CDROM.pathlist= ${.OBJDIR}/cdrom.pathlist
@@ -410,7 +423,7 @@ iso-image:
.if ${MKISOFS} != true
do-iso-image: .PHONY check_DESTDIR check_RELEASEDIR iso-image-md-post
- ${MAKESUMS} -t ${RELEASEDIR}/iso/ '*.iso'
+ ${MAKESUMS} -t ${RELEASEDIR}/images/ '*.iso'
@echo iso-image created as: ${CDROM_IMAGE}
.else
do-iso-image:
@@ -426,12 +439,14 @@ iso-image-setup: .PHONY check_RELEASEDIR
.endfor
echo ${MACHINE}/=${RELEASEDIR}/${RELEASEMACHINEDIR}/ ${CDROM.pathlist}
mkdir -p ${CDROM.dir}
- mkdir -p ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom
+
+check_imagedir:
+ mkdir -p ${RELEASEDIR}/images
# iso-image-mi --
# Create the image after the MD operations have completed.
#
-iso-image-mi: .PHONY check_DESTDIR check_RELEASEDIR iso-image-md-pre
+iso-image-mi: .PHONY check_DESTDIR check_RELEASEDIR iso-image-md-pre check_imagedir
@if ! ${MKISOFS} --version; then \
echo install pkgsrc/sysutils/cdrtools and run 'make iso-image'. ; \
false; \
@@ -558,7 +573,7 @@ build_kernels: .PHONY
build_kernels: kern-${configfile}
kern-${configfile}: .PHONY .MAKE
cd ${KERNCONFDIR} ${TOOL_CONFIG} -s ${KERNSRCDIR} \
- -b ${KERNOBJDIR}/${configfile:C/.*\///} ${configfile}
+ -U DEBUG -b ${KERNOBJDIR}/${configfile:C/.*\///} ${configfile}
.if ${MKUPDATE} == no
cd ${KERNOBJDIR}/${configfile:C/.*\///} ${MAKE} distclean
.endif
@@ -580,7 +595,7 @@ kernset-${configfile}: .PHONY build_kern
kerndir=${KERNOBJDIR}/${configfile:C/.*\///}; \
kernsuffixes=${KERNEL_SUFFIXES:S/^/./}; \
kern_tgz=${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets/kern-${configfile}.tgz; \
- pax_cmd=COMPRESS_PROGRAM=${TOOL_GZIP:Q} GZIP=-9n ${TOOL_PAX} -O -zw -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}; \
+ pax_cmd=GZIP=${GZIP_FLAGS:Q} ${TOOL_PAX} --use-compress-program ${TOOL_GZIP:Q} -O -w -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}; \
cd $${kerndir} { \
kernels=; newest=; \
for kernel in $${kernlist}; do \
@@ -625,8 +640,8 @@ releasekern-${configfile}: .PHONY build_
knl_gz=${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/$${kernel}-${configfile:C/.*\///}$${s}.gz; \
[ $${knl_gz} -nt $${ks} ] continue; \
rm -f $${knl_gz}; \
-echo ${TOOL_GZIP} -nc -9 $${kerndir}/$${ks} $${knl_gz}; \
-${TOOL_GZIP} -nc -9 $${ks} $${knl_gz}; \
+echo ${TOOL_GZIP} ${GZIP_FLAGS} -c $${kerndir}/$${ks} $${knl_gz}; \
+${TOOL_GZIP} ${GZIP_FLAGS} -c $${ks} $${knl_gz}; \
done; \
done; \
}
