svn commit: r322109 - in head/sys/arm64: arm64 include

[Andrew Turner]

Author: andrew
Date: Sat Aug  5 20:57:34 2017
New Revision: 322109
URL: https://svnweb.freebsd.org/changeset/base/322109

Log:
  Mark each cpu in the appropriate cpuset_domain set. This allows devices to
  handle cases where they can only run on a single domain.
  
  To allow all devices access to this set we need to move reading the domain
  earlier in the boot as it was previously handled in the CPU driver, however
  this is too late for the GICv3 ITS driver.
  
  Sponsored by: DARPA, AFRL

Modified:
  head/sys/arm64/arm64/mp_machdep.c
  head/sys/arm64/include/param.h

Modified: head/sys/arm64/arm64/mp_machdep.c
==
--- head/sys/arm64/arm64/mp_machdep.c   Sat Aug  5 19:57:45 2017
(r322108)
+++ head/sys/arm64/arm64/mp_machdep.c   Sat Aug  5 20:57:34 2017
(r322109)
@@ -198,10 +198,6 @@ arm64_cpu_attach(device_t dev)
/* Set the device to start it later */
cpu_list[cpuid] = dev;
 
-   /* Try to read the numa node of this cpu */
-   OF_getencprop(ofw_bus_get_node(dev), "numa-node-id",
-   &__pcpu[cpuid].pc_domain, sizeof(__pcpu[cpuid].pc_domain));
-
return (0);
 }
 
@@ -535,6 +531,7 @@ static boolean_t
 cpu_init_fdt(u_int id, phandle_t node, u_int addr_size, pcell_t *reg)
 {
uint64_t target_cpu;
+   int domain;
 
target_cpu = reg[0];
if (addr_size == 2) {
@@ -542,7 +539,17 @@ cpu_init_fdt(u_int id, phandle_t node, u_int addr_size
target_cpu |= reg[1];
}
 
-   return (start_cpu(id, target_cpu) ? TRUE : FALSE);
+   if (!start_cpu(id, target_cpu))
+   return (FALSE);
+
+   /* Try to read the numa node of this cpu */
+   if (OF_getencprop(node, "numa-node-id", , sizeof(domain)) > 0) {
+   __pcpu[id].pc_domain = domain;
+   if (domain < MAXMEMDOM)
+   CPU_SET(id, _domain[domain]);
+   }
+
+   return (TRUE);
 }
 #endif
 

Modified: head/sys/arm64/include/param.h
==
--- head/sys/arm64/include/param.h  Sat Aug  5 19:57:45 2017
(r322108)
+++ head/sys/arm64/include/param.h  Sat Aug  5 20:57:34 2017
(r322109)
@@ -60,7 +60,7 @@
 #endif /* SMP || KLD_MODULE */
 
 #ifndef MAXMEMDOM
-#defineMAXMEMDOM   1
+#defineMAXMEMDOM   2
 #endif
 
 #defineALIGNBYTES  _ALIGNBYTES
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322108 - head/usr.bin/calendar/calendars

[Andriy Voskoboinyk]

Author: avos
Date: Sat Aug  5 19:57:45 2017
New Revision: 322108
URL: https://svnweb.freebsd.org/changeset/base/322108

Log:
  Add myself to the calendar.freebsd.
  
  Reported by:  mckusick

Modified:
  head/usr.bin/calendar/calendars/calendar.freebsd

Modified: head/usr.bin/calendar/calendars/calendar.freebsd
==
--- head/usr.bin/calendar/calendars/calendar.freebsdSat Aug  5 17:11:40 
2017(r322107)
+++ head/usr.bin/calendar/calendars/calendar.freebsdSat Aug  5 19:57:45 
2017(r322108)
@@ -154,6 +154,7 @@
 04/22  Jakub Klama  born in Blachownia, Silesia, Poland, 
1989
 04/25  Richard Gallamore  born in Kissimmee, Florida, 
United States, 1987
 04/26  Rene Ladan  born in Geldrop, the Netherlands, 1980
+04/28  Andriy Voskoboinyk  born in Bila Tserkva, Ukraine, 
1992
 04/29  Adam Weinberger  born in Berkeley, California, 
United States, 1980
 04/29  Eric Anholt  born in Portland, Oregon, United 
States, 1983
 05/01  Randall Stewart  born in Spokane, Washington, United 
States, 1959
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322107 - stable/11/tools/tools/zfsboottest

[Ngie Cooper]

Author: ngie
Date: Sat Aug  5 17:11:40 2017
New Revision: 322107
URL: https://svnweb.freebsd.org/changeset/base/322107

Log:
  MFC r321845:
  
  Standardize on SRCTOP instead of .CURDIR-relative paths

Modified:
  stable/11/tools/tools/zfsboottest/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/tools/tools/zfsboottest/Makefile
==
--- stable/11/tools/tools/zfsboottest/Makefile  Sat Aug  5 17:02:57 2017
(r322106)
+++ stable/11/tools/tools/zfsboottest/Makefile  Sat Aug  5 17:11:40 2017
(r322107)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../sys/boot/zfs 
${.CURDIR}/../../../sys/cddl/boot/zfs
+.PATH: ${SRCTOP}/sys/boot/zfs ${SRCTOP}/sys/cddl/boot/zfs
 
 BINDIR?=   /usr/bin
 SCRIPTSDIR?=   /usr/bin
@@ -11,8 +11,8 @@ SCRIPTSNAME=  zfsboottest.sh
 MAN=
 
 CFLAGS=-O1 \
-   -I${.CURDIR}/../../../sys/boot/zfs \
-   -I${.CURDIR}/../../../sys/cddl/boot/zfs \
+   -I${SRCTOP}/sys/boot/zfs \
+   -I${SRCTOP}/sys/cddl/boot/zfs \
-I. \
-fdiagnostics-show-option \
-W -Wextra -Wno-sign-compare -Wno-unused-parameter
@@ -23,7 +23,7 @@ LIBADD+=  md
 beforedepend zfsboottest.o: machine
 CLEANFILES+=   machine
 machine:
-   ln -sf ${.CURDIR}/../../../sys/i386/include machine
+   ln -sf ${SRCTOP}/sys/i386/include machine
 .endif
 
 .include 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322106 - stable/11/lib/libcrypt

[Ngie Cooper]

Author: ngie
Date: Sat Aug  5 17:02:57 2017
New Revision: 322106
URL: https://svnweb.freebsd.org/changeset/base/322106

Log:
  MFC r321915:
  
  Remove bogus bsd.subdir.mk .include
  
  bsd.subdir.mk is included from bsd.obj.mk, which is included via bsd.lib.mk.

Modified:
  stable/11/lib/libcrypt/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/lib/libcrypt/Makefile
==
--- stable/11/lib/libcrypt/Makefile Sat Aug  5 17:02:53 2017
(r322105)
+++ stable/11/lib/libcrypt/Makefile Sat Aug  5 17:02:57 2017
(r322106)
@@ -47,4 +47,3 @@ SUBDIR+=  tests
 .endif
 
 .include 
-.include 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322105 - stable/10/lib/libcrypt

[Ngie Cooper]

Author: ngie
Date: Sat Aug  5 17:02:53 2017
New Revision: 322105
URL: https://svnweb.freebsd.org/changeset/base/322105

Log:
  MFC r321915:
  
  Remove bogus bsd.subdir.mk .include
  
  bsd.subdir.mk is included from bsd.obj.mk, which is included via bsd.lib.mk.

Modified:
  stable/10/lib/libcrypt/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libcrypt/Makefile
==
--- stable/10/lib/libcrypt/Makefile Sat Aug  5 17:01:58 2017
(r322104)
+++ stable/10/lib/libcrypt/Makefile Sat Aug  5 17:02:53 2017
(r322105)
@@ -45,4 +45,3 @@ SUBDIR+=  tests
 .endif
 
 .include 
-.include 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322104 - stable/11/share/mk

[Ngie Cooper]

Author: ngie
Date: Sat Aug  5 17:01:58 2017
New Revision: 322104
URL: https://svnweb.freebsd.org/changeset/base/322104

Log:
  MFC r321951:
  
  Some minor doc fixups
  
  - Tweak a sentence by placing the modifier before an adjective to make it flow
better.
  - Fix a typo.

Modified:
  stable/11/share/mk/bsd.opts.mk
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/share/mk/bsd.opts.mk
==
--- stable/11/share/mk/bsd.opts.mk  Sat Aug  5 17:01:00 2017
(r322103)
+++ stable/11/share/mk/bsd.opts.mk  Sat Aug  5 17:01:58 2017
(r322104)
@@ -4,7 +4,7 @@
 #
 # Users define WITH_FOO and WITHOUT_FOO on the command line or in /etc/src.conf
 # and /etc/make.conf files. These translate in the build system to 
MK_FOO={yes,no}
-# with sensible (usually) defaults.
+# with (usually) sensible defaults.
 #
 # Makefiles must include bsd.opts.mk after defining specific MK_FOO options 
that
 # are applicable for that Makefile (typically there are none, but sometimes 
there
@@ -41,7 +41,7 @@ :
 #
 
 # Only these options are used by bsd.*.mk. KERBEROS and OPENSSH are
-# unforutnately needed to support statically linking the entire
+# unfortunately needed to support statically linking the entire
 # tree. su(1) wouldn't link since it depends on PAM which depends on
 # ssh libraries when building with OPENSSH, and likewise for KERBEROS.
 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322103 - stable/10/share/man/man5

[Ngie Cooper]

Author: ngie
Date: Sat Aug  5 17:01:00 2017
New Revision: 322103
URL: https://svnweb.freebsd.org/changeset/base/322103

Log:
  Regenerate src.conf(5) per r322100

Modified:
  stable/10/share/man/man5/src.conf.5

Modified: stable/10/share/man/man5/src.conf.5
==
--- stable/10/share/man/man5/src.conf.5 Sat Aug  5 17:00:22 2017
(r322102)
+++ stable/10/share/man/man5/src.conf.5 Sat Aug  5 17:01:00 2017
(r322103)
@@ -1213,6 +1213,21 @@ Set to not build ZFS file system.
 .It Va WITHOUT_ZONEINFO
 .\" from FreeBSD: stable/10/tools/build/options/WITHOUT_ZONEINFO 235342 
2012-05-12 16:12:36Z gjb
 Set to not build the timezone database.
+When set, it also enforces the following options:
+.Pp
+.Bl -item -compact
+.It
+.Va WITHOUT_ZONEINFO_LEAPSECONDS_SUPPORT
+.It
+.Va WITHOUT_ZONEINFO_OLD_TIMEZONES_SUPPORT
+.El
+.It Va WITH_ZONEINFO_LEAPSECONDS_SUPPORT
+.\" from FreeBSD: 
stable/10/tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT 322100 
2017-08-05 16:54:40Z ngie
+Set to build leapsecond information in to the timezone database.
+.It Va WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT
+.\" from FreeBSD: 
stable/10/tools/build/options/WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT 322100 
2017-08-05 16:54:40Z ngie
+Set to build backward compatibility timezone aliases in to the timezone
+database.
 .El
 .Sh FILES
 .Bl -tag -compact -width Pa
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322102 - stable/11/share/man/man5

[Ngie Cooper]

Author: ngie
Date: Sat Aug  5 17:00:22 2017
New Revision: 322102
URL: https://svnweb.freebsd.org/changeset/base/322102

Log:
  Regenerate src.conf(5) per r322099

Modified:
  stable/11/share/man/man5/src.conf.5

Modified: stable/11/share/man/man5/src.conf.5
==
--- stable/11/share/man/man5/src.conf.5 Sat Aug  5 16:58:02 2017
(r322101)
+++ stable/11/share/man/man5/src.conf.5 Sat Aug  5 17:00:22 2017
(r322102)
@@ -1,6 +1,6 @@
 .\" DO NOT EDIT-- this file is generated by tools/build/options/makeman.
 .\" $FreeBSD$
-.Dd July 5, 2017
+.Dd August 5, 2017
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -1510,6 +1510,19 @@ protocols (usable only via 802.1X).
 Set to not build ZFS file system.
 .It Va WITHOUT_ZONEINFO
 Set to not build the timezone database.
+When set, it enforces these options:
+.Pp
+.Bl -item -compact
+.It
+.Va WITHOUT_ZONEINFO_LEAPSECONDS_SUPPORT
+.It
+.Va WITHOUT_ZONEINFO_OLD_TIMEZONES_SUPPORT
+.El
+.It Va WITH_ZONEINFO_LEAPSECONDS_SUPPORT
+Set to build leapsecond information in to the timezone database.
+.It Va WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT
+Set to build backward compatibility timezone aliases in to the timezone
+database.
 .El
 .Sh FILES
 .Bl -tag -compact -width Pa
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322101 - head/bin/chmod/tests

[Ngie Cooper]

Author: ngie
Date: Sat Aug  5 16:58:02 2017
New Revision: 322101
URL: https://svnweb.freebsd.org/changeset/base/322101

Log:
  Don't check result of chflags in f_flag_cleanup()
  
  This will prevent false positives from occurring if the test is run on
  ZFS since ZFS doesn't support fflags throbbing like UFS.
  
  PR:   221189
  MFC after:4 days
  MFC with: r321949

Modified:
  head/bin/chmod/tests/chmod_test.sh

Modified: head/bin/chmod/tests/chmod_test.sh
==
--- head/bin/chmod/tests/chmod_test.sh  Sat Aug  5 16:55:07 2017
(r322100)
+++ head/bin/chmod/tests/chmod_test.sh  Sat Aug  5 16:58:02 2017
(r322101)
@@ -115,7 +115,7 @@ f_flag_body()
 
 f_flag_cleanup()
 {
-   atf_check chflags 0 foo
+   chflags 0 foo || :
 }
 
 atf_test_case h_flag
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322100 - in stable/10: etc/mtree share/mk share/zoneinfo share/zoneinfo/tests tools/build/options

[Ngie Cooper]

Author: ngie
Date: Sat Aug  5 16:55:07 2017
New Revision: 322100
URL: https://svnweb.freebsd.org/changeset/base/322100

Log:
  MFC r320702,r320703:
  
  r320702:
  
  Formalize LEAPSECONDS and OLDTIMEZONES in share/zoneinfo/... as
  `MK_ZONEINFO_LEAPSECONDS_SUPPORT == yes` and
  `MK_ZONEINFO_OLD_TIMEZONES_SUPPORT == yes`.
  
  Keep `LEAPSECONDS` and `OLDTIMEZONES` for backwards compatibility,
  but print out a warning notifying users that they should use the new
  variables, in an effort to migrate them to the variables. This is being
  done mostly for automated build tools, etc, that might rely on these
  variables being set. The variables will be removed in the future on
  ^/head, e.g., after ^/stable/12 is cut.
  
  Relnotes:   yes
  
  r320703:
  
  Add tests to help verify Links functionality for .../contrib/tzdata/backwards
  
  MFC with: r320702

Added:
  stable/10/share/zoneinfo/tests/
 - copied from r320703, head/share/zoneinfo/tests/
  stable/10/tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT
 - copied unchanged from r320702, 
head/tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT
  stable/10/tools/build/options/WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT
 - copied unchanged from r320702, 
head/tools/build/options/WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT
Modified:
  stable/10/etc/mtree/BSD.tests.dist
  stable/10/share/mk/bsd.own.mk
  stable/10/share/zoneinfo/Makefile
  stable/10/share/zoneinfo/tests/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/mtree/BSD.tests.dist
==
--- stable/10/etc/mtree/BSD.tests.dist  Sat Aug  5 16:44:31 2017
(r322099)
+++ stable/10/etc/mtree/BSD.tests.dist  Sat Aug  5 16:55:07 2017
(r322100)
@@ -374,6 +374,8 @@
 ..
 ..
 ..
+zoneinfo
+..
 ..
 sys
 acl

Modified: stable/10/share/mk/bsd.own.mk
==
--- stable/10/share/mk/bsd.own.mk   Sat Aug  5 16:44:31 2017
(r322099)
+++ stable/10/share/mk/bsd.own.mk   Sat Aug  5 16:55:07 2017
(r322100)
@@ -411,8 +411,11 @@ __DEFAULT_NO_OPTIONS = \
 SHARED_TOOLCHAIN \
 SVN \
 TESTS \
-USB_GADGET_EXAMPLES
+USB_GADGET_EXAMPLES \
+ZONEINFO_LEAPSECONDS_SUPPORT \
+ZONEINFO_OLD_TIMEZONES_SUPPORT \
 
+
 #
 # Default behaviour of some options depends on the architecture.  Unfortunately
 # this means that we have to test TARGET_ARCH (the buildworld case) as well
@@ -584,6 +587,11 @@ MK_BINUTILS:=  no
 MK_CLANG:= no
 MK_GCC:=   no
 MK_GDB:=   no
+.endif
+
+.if ${MK_ZONEINFO} == "no"
+MK_ZONEINFO_LEAPSECONDS_SUPPORT:= no
+MK_ZONEINFO_OLD_TIMEZONES_SUPPORT:= no
 .endif
 
 .if ${MK_CLANG} == "no"

Modified: stable/10/share/zoneinfo/Makefile
==
--- stable/10/share/zoneinfo/Makefile   Sat Aug  5 16:44:31 2017
(r322099)
+++ stable/10/share/zoneinfo/Makefile   Sat Aug  5 16:55:07 2017
(r322100)
@@ -28,12 +28,24 @@
 # $ svn update # Commit message: "MFV of tzdata2008X"
 #
 
+.include 
+
 CLEANFILES+=   yearistype
 CLEANDIRS+=builddir
 CONTRIBDIR=${.CURDIR}/../../contrib/tzdata/
 .PATH: ${CONTRIBDIR}
 
 .if defined(LEAPSECONDS)
+.warning "Using backwards compatibility variable for LEAPSECONDS; please use 
WITH_ZONEINFO_LEAPSECONDS_SUPPORT instead"
+MK_ZONEINFO_LEAPSECONDS_SUPPORT= yes
+.endif
+
+.if defined(OLDTIMEZONES)
+.warning "Using backwards compatibility variable for OLDTIMEZONES; please use 
WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT instead"
+MK_ZONEINFO_OLD_TIMEZONES_SUPPORT= yes
+.endif
+
+.if ${MK_ZONEINFO_LEAPSECONDS_SUPPORT} != "no"
 LEAPFILE=  -L ${CONTRIBDIR}leapseconds
 .else
 LEAPFILE=
@@ -43,7 +55,7 @@ TZFILES=  africa antarctica asia australasia etcetera e
factory northamerica southamerica
 POSIXRULES=America/New_York
 
-.if defined(OLDTIMEZONES)
+.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no"
 TZFILES+=  backward systemv
 .endif
 
@@ -67,7 +79,7 @@ TZBUILDSUBDIRS=   \
Pacific \
SystemV
 
-.if defined(OLDTIMEZONES)
+.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no"
 TZBUILDSUBDIRS+= US Mexico Chile Canada Brazil
 .endif
 
@@ -110,5 +122,9 @@ afterinstall:
else \
echo "Run tzsetup(8) manually to update /etc/localtime."; \
fi
+
+.if ${MK_TESTS} != "no"
+SUBDIR+=   tests
+.endif
 
 .include 

Modified: stable/10/share/zoneinfo/tests/Makefile
==
--- head/share/zoneinfo/tests/Makefile  Thu Jul  6 04:30:06 2017
(r320703)
+++ stable/10/share/zoneinfo/tests/Makefile Sat Aug  5 16:55:07 2017
(r322100)
@@ -1,11 +1,10 @@
 # $FreeBSD$
 
-.include 
+.include 
 
 .PATH: ${SRCTOP}/contrib/tzdata
 

svn commit: r322099 - in stable/11: etc/mtree share/mk share/zoneinfo share/zoneinfo/tests tools/build/options

[Ngie Cooper]

Author: ngie
Date: Sat Aug  5 16:44:31 2017
New Revision: 322099
URL: https://svnweb.freebsd.org/changeset/base/322099

Log:
  MFC r320702,r320703:
  
  r320702:
  
  Formalize LEAPSECONDS and OLDTIMEZONES in share/zoneinfo/... as
  `MK_ZONEINFO_LEAPSECONDS_SUPPORT == yes` and
  `MK_ZONEINFO_OLD_TIMEZONES_SUPPORT == yes`.
  
  Keep `LEAPSECONDS` and `OLDTIMEZONES` for backwards compatibility,
  but print out a warning notifying users that they should use the new
  variables, in an effort to migrate them to the variables. This is being
  done mostly for automated build tools, etc, that might rely on these
  variables being set. The variables will be removed in the future on
  ^/head, e.g., after ^/stable/12 is cut.
  
  Relnotes:   yes
  
  r320703:
  
  Add tests to help verify Links functionality for .../contrib/tzdata/backwards
  
  MFC with: r320702

Added:
  stable/11/share/zoneinfo/tests/
 - copied from r320703, head/share/zoneinfo/tests/
  stable/11/tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT
 - copied unchanged from r320702, 
head/tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT
  stable/11/tools/build/options/WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT
 - copied unchanged from r320702, 
head/tools/build/options/WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT
Modified:
  stable/11/etc/mtree/BSD.tests.dist
  stable/11/share/mk/src.opts.mk
  stable/11/share/zoneinfo/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/etc/mtree/BSD.tests.dist
==
--- stable/11/etc/mtree/BSD.tests.dist  Sat Aug  5 14:49:40 2017
(r322098)
+++ stable/11/etc/mtree/BSD.tests.dist  Sat Aug  5 16:44:31 2017
(r322099)
@@ -388,6 +388,8 @@
 ..
 ..
 ..
+zoneinfo
+..
 ..
 sys
 acl

Modified: stable/11/share/mk/src.opts.mk
==
--- stable/11/share/mk/src.opts.mk  Sat Aug  5 14:49:40 2017
(r322098)
+++ stable/11/share/mk/src.opts.mk  Sat Aug  5 16:44:31 2017
(r322099)
@@ -194,6 +194,8 @@ __DEFAULT_NO_OPTIONS = \
 SHARED_TOOLCHAIN \
 SORT_THREADS \
 SVN \
+ZONEINFO_LEAPSECONDS_SUPPORT \
+ZONEINFO_OLD_TIMEZONES_SUPPORT \
 
 
 #
@@ -371,6 +373,11 @@ MK_DTRACE_TESTS:= no
 
 .if ${MK_TEXTPROC} == "no"
 MK_GROFF:= no
+.endif
+
+.if ${MK_ZONEINFO} == "no"
+MK_ZONEINFO_LEAPSECONDS_SUPPORT:= no
+MK_ZONEINFO_OLD_TIMEZONES_SUPPORT:= no
 .endif
 
 .if ${MK_CROSS_COMPILER} == "no"

Modified: stable/11/share/zoneinfo/Makefile
==
--- stable/11/share/zoneinfo/Makefile   Sat Aug  5 14:49:40 2017
(r322098)
+++ stable/11/share/zoneinfo/Makefile   Sat Aug  5 16:44:31 2017
(r322099)
@@ -28,12 +28,24 @@
 # $ svn commit # Commit message: "MFV of tzdata2008X"
 #
 
+.include 
+
 CLEANFILES+=   yearistype
 CLEANDIRS+=builddir
 CONTRIBDIR=${.CURDIR}/../../contrib/tzdata/
 .PATH: ${CONTRIBDIR}
 
 .if defined(LEAPSECONDS)
+.warning "Using backwards compatibility variable for LEAPSECONDS; please use 
WITH_ZONEINFO_LEAPSECONDS_SUPPORT instead"
+MK_ZONEINFO_LEAPSECONDS_SUPPORT= yes
+.endif
+
+.if defined(OLDTIMEZONES)
+.warning "Using backwards compatibility variable for OLDTIMEZONES; please use 
WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT instead"
+MK_ZONEINFO_OLD_TIMEZONES_SUPPORT= yes
+.endif
+
+.if ${MK_ZONEINFO_LEAPSECONDS_SUPPORT} != "no"
 LEAPFILE=  -L ${CONTRIBDIR}leapseconds
 .else
 LEAPFILE=
@@ -43,7 +55,7 @@ TZFILES=  africa antarctica asia australasia etcetera e
factory northamerica southamerica
 POSIXRULES=America/New_York
 
-.if defined(OLDTIMEZONES)
+.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no"
 TZFILES+=  backward systemv
 .endif
 
@@ -67,7 +79,7 @@ TZBUILDSUBDIRS=   \
Pacific \
SystemV
 
-.if defined(OLDTIMEZONES)
+.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no"
 TZBUILDSUBDIRS+= US Mexico Chile Canada Brazil
 .endif
 
@@ -113,5 +125,9 @@ afterinstall:
else \
echo "Run tzsetup(8) manually to update /etc/localtime."; \
fi
+
+.if ${MK_TESTS} != "no"
+SUBDIR+=   tests
+.endif
 
 .include 

Copied: stable/11/tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT (from 
r320702, head/tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT)
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ stable/11/tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT Sat Aug 
 5 16:44:31 2017(r322099, copy of r320702, 
head/tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to build leapsecond information in to the timezone database.

Copied: 

svn commit: r322098 - stable/10/usr.sbin/tzsetup

[Marius Strobl]

Author: marius
Date: Sat Aug  5 14:49:40 2017
New Revision: 322098
URL: https://svnweb.freebsd.org/changeset/base/322098

Log:
  Fix a stable/10-specific mismerge in r322096; the MK_NCURSESW handling
  should be within the MK_DIALOG block as libncurses{,w} isn't required
  when building tzsetup(8) without dialog(3) support.

Modified:
  stable/10/usr.sbin/tzsetup/Makefile

Modified: stable/10/usr.sbin/tzsetup/Makefile
==
--- stable/10/usr.sbin/tzsetup/Makefile Sat Aug  5 12:59:03 2017
(r322097)
+++ stable/10/usr.sbin/tzsetup/Makefile Sat Aug  5 14:49:40 2017
(r322098)
@@ -12,14 +12,13 @@ WARNS?= 3
 CFLAGS+=   -I${.CURDIR}/../../contrib/dialog -DHAVE_DIALOG
 DPADD= ${LIBDIALOG} ${LIBM}
 LDADD= -ldialog -lm
-.endif
-
 .if ${MK_NCURSESW} == "no"
 DPADD+=${LIBNCURSES}
 LDADD+=-lncurses
 .else
 DPADD+=${LIBNCURSESW}
 LDADD+= -lncursesw
+.endif
 .endif
 
 .include 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r322029 - in head: usr.bin usr.sbin

[Brooks Davis]

On Fri, Aug 04, 2017 at 04:50:32PM +0200, Jeremie Le Hen wrote:
> On Fri, Aug 4, 2017 at 12:42 AM, Ngie Cooper (yaneurabeya)
>  wrote:
> >
> >> On Aug 3, 2017, at 14:30, Jeremie Le Hen  wrote:
> >>
> >> Author: jlh
> >> Date: Thu Aug  3 21:30:12 2017
> >> New Revision: 322029
> >> URL: https://svnweb.freebsd.org/changeset/base/322029
> >>
> >> Log:
> >>  rwho/ruptime/rwhod shouldn't be gated by RCMDS.
> >
> > The why in this commit and the next you made (r322031) would have 
> > been incredibly helpful. If bugzilla disappears I only have the commit 
> > history tracking the what.
> 
> I agree, I realized this only afterwards.  I don't know how to fix this 
> though.

Reverting the change and reapplying it with a meaningful message will
produce the best result.

-- Brooks
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322097 - head/usr.sbin/tzsetup

[Marius Strobl]

Author: marius
Date: Sat Aug  5 12:59:03 2017
New Revision: 322097
URL: https://svnweb.freebsd.org/changeset/base/322097

Log:
  - Move creation and unlinking of /etc/wall_cmos_clock from the handling
of the initial UTC dialog to install_zoneinfo() so that file gets the
necessary treatment also when that dialog is skipped via "-s", when
selecting UTC from the time zone menu or on the command-line instead
etc.
  - Make the initial UTC dialog actually work by giving the relevant files
the necessary treatment and then exit when choosing "Yes" there instead
of moving on to the time zone menu regardless.
  - Since r301131, /etc/localtime is also installed when selecting UTC in
interactive configurations (which previously meant only via the time
zone menu, though). Thus, the code added in r230298 which treats a
NULL zone file name as UTC and removes /etc/localtime in that case can
go again.
  - Consistently refer to "could not delete" (as chosen by the oldest such
code in here) when unlink(2) fails instead of a to mixture of "delete"
and "unlink" in error messages.

Modified:
  head/usr.sbin/tzsetup/tzsetup.c

Modified: head/usr.sbin/tzsetup/tzsetup.c
==
--- head/usr.sbin/tzsetup/tzsetup.c Sat Aug  5 12:54:07 2017
(r322096)
+++ head/usr.sbin/tzsetup/tzsetup.c Sat Aug  5 12:59:03 2017
(r322097)
@@ -107,7 +107,7 @@ xdialog_count_rows(const char *p)
rows++;
}
 
-   return rows ? rows : 1;
+   return (rows ? rows : 1);
 }
 
 static int
@@ -124,7 +124,7 @@ xdialog_count_columns(const char *p)
 
len = strlen(p);
max_len = MAX(max_len, len);
-   return max_len;
+   return (max_len);
 }
 
 static int
@@ -164,7 +164,8 @@ xdialog_menu(const char *title, const char *cprompt, i
tag_x = MAX(tag_x, l + k + 2);
}
}
-   width = MAX(xdialog_count_columns(cprompt), title != NULL ? 
xdialog_count_columns(title) : 0);
+   width = MAX(xdialog_count_columns(cprompt), title != NULL ?
+   xdialog_count_columns(title) : 0);
width = MAX(width, tag_x + 4) + 4;
}
width = MAX(width, 24);
@@ -199,7 +200,7 @@ again:
 
free(listitems);
dlg_restore_vars(_vars);
-   return result;
+   return (result);
 }
 
 static int usedialog = 1;
@@ -269,7 +270,7 @@ continent_country_menu(dialogMenuItem *continent)
int rv;
 
if (strcmp(continent->title, "UTC") == 0)
-   return set_zone_utc();
+   return (set_zone_utc());
 
/* Short cut -- if there's only one country, don't post a menu. */
if (contp->nitems == 1)
@@ -642,7 +643,7 @@ set_zone_menu(dialogMenuItem *dmi)
 static int
 set_zone_utc(void)
 {
-   if (!confirm_zone(NULL))
+   if (!confirm_zone("UTC"))
return (DITEM_FAILURE | DITEM_RECREATE);
 
return (install_zoneinfo("UTC"));
@@ -656,7 +657,7 @@ confirm_zone(const char *filename)
struct tm   *tm;
int rv;
 
-   setenv("TZ", filename == NULL ? "" : filename, 1);
+   setenv("TZ", filename, 1);
tzset();
tm = localtime();
 
@@ -714,11 +715,8 @@ install_zoneinfo_file(const char *zoneinfo_file)
 
 #ifdef VERBOSE
snprintf(title, sizeof(title), "Info");
-   if (zoneinfo_file == NULL)
+   if (copymode)
snprintf(prompt, sizeof(prompt),
-   "Removing %s", path_localtime);
-   else if (copymode)
-   snprintf(prompt, sizeof(prompt),
"Copying %s to %s", zoneinfo_file, path_localtime);
else
snprintf(prompt, sizeof(prompt),
@@ -733,49 +731,6 @@ install_zoneinfo_file(const char *zoneinfo_file)
 #endif
 
if (reallydoit) {
-   if (zoneinfo_file == NULL) {
-   if (unlink(path_localtime) < 0 && errno != ENOENT) {
-   snprintf(title, sizeof(title), "Error");
-   snprintf(prompt, sizeof(prompt),
-"Could not delete %s: %s", path_localtime,
-strerror(errno));
-#ifdef HAVE_DIALOG
-   if (usedialog)
-   dialog_msgbox(title, prompt, 8, 72, 1);
-   else
-#endif
-   fprintf(stderr, "%s\n", prompt);
-
-   return (DITEM_FAILURE | DITEM_RECREATE);
-   }
-   if (unlink(path_db) < 0 && errno != ENOENT) {
-   snprintf(title, sizeof(title), "Error");
-   snprintf(prompt, sizeof(prompt),
-"Could not delete %s: %s", 

svn commit: r322096 - in stable/10: tools/build/mk usr.sbin usr.sbin/bsdconfig/timezone usr.sbin/tzsetup

[Marius Strobl]

Author: marius
Date: Sat Aug  5 12:54:07 2017
New Revision: 322096
URL: https://svnweb.freebsd.org/changeset/base/322096

Log:
  MFC: r274394, r274399, r307802
  
  - Default `bsdconfig timezone' and `tzsetup' to `-s' in a VM.
  - Hide dialog specific code behind HAVE_DIALOG. It allows to build a
stripped down version (missing the dialog UI) but perfectly function
tzsetup when world is built WITHOUT_DIALOG.

Modified:
  stable/10/tools/build/mk/OptionalObsoleteFiles.inc
  stable/10/usr.sbin/Makefile
  stable/10/usr.sbin/bsdconfig/timezone/timezone
  stable/10/usr.sbin/tzsetup/Makefile
  stable/10/usr.sbin/tzsetup/tzsetup.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc  Sat Aug  5 12:34:31 
2017(r322095)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc  Sat Aug  5 12:54:07 
2017(r322096)
@@ -1069,12 +1069,10 @@ OLD_FILES+=usr/lib/libdpv.so
 OLD_FILES+=usr/lib/libdpv.so.1
 OLD_FILES+=usr/lib/libdpv_p.a
 OLD_FILES+=usr/sbin/bsdconfig
-OLD_FILES+=usr/sbin/tzsetup
 OLD_FILES+=usr/share/man/man1/dialog.1.gz
 OLD_FILES+=usr/share/man/man1/dpv.1.gz
 OLD_FILES+=usr/share/man/man3/dialog.3.gz
 OLD_FILES+=usr/share/man/man3/dpv.3.gz
-OLD_FILES+=usr/share/man/man8/tzsetup.8.gz
 OLD_FILES+=usr/share/man/man8/bsdconfig.8.gz
 .endif
 

Modified: stable/10/usr.sbin/Makefile
==
--- stable/10/usr.sbin/Makefile Sat Aug  5 12:34:31 2017(r322095)
+++ stable/10/usr.sbin/Makefile Sat Aug  5 12:54:07 2017(r322096)
@@ -89,7 +89,7 @@ SUBDIR=   adduser \
tcpdump \
traceroute \
trpt \
-   ${_tzsetup} \
+   tzsetup \
uefisign \
ugidfw \
vigr \
@@ -154,7 +154,6 @@ SUBDIR+=cxgbetool
 
 .if ${MK_DIALOG} != "no"
 _bsdconfig=bsdconfig
-_tzsetup=  tzsetup
 .endif
 
 .if ${MK_FLOPPY} != "no"

Modified: stable/10/usr.sbin/bsdconfig/timezone/timezone
==
--- stable/10/usr.sbin/bsdconfig/timezone/timezone  Sat Aug  5 12:34:31 
2017(r322095)
+++ stable/10/usr.sbin/bsdconfig/timezone/timezone  Sat Aug  5 12:54:07 
2017(r322096)
@@ -62,7 +62,7 @@ _PATH_WALL_CMOS_CLOCK="/etc/wall_cmos_clock"
 REALLYDOIT=1
 REINSTALL=
 USEDIALOG=1
-SKIPUTC=
+SKIPUTC= # See MAIN
 VERBOSE=
 TZ_OR_FAIL=
 CHROOTENV=
@@ -118,6 +118,9 @@ dialog_menu_main()
 }
 
  MAIN
+
+# Skip initial question regarding UTC v. Wall-Clock time if run in VM
+[ "$( sysctl -n kern.vm_guest 2> /dev/null )" = "none" ] || SKIPUTC=1
 
 # Incorporate rc-file if it exists
 [ -f "$HOME/.bsdconfigrc" ] && f_include "$HOME/.bsdconfigrc"

Modified: stable/10/usr.sbin/tzsetup/Makefile
==
--- stable/10/usr.sbin/tzsetup/Makefile Sat Aug  5 12:34:31 2017
(r322095)
+++ stable/10/usr.sbin/tzsetup/Makefile Sat Aug  5 12:54:07 2017
(r322096)
@@ -1,16 +1,18 @@
 # $FreeBSD$
 
+.include 
+
 PROG=  tzsetup
 MAN=   tzsetup.8
 
-CFLAGS+= -I${.CURDIR}/../../contrib/dialog -I.
+CFLAGS+= -I.
 
+.if ${MK_DIALOG} != no
 WARNS?=3
-
+CFLAGS+=   -I${.CURDIR}/../../contrib/dialog -DHAVE_DIALOG
 DPADD= ${LIBDIALOG} ${LIBM}
 LDADD= -ldialog -lm
-
-.include 
+.endif
 
 .if ${MK_NCURSESW} == "no"
 DPADD+=${LIBNCURSES}

Modified: stable/10/usr.sbin/tzsetup/tzsetup.c
==
--- stable/10/usr.sbin/tzsetup/tzsetup.cSat Aug  5 12:34:31 2017
(r322095)
+++ stable/10/usr.sbin/tzsetup/tzsetup.cSat Aug  5 12:54:07 2017
(r322096)
@@ -47,8 +47,11 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#include 
 
+#ifdef HAVE_DIALOG
 #include 
+#endif
 
 #define_PATH_ZONETAB   "/usr/share/zoneinfo/zone.tab"
 #define_PATH_ISO3166   "/usr/share/misc/iso3166"
@@ -71,6 +74,19 @@ __FBSDID("$FreeBSD$");
 #define DITEM_LEAVE_MENU(1 << 16)
 #define DITEM_RECREATE  (1 << 18)
 
+static charpath_zonetab[MAXPATHLEN], path_iso3166[MAXPATHLEN],
+   path_zoneinfo[MAXPATHLEN], path_localtime[MAXPATHLEN],
+   path_db[MAXPATHLEN], path_wall_cmos_clock[MAXPATHLEN];
+
+static int reallydoit = 1;
+static int reinstall = 0;
+static char *chrootenv = NULL;
+
+static voidusage(void);
+static int install_zoneinfo(const char *zoneinfo);
+static int install_zoneinfo_file(const char *zoneinfo_file);
+
+#ifdef HAVE_DIALOG
 /* for use in describing more exotic behaviors */
 typedef struct dialogMenuItem {
char *prompt;
@@ -186,20 +202,10 @@ again:
return result;
 }
 
-static char

svn commit: r322095 - stable/10/share/man/man5

[Marius Strobl]

Author: marius
Date: Sat Aug  5 12:34:31 2017
New Revision: 322095
URL: https://svnweb.freebsd.org/changeset/base/322095

Log:
  Regenerate src.conf.5 after r322094.

Modified:
  stable/10/share/man/man5/src.conf.5

Modified: stable/10/share/man/man5/src.conf.5
==
--- stable/10/share/man/man5/src.conf.5 Sat Aug  5 12:33:00 2017
(r322094)
+++ stable/10/share/man/man5/src.conf.5 Sat Aug  5 12:34:31 2017
(r322095)
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
 .\" from FreeBSD: stable/10/tools/build/options/makeman 318614 2017-05-22 
06:08:20Z ngie
 .\" $FreeBSD$
-.Dd July 5, 2017
+.Dd August 5, 2017
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -371,6 +371,15 @@ The debug files will be placed in a subdirectory of
 .Pa /usr/lib/debug
 and are located automatically by
 .Xr gdb 1 .
+.It Va WITHOUT_DIALOG
+.\" from FreeBSD: stable/10/tools/build/options/WITHOUT_DIALOG 322094 
2017-08-05 12:33:00Z marius
+Set to not build dialog(1), dialog(1,3), and dpv(1,3).
+When set, it also enforces the following options:
+.Pp
+.Bl -item -compact
+.It
+.Va WITHOUT_BSDINSTALL
+.El
 .It Va WITHOUT_DICT
 .\" from FreeBSD: stable/10/tools/build/options/WITHOUT_DICT 156932 2006-03-21 
07:50:50Z ru
 Set to not build the Webster dictionary files.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322094 - in stable/10: . gnu/usr.bin lib share/mk tools/build/mk tools/build/options usr.bin usr.sbin

[Marius Strobl]

Author: marius
Date: Sat Aug  5 12:33:00 2017
New Revision: 322094
URL: https://svnweb.freebsd.org/changeset/base/322094

Log:
  MFC: r306375
  
  Add a WITHOUT_DIALOG src.conf(5) knob.
  
  It also turns off dependencies (bsdinstall, bsdconfig, dpv, tzsetup).

Added:
  stable/10/tools/build/options/WITHOUT_DIALOG
 - copied unchanged from r306375, head/tools/build/options/WITHOUT_DIALOG
Modified:
  stable/10/Makefile.inc1
  stable/10/gnu/usr.bin/Makefile
  stable/10/lib/Makefile
  stable/10/share/mk/bsd.own.mk
  stable/10/tools/build/mk/OptionalObsoleteFiles.inc
  stable/10/usr.bin/Makefile
  stable/10/usr.sbin/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/Makefile.inc1
==
--- stable/10/Makefile.inc1 Sat Aug  5 10:03:47 2017(r322093)
+++ stable/10/Makefile.inc1 Sat Aug  5 12:33:00 2017(r322094)
@@ -1713,13 +1713,17 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \
${_cddl_lib_libzfs_core} \
lib/libutil ${_lib_libypclnt} lib/libz lib/msun \
${_secure_lib_libcrypto} ${_lib_libldns} \
-   ${_secure_lib_libssh} ${_secure_lib_libssl} \
-   gnu/lib/libdialog
+   ${_secure_lib_libssh} ${_secure_lib_libssl}
 .if ${MK_GNUCXX} != no
 _prebuild_libs+= gnu/lib/libstdc++ gnu/lib/libsupc++
 gnu/lib/libstdc++__L: lib/msun__L
 .endif
 
+.if ${MK_DIALOG} != "no"
+_prebuild_libs+= gnu/lib/libdialog
+gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncursesw__L
+.endif
+
 .if ${MK_LIBCPLUSPLUS} != "no"
 _prebuild_libs+= lib/libc++
 .endif
@@ -1850,8 +1854,6 @@ _lib_libypclnt=   lib/libypclnt
 .if ${MK_OPENSSL} == "no"
 lib/libradius__L: lib/libmd__L
 .endif
-
-gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncursesw__L
 
 .for _lib in ${_prereq_libs}
 ${_lib}__PL: .PHONY .MAKE

Modified: stable/10/gnu/usr.bin/Makefile
==
--- stable/10/gnu/usr.bin/Makefile  Sat Aug  5 10:03:47 2017
(r322093)
+++ stable/10/gnu/usr.bin/Makefile  Sat Aug  5 12:33:00 2017
(r322094)
@@ -4,7 +4,7 @@
 
 SUBDIR= ${_binutils} \
${_cc} \
-   dialog \
+   ${_dialog} \
diff \
diff3 \
${_dtc} \
@@ -24,6 +24,10 @@ _gperf=  gperf
 .if ${MK_GROFF} != "no"
 _groff=groff
 .endif
+.endif
+
+.if ${MK_DIALOG} != "no"
+_dialog=   dialog
 .endif
 
 .if ${MK_GPL_DTC} != "no"

Modified: stable/10/lib/Makefile
==
--- stable/10/lib/Makefile  Sat Aug  5 10:03:47 2017(r322093)
+++ stable/10/lib/Makefile  Sat Aug  5 12:33:00 2017(r322094)
@@ -40,7 +40,7 @@ SUBDIR=   ${SUBDIR_ORDERED} \
libdevctl \
libdevinfo \
libdevstat \
-   libdpv \
+   ${_libdpv} \
libdwarf \
libedit \
${_libefi} \
@@ -162,6 +162,10 @@ _libbsnmp= libbsnmp
 
 .if ${MK_CLANG} != "no" && !defined(COMPAT_32BIT)
 _clang=clang
+.endif
+
+.if ${MK_DIALOG} != "no"
+_libdpv=   libdpv
 .endif
 
 .if ${MK_FILE} != "no"

Modified: stable/10/share/mk/bsd.own.mk
==
--- stable/10/share/mk/bsd.own.mk   Sat Aug  5 10:03:47 2017
(r322093)
+++ stable/10/share/mk/bsd.own.mk   Sat Aug  5 12:33:00 2017
(r322094)
@@ -288,6 +288,7 @@ __DEFAULT_YES_OPTIONS = \
 CRYPT \
 CTM \
 CXX \
+DIALOG \
 DICT \
 DYNAMICROOT \
 ED_CRYPTO \
@@ -549,6 +550,10 @@ MK_KERBEROS:=  no
 .if ${MK_CXX} == "no"
 MK_CLANG:= no
 MK_GROFF:= no
+.endif
+
+.if ${MK_DIALOG} == "no"
+MK_BSDINSTALL:=no
 .endif
 
 .if ${MK_MAIL} == "no"

Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc  Sat Aug  5 10:03:47 
2017(r322093)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc  Sat Aug  5 12:33:00 
2017(r322094)
@@ -1057,6 +1057,27 @@ OLD_FILES+=usr/bin/g++
 OLD_FILES+=usr/libexec/cc1plus
 .endif
 
+.if ${MK_DIALOG} == no
+OLD_FILES+=usr/bin/dialog
+OLD_FILES+=usr/bin/dpv
+OLD_FILES+=usr/lib/libdialog.a
+OLD_FILES+=usr/lib/libdialog.so
+OLD_FILES+=usr/lib/libdialog.so.8
+OLD_FILES+=usr/lib/libdialog_p.a
+OLD_FILES+=usr/lib/libdpv.a
+OLD_FILES+=usr/lib/libdpv.so
+OLD_FILES+=usr/lib/libdpv.so.1
+OLD_FILES+=usr/lib/libdpv_p.a
+OLD_FILES+=usr/sbin/bsdconfig
+OLD_FILES+=usr/sbin/tzsetup
+OLD_FILES+=usr/share/man/man1/dialog.1.gz
+OLD_FILES+=usr/share/man/man1/dpv.1.gz
+OLD_FILES+=usr/share/man/man3/dialog.3.gz
+OLD_FILES+=usr/share/man/man3/dpv.3.gz
+OLD_FILES+=usr/share/man/man8/tzsetup.8.gz
+OLD_FILES+=usr/share/man/man8/bsdconfig.8.gz
+.endif
+
 .if ${MK_FMTREE} == no
 OLD_FILES+=usr/sbin/fmtree
 

svn commit: r322093 - head/usr.bin/calendar/calendars

[Christoph Moench-Tegeder]

Author: cmt (ports committer)
Date: Sat Aug  5 10:03:47 2017
New Revision: 322093
URL: https://svnweb.freebsd.org/changeset/base/322093

Log:
  add myself to calendar.freebsd
  
  Reported by:  mckusick

Modified:
  head/usr.bin/calendar/calendars/calendar.freebsd

Modified: head/usr.bin/calendar/calendars/calendar.freebsd
==
--- head/usr.bin/calendar/calendars/calendar.freebsdSat Aug  5 09:48:58 
2017(r322092)
+++ head/usr.bin/calendar/calendars/calendar.freebsdSat Aug  5 10:03:47 
2017(r322093)
@@ -74,6 +74,7 @@
 02/15  Hiren Panchasara  born in Ahmedabad, Gujarat, India, 
1984
 02/16  Justin Hibbits  born in Toledo, Ohio, United 
States, 1983
 02/16   Tobias Christian Berner  born in Bern, 
Switzerland, 1985
+02/18   Christoph Moench-Tegeder  born in Hannover, 
Niedersachsen, Germany, 1980
 02/19  Murray Stokely  born in Jacksonville, Florida, 
United States, 1979
 02/20  Anders Nordby  born in Oslo, Norway, 1976
 02/21  Alexey Zelkin  born in Simferopol, Ukraine, 1978
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322092 - stable/11/bin/ps

[Edward Tomasz Napierala]

Author: trasz
Date: Sat Aug  5 09:48:58 2017
New Revision: 322092
URL: https://svnweb.freebsd.org/changeset/base/322092

Log:
  MFC r321368:
  
  Use the "tree" word in ps(1) -d option description, to make it easier
  to find.

Modified:
  stable/11/bin/ps/ps.1
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/bin/ps/ps.1
==
--- stable/11/bin/ps/ps.1   Sat Aug  5 09:45:48 2017(r322091)
+++ stable/11/bin/ps/ps.1   Sat Aug  5 09:48:58 2017(r322092)
@@ -29,7 +29,7 @@
 .\" @(#)ps.1   8.3 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd August 12, 2016
+.Dd July 25, 2017
 .Dt PS 1
 .Os
 .Sh NAME
@@ -129,7 +129,7 @@ time (this normally has
 no effect).
 .It Fl d
 Arrange processes into descendancy order and prefix each command with
-indentation text showing sibling and parent/child relationships.
+indentation text showing sibling and parent/child relationships as a tree.
 If either of the
 .Fl m
 and
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322091 - stable/11/usr.bin/truss

[Edward Tomasz Napierala]

Author: trasz
Date: Sat Aug  5 09:45:48 2017
New Revision: 322091
URL: https://svnweb.freebsd.org/changeset/base/322091

Log:
  MFC r321329:
  
  Make truss(1) cross-reference dtrace(1) and bump .Dd.

Modified:
  stable/11/usr.bin/truss/truss.1
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.bin/truss/truss.1
==
--- stable/11/usr.bin/truss/truss.1 Sat Aug  5 09:45:08 2017
(r322090)
+++ stable/11/usr.bin/truss/truss.1 Sat Aug  5 09:45:48 2017
(r322091)
@@ -1,6 +1,6 @@
 .\" $FreeBSD$
 .\"
-.Dd February 23, 2016
+.Dd July 24, 2017
 .Dt TRUSS 1
 .Os
 .Sh NAME
@@ -101,6 +101,7 @@ Do the same, but put the output into a file:
 Follow an already-running process:
 .Dl $ truss -p 34
 .Sh SEE ALSO
+.Xr dtrace 1 ,
 .Xr kdump 1 ,
 .Xr ktrace 1 ,
 .Xr ptrace 2 ,
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322090 - stable/11/usr.bin/truss

[Edward Tomasz Napierala]

Author: trasz
Date: Sat Aug  5 09:45:08 2017
New Revision: 322090
URL: https://svnweb.freebsd.org/changeset/base/322090

Log:
  MFC r321328:
  
  Use more usual formatting for the EXAMPLES section of truss(1).

Modified:
  stable/11/usr.bin/truss/truss.1
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.bin/truss/truss.1
==
--- stable/11/usr.bin/truss/truss.1 Sat Aug  5 09:44:21 2017
(r322089)
+++ stable/11/usr.bin/truss/truss.1 Sat Aug  5 09:45:08 2017
(r322090)
@@ -92,11 +92,13 @@ and
 options are mutually exclusive.)
 .El
 .Sh EXAMPLES
-# Follow the system calls used in echoing "hello"
+Follow the system calls used in echoing "hello":
 .Dl $ truss /bin/echo hello
-# Do the same, but put the output into a file
+.Pp
+Do the same, but put the output into a file:
 .Dl $ truss -o /tmp/truss.out /bin/echo hello
-# Follow an already-running process
+.Pp
+Follow an already-running process:
 .Dl $ truss -p 34
 .Sh SEE ALSO
 .Xr kdump 1 ,
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322089 - stable/11/usr.bin/ktrace

[Edward Tomasz Napierala]

Author: trasz
Date: Sat Aug  5 09:44:21 2017
New Revision: 322089
URL: https://svnweb.freebsd.org/changeset/base/322089

Log:
  MFC r321327:
  
  Use more usual formatting for the EXAMPLES section of ktrace(1).

Modified:
  stable/11/usr.bin/ktrace/ktrace.1
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.bin/ktrace/ktrace.1
==
--- stable/11/usr.bin/ktrace/ktrace.1   Sat Aug  5 09:42:44 2017
(r322088)
+++ stable/11/usr.bin/ktrace/ktrace.1   Sat Aug  5 09:44:21 2017
(r322089)
@@ -28,7 +28,7 @@
 .\"@(#)ktrace.18.1 (Berkeley) 6/6/93
 .\" $FreeBSD$
 .\"
-.Dd March 31, 2016
+.Dd July 24, 2017
 .Dt KTRACE 1
 .Os
 .Sh NAME
@@ -148,31 +148,31 @@ and
 .Ar command
 options are mutually exclusive.
 .Sh EXAMPLES
-# trace all kernel operations of process id 34
+Trace all kernel operations of process id 34:
 .Dl $ ktrace -p 34
 .Pp
-# trace all kernel operations of processes in process group 15 and
-# pass the trace flags to all current and future children
+Trace all kernel operations of processes in process group 15 and
+pass the trace flags to all current and future children:
 .Dl $ ktrace -idg 15
 .Pp
-# disable all tracing of process 65
+Disable all tracing of process 65:
 .Dl $ ktrace -cp 65
 .Pp
-# disable tracing signals on process 70 and all current children
+Disable tracing signals on process 70 and all current children:
 .Dl $ ktrace -t s -cdp 70
 .Pp
-# enable tracing of
+Enable tracing of
 .Tn I/O
-on process 67
+on process 67:
 .Dl $ ktrace -ti -p 67
 .Pp
-# run the command "w", tracing only system calls
+Run the command "w", tracing only system calls:
 .Dl $ ktrace -tc w
 .Pp
-# disable all tracing to the file "tracedata"
+Disable all tracing to the file "tracedata":
 .Dl $ ktrace -c -f tracedata
 .Pp
-# disable tracing of all user-owned processes
+Disable tracing of all user-owned processes:
 .Dl $ ktrace -C
 .Sh SEE ALSO
 .Xr kdump 1 ,
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322088 - stable/11/share/man/man4

[Edward Tomasz Napierala]

Author: trasz
Date: Sat Aug  5 09:42:44 2017
New Revision: 322088
URL: https://svnweb.freebsd.org/changeset/base/322088

Log:
  MFC r320671:
  
  Use more canonical .Dt for vt(4).

Modified:
  stable/11/share/man/man4/vt.4
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/share/man/man4/vt.4
==
--- stable/11/share/man/man4/vt.4   Sat Aug  5 09:40:56 2017
(r322087)
+++ stable/11/share/man/man4/vt.4   Sat Aug  5 09:42:44 2017
(r322088)
@@ -25,7 +25,7 @@
 .\" $FreeBSD$
 .\"
 .Dd July 19, 2016
-.Dt "VIRTUAL TERMINALS" 4
+.Dt "VT" 4
 .Os
 .Sh NAME
 .Nm vt
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322087 - stable/11/sys/boot/forth

[Edward Tomasz Napierala]

Author: trasz
Date: Sat Aug  5 09:40:56 2017
New Revision: 322087
URL: https://svnweb.freebsd.org/changeset/base/322087

Log:
  MFC r319798:
  
  Switch the example name for variables controlling loading memory images
  in /boot/defaults/loader.conf to something that's actually commonly used,
  "mdroot".  It's arbitrary, but it's easier to find this way.

Modified:
  stable/11/sys/boot/forth/loader.conf
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/boot/forth/loader.conf
==
--- stable/11/sys/boot/forth/loader.confSat Aug  5 09:40:04 2017
(r322086)
+++ stable/11/sys/boot/forth/loader.confSat Aug  5 09:40:56 2017
(r322087)
@@ -70,9 +70,9 @@ ram_blacklist_type="ram_blacklist"# Required for the 
 ###  Initial memory disk settings  ###
 ##
 
-#initmd_load="YES" # The "initmd" prefix is arbitrary.
-#initmd_type="md_image"# Create md(4) disk at boot.
-#initmd_name="/boot/root.img"  # Path to a file containing the image.
+#mdroot_load="YES" # The "mdroot" prefix is arbitrary.
+#mdroot_type="md_image"# Create md(4) disk at boot.
+#mdroot_name="/boot/root.img"  # Path to a file containing the image.
 #rootdev="ufs:/dev/md0"# Set the root filesystem to md(4) 
device.
 
 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322086 - stable/11/share/man/man7

[Edward Tomasz Napierala]

Author: trasz
Date: Sat Aug  5 09:40:04 2017
New Revision: 322086
URL: https://svnweb.freebsd.org/changeset/base/322086

Log:
  MFC r319774:
  
  Improve formatting by removing yet another case of '-width ".Pa'.

Modified:
  stable/11/share/man/man7/hier.7
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/share/man/man7/hier.7
==
--- stable/11/share/man/man7/hier.7 Sat Aug  5 09:39:15 2017
(r322085)
+++ stable/11/share/man/man7/hier.7 Sat Aug  5 09:40:04 2017
(r322086)
@@ -693,7 +693,7 @@ source for files in
 .Pa /usr/share
 .It Pa sys/
 kernel source code
-.Bl -tag -width ".Pa opencrypto/" -compact
+.Bl -tag -width "opencrypto/" -compact
 .It Pa amd64/
 AMD64 architecture support
 .It Pa arm/
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322085 - stable/11/share/man/man7

[Edward Tomasz Napierala]

Author: trasz
Date: Sat Aug  5 09:39:15 2017
New Revision: 322085
URL: https://svnweb.freebsd.org/changeset/base/322085

Log:
  MFC r319775:
  
  /usr/share/doc/bind is gone since 20040925.

Modified:
  stable/11/share/man/man7/hier.7
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/share/man/man7/hier.7
==
--- stable/11/share/man/man7/hier.7 Sat Aug  5 09:38:15 2017
(r322084)
+++ stable/11/share/man/man7/hier.7 Sat Aug  5 09:39:15 2017
(r322085)
@@ -488,8 +488,6 @@ association)
 Frequently Asked Questions
 .It Pa IPv6/
 implementation notes for IPv6
-.It Pa bind/
-documents pertaining to BIND (the Berkeley Internet Name Domain)
 .It Pa es/
 Spanish translations of documents in /usr/share/doc
 .It Pa handbook/
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322083 - stable/11/sys/geom

[Edward Tomasz Napierala]

Author: trasz
Date: Sat Aug  5 09:34:09 2017
New Revision: 322083
URL: https://svnweb.freebsd.org/changeset/base/322083

Log:
  MFC r318444:
  
  Fix typo.

Modified:
  stable/11/sys/geom/geom_vfs.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/geom/geom_vfs.c
==
--- stable/11/sys/geom/geom_vfs.c   Sat Aug  5 09:32:03 2017
(r322082)
+++ stable/11/sys/geom/geom_vfs.c   Sat Aug  5 09:34:09 2017
(r322083)
@@ -168,7 +168,7 @@ g_vfs_strategy(struct bufobj *bo, struct buf *bp)
sc = cp->geom->softc;
 
/*
-* If the provider has orphaned us, just return EXIO.
+* If the provider has orphaned us, just return ENXIO.
 */
mtx_lock(>sc_mtx);
if (sc->sc_orphaned) {
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322084 - stable/11/share/man/man7

[Edward Tomasz Napierala]

Author: trasz
Date: Sat Aug  5 09:38:15 2017
New Revision: 322084
URL: https://svnweb.freebsd.org/changeset/base/322084

Log:
  MFC r319499:
  
  Consistently use lowercase hex numbers in ascii(7).

Modified:
  stable/11/share/man/man7/ascii.7
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/share/man/man7/ascii.7
==
--- stable/11/share/man/man7/ascii.7Sat Aug  5 09:34:09 2017
(r322083)
+++ stable/11/share/man/man7/ascii.7Sat Aug  5 09:38:15 2017
(r322084)
@@ -64,9 +64,9 @@ The
 set:
 .Bd -literal -offset left
 00 NUL   01 SOH   02 STX   03 ETX   04 EOT   05 ENQ   06 ACK   07 BEL
-08 BS09 HT0A LF0B VT0C FF0D CR0E SO0F SI
+08 BS09 HT0a LF0b VT0c FF0d CR0e SO0f SI
 10 DLE   11 DC1   12 DC2   13 DC3   14 DC4   15 NAK   16 SYN   17 ETB
-18 CAN   19 EM1A SUB   1B ESC   1C FS1D GS1E RS1F US
+18 CAN   19 EM1a SUB   1b ESC   1c FS1d GS1e RS1f US
 20 SP21  !22  "23  #24  $25  %26  &27  '
 28  (29  )2a  *2b  +2c  ,2d  -2e  .2f  /
 30  031  132  233  334  435  536  637  7
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322082 - stable/11/share/man/man7

[Edward Tomasz Napierala]

Author: trasz
Date: Sat Aug  5 09:32:03 2017
New Revision: 322082
URL: https://svnweb.freebsd.org/changeset/base/322082

Log:
  MFC r318182:
  
  Improve build(7): add missing "buildkernel" and "installkernel"
  to the example, change the architectures to something more common,
  and improve description of defaults for TARGET.

Modified:
  stable/11/share/man/man7/build.7
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/share/man/man7/build.7
==
--- stable/11/share/man/man7/build.7Sat Aug  5 08:37:38 2017
(r322081)
+++ stable/11/share/man/man7/build.7Sat Aug  5 09:32:03 2017
(r322082)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 22, 2017
+.Dd May 11, 2017
 .Dt BUILD 7
 .Os
 .Sh NAME
@@ -518,7 +518,10 @@ and
 .Va TARGET Ns = Ns Li pc98 .
 If not set,
 .Va TARGET
-defaults to the current hardware platform.
+defaults to the current hardware platform, unless
+.Va TARGET_ARCH
+is also set, in which case it defaults to the appropriate
+value for that architecture.
 .It Va TARGET_ARCH
 The target machine processor architecture.
 This is analogous to the
@@ -663,11 +666,11 @@ section in
 .Pa src/UPDATING .
 .Pp
 The following sequence of commands can be used to cross-build the
-system for the sparc64 architecture on an i386 host:
+system for the armv6 architecture on an amd64 host:
 .Bd -literal -offset indent
 cd /usr/src
-make TARGET=sparc64 buildworld
-make TARGET=sparc64 DESTDIR=/clients/sparc64 installworld
+make TARGET_ARCH=armv6 buildworld buildkernel
+make TARGET_ARCH=armv6 DESTDIR=/clients/arm64 installworld installkernel
 .Ed
 .Sh SEE ALSO
 .Xr cc 1 ,
@@ -676,6 +679,7 @@ make TARGET=sparc64 DESTDIR=/clients/sparc64 installwo
 .Xr svn 1 ,
 .Xr make.conf 5 ,
 .Xr src.conf 5 ,
+.Xr arch 7 ,
 .Xr ports 7 ,
 .Xr release 7 ,
 .Xr tests 7 ,
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322081 - stable/10/sys/sys

[Alexander Motin]

Author: mav
Date: Sat Aug  5 08:37:38 2017
New Revision: 322081
URL: https://svnweb.freebsd.org/changeset/base/322081

Log:
  MFC r321685: Fix IORDY bits definition.
  
  According to the ATA specs, IORDYDIS should be bit 10, IORDY -- bit 11.
  
  PR: 221049
  Submitted by:   aaron.s...@baesystems.com

Modified:
  stable/10/sys/sys/ata.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/sys/ata.h
==
--- stable/10/sys/sys/ata.h Sat Aug  5 08:37:08 2017(r322080)
+++ stable/10/sys/sys/ata.h Sat Aug  5 08:37:38 2017(r322081)
@@ -68,8 +68,8 @@ struct ata_params {
 /*049*/ u_int16_t   capabilities1;
 #define ATA_SUPPORT_DMA 0x0100
 #define ATA_SUPPORT_LBA 0x0200
-#define ATA_SUPPORT_IORDY   0x0400
-#define ATA_SUPPORT_IORDYDIS0x0800
+#define ATA_SUPPORT_IORDYDIS0x0400
+#define ATA_SUPPORT_IORDY   0x0800
 #define ATA_SUPPORT_OVERLAP 0x4000
 
 /*050*/ u_int16_t   capabilities2;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322080 - stable/11/sys/sys

[Alexander Motin]

Author: mav
Date: Sat Aug  5 08:37:08 2017
New Revision: 322080
URL: https://svnweb.freebsd.org/changeset/base/322080

Log:
  MFC r321685: Fix IORDY bits definition.
  
  According to the ATA specs, IORDYDIS should be bit 10, IORDY -- bit 11.
  
  PR:   221049
  Submitted by: aaron.s...@baesystems.com

Modified:
  stable/11/sys/sys/ata.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/sys/ata.h
==
--- stable/11/sys/sys/ata.h Sat Aug  5 08:36:04 2017(r322079)
+++ stable/11/sys/sys/ata.h Sat Aug  5 08:37:08 2017(r322080)
@@ -68,8 +68,8 @@ struct ata_params {
 /*049*/ u_int16_t   capabilities1;
 #define ATA_SUPPORT_DMA 0x0100
 #define ATA_SUPPORT_LBA 0x0200
-#define ATA_SUPPORT_IORDY   0x0400
-#define ATA_SUPPORT_IORDYDIS0x0800
+#define ATA_SUPPORT_IORDYDIS0x0400
+#define ATA_SUPPORT_IORDY   0x0800
 #define ATA_SUPPORT_OVERLAP 0x4000
 
 /*050*/ u_int16_t   capabilities2;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322079 - stable/10/cddl/contrib/opensolaris/lib/libzfs/common

[Alexander Motin]

Author: mav
Date: Sat Aug  5 08:36:04 2017
New Revision: 322079
URL: https://svnweb.freebsd.org/changeset/base/322079

Log:
  MFC r321921: Add compat shim part missed at r305197.
  
  This fixes compatibility between old kernel and new ZFS tools.
  It seems to be tradition to forget it.
  
  PR:   221112

Modified:
  stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c
==
--- stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c
Sat Aug  5 08:35:13 2017(r322078)
+++ stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c
Sat Aug  5 08:36:04 2017(r322079)
@@ -74,6 +74,9 @@ zcmd_ioctl(int fd, int request, zfs_cmd_t *zc)
 
if (zfs_ioctl_version >= ZFS_IOCVER_DEADMAN) {
switch (zfs_ioctl_version) {
+   case ZFS_IOCVER_INLANES:
+   cflag = ZFS_CMD_COMPAT_INLANES;
+   break;
case ZFS_IOCVER_RESUME:
cflag = ZFS_CMD_COMPAT_RESUME;
break;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322078 - stable/11/cddl/contrib/opensolaris/lib/libzfs/common

[Alexander Motin]

Author: mav
Date: Sat Aug  5 08:35:13 2017
New Revision: 322078
URL: https://svnweb.freebsd.org/changeset/base/322078

Log:
  MFC r321921: Add compat shim part missed at r305197.
  
  This fixes compatibility between old kernel and new ZFS tools.
  It seems to be tradition to forget it.
  
  PR:   221112

Modified:
  stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c
==
--- stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c
Sat Aug  5 07:52:15 2017(r322077)
+++ stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c
Sat Aug  5 08:35:13 2017(r322078)
@@ -74,6 +74,9 @@ zcmd_ioctl(int fd, int request, zfs_cmd_t *zc)
 
if (zfs_ioctl_version >= ZFS_IOCVER_DEADMAN) {
switch (zfs_ioctl_version) {
+   case ZFS_IOCVER_INLANES:
+   cflag = ZFS_CMD_COMPAT_INLANES;
+   break;
case ZFS_IOCVER_RESUME:
cflag = ZFS_CMD_COMPAT_RESUME;
break;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322077 - head/share/man/man3

[Konstantin Belousov]

Author: kib
Date: Sat Aug  5 07:52:15 2017
New Revision: 322077
URL: https://svnweb.freebsd.org/changeset/base/322077

Log:
  Provide more detailed specification for major(), minor() and makedev().
  
  Remove some statements which are no longer correct after ino64, and
  clarify other.
  
  The rewording is not in fact specific to ino64 and improvements are
  useful on the stable branches.
  
  Noted and reviewed by:bde
  Sponsored by: The FreeBSD Foundation
  MFC after:1 week

Modified:
  head/share/man/man3/makedev.3

Modified: head/share/man/man3/makedev.3
==
--- head/share/man/man3/makedev.3   Sat Aug  5 06:56:46 2017
(r322076)
+++ head/share/man/man3/makedev.3   Sat Aug  5 07:52:15 2017
(r322077)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 28, 2008
+.Dd August 3, 2017
 .Dt MAKEDEV 3
 .Os
 .Sh NAME
@@ -43,7 +43,7 @@
 .Sh DESCRIPTION
 The
 .Fn makedev
-macro allows a unique device number to be generated based on its
+macro returns a device number created from the provided
 .Fa major
 and
 .Fa minor
@@ -52,13 +52,26 @@ The
 .Fn major
 and
 .Fn minor
-macros can be used to obtain the original numbers from the device number
+macros return the original numbers from the device number
 .Fa dev .
+In other words, for a value
+.Va dev
+of the type
+.Vt dev_t ,
+and values
+.Va ma , mi
+of the type
+.Vt int ,
+the assertions
+.Dl dev == makedev(major(dev), minor(dev))
+.Dl ma == major(makedev(ma, mi))
+.Dl mi == minor(makedev(ma, mi))
+are valid.
 .Pp
 In previous implementations of
 .Fx
 all block and character devices were uniquely identified by a pair of
-major and minor numbers.
+stable major and minor numbers.
 The major number referred to a certain device class (e.g. disks, TTYs)
 while the minor number identified an instance within the device class.
 Later versions of
@@ -66,7 +79,8 @@ Later versions of
 automatically generate a unique device number for each character device
 visible in
 .Pa /dev/ .
-These numbers are not divided in device classes.
+These numbers are not divided in device classes and are not guaranteed
+to be stable upon reboot or driver reload.
 .Pp
 On
 .Fx
@@ -78,11 +92,9 @@ conventional way.
 .Sh RETURN VALUES
 The
 .Fn major
-macro returns a device major number that has a value between 0 and 255.
-The
+and
 .Fn minor
-macro returns a device minor number whose value can span the complete
-range of an
+macros return numbers whose value can span the complete range of an
 .Vt int .
 .Sh SEE ALSO
 .Xr mknod 2 ,
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r321920 - head/sys/sys

[Konstantin Belousov]

On Sat, Aug 05, 2017 at 12:26:03PM +1000, Bruce Evans wrote:
> > +#defineminor(x)((int)(x))
> 
> Another nice simplification.  Strictly, it should be (int)(dev_t)(x) since
> the pseudo-prototype says that the arg is converted to dev_t, but yesterday
> I couldn't see any differences even for exotic x and exotic arches.
> 
> Today I can see some difference for exotic x and perverse implementations.
> E.g., x with extra bits in a large signed integer type to invoke
> implementation-defined behaviour, and a perverse implementation that
> truncates to 0 for direct conversion to int but does the right thing
> for indirect conversion).  But we depend on the implementation doing
> the right thing for other casts to int.
> 
> Also, if dev_t == uintptr_t, it is valid for the caller to keep dev_t's
> in void *'s internally but not to pass void * to minor() or major()
> according to the prototype.  However, casting in the macros breaks the
> warning for this.  I think pure macros should not cast their args or
> pretend to have prototypes, but require callers to pass args of supported
> types.  The old dev_t macros were closer to this -- they have expressions
> like ((x) << 8) which will fail if x is not an integral type or give
> wrong results ix x has extra bits.
So you are arguing to keep the & 0x operation ?
I think this is not needed, since your note about cast being equivalent
holds for all supported architectures and I do not see anywhere a contract
for the operations to work on non-dev_t.

So are you fine with the posted patch to sys/types.h ?

___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322076 - in head/sys: amd64/amd64 i386/i386 x86/include x86/x86

[Jung-uk Kim]

Author: jkim
Date: Sat Aug  5 06:56:46 2017
New Revision: 322076
URL: https://svnweb.freebsd.org/changeset/base/322076

Log:
  Detect hypervisors early.  We used to set lower hz on hypervisors by default
  but it was broken since r273800 (and r278522, its MFC to stable/10) because
  identify_cpu() is called too late, i.e., after init_param1().
  
  MFC after:3 days

Modified:
  head/sys/amd64/amd64/machdep.c
  head/sys/i386/i386/machdep.c
  head/sys/x86/include/x86_var.h
  head/sys/x86/x86/identcpu.c

Modified: head/sys/amd64/amd64/machdep.c
==
--- head/sys/amd64/amd64/machdep.c  Sat Aug  5 06:46:06 2017
(r322075)
+++ head/sys/amd64/amd64/machdep.c  Sat Aug  5 06:56:46 2017
(r322076)
@@ -1537,6 +1537,8 @@ hammer_time(u_int64_t modulep, u_int64_t physfree)
 
kmdp = init_ops.parse_preload_data(modulep);
 
+   identify_hypervisor();
+
/* Init basic tunables, hz etc */
init_param1();
 

Modified: head/sys/i386/i386/machdep.c
==
--- head/sys/i386/i386/machdep.cSat Aug  5 06:46:06 2017
(r322075)
+++ head/sys/i386/i386/machdep.cSat Aug  5 06:56:46 2017
(r322076)
@@ -2185,6 +2185,8 @@ init386(int first)
else
init_static_kenv(NULL, 0);
 
+   identify_hypervisor();
+
/* Init basic tunables, hz etc */
init_param1();
 

Modified: head/sys/x86/include/x86_var.h
==
--- head/sys/x86/include/x86_var.h  Sat Aug  5 06:46:06 2017
(r322075)
+++ head/sys/x86/include/x86_var.h  Sat Aug  5 06:56:46 2017
(r322076)
@@ -116,6 +116,7 @@ voidcpu_setregs(void);
 void   dump_add_page(vm_paddr_t);
 void   dump_drop_page(vm_paddr_t);
 void   identify_cpu(void);
+void   identify_hypervisor(void);
 void   initializecpu(void);
 void   initializecpucache(void);
 bool   fix_cpuid(void);

Modified: head/sys/x86/x86/identcpu.c
==
--- head/sys/x86/x86/identcpu.c Sat Aug  5 06:46:06 2017(r322075)
+++ head/sys/x86/x86/identcpu.c Sat Aug  5 06:56:46 2017(r322076)
@@ -1252,7 +1252,7 @@ static const char *const vm_pnames[] = {
NULL
 };
 
-static void
+void
 identify_hypervisor(void)
 {
u_int regs[4];
@@ -1403,7 +1403,6 @@ identify_cpu(void)
cpu_feature2 = regs[2];
 #endif
 
-   identify_hypervisor();
cpu_vendor_id = find_cpu_vendor_id();
 
if (fix_cpuid()) {
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322075 - head/contrib/ipfilter/tools

[Cy Schubert]

Author: cy
Date: Sat Aug  5 06:46:06 2017
New Revision: 322075
URL: https://svnweb.freebsd.org/changeset/base/322075

Log:
  loadpoolfile() implements a -R (NORESOLVE) option which is not listed
  in usage(). This commit trues up usage() with loadpoolfile().

Modified:
  head/contrib/ipfilter/tools/ippool.c

Modified: head/contrib/ipfilter/tools/ippool.c
==
--- head/contrib/ipfilter/tools/ippool.cSat Aug  5 05:20:03 2017
(r322074)
+++ head/contrib/ipfilter/tools/ippool.cSat Aug  5 06:46:06 2017
(r322075)
@@ -77,7 +77,7 @@ usage(prog)
fprintf(stderr, "Usage:\t%s\n", prog);
fprintf(stderr, "\t-a [-dnv] -m  [-o ] [-t type] [-T ttl] 
-i [/netmask]\n");
fprintf(stderr, "\t-A [-dnv] [-m ] [-o ] [-S ] [-t 
]\n");
-   fprintf(stderr, "\t-f  [-dnuv]\n");
+   fprintf(stderr, "\t-f  [-dnuvR]\n");
fprintf(stderr, "\t-F [-dv] [-o ] [-t ]\n");
fprintf(stderr, "\t-l [-dv] [-m ] [-t ] [-o ] [-M 
] [-N ]\n");
fprintf(stderr, "\t-r [-dnv] [-m ] [-o ] [-t type] -i 
[/netmask]\n");
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"