svn commit: r359723 - head/sys/dev/mlx5/mlx5_en
Author: hselasky
Date: Wed Apr 8 08:53:31 2020
New Revision: 359723
URL: https://svnweb.freebsd.org/changeset/base/359723
Log:
Remove obsolete bufring stats in mlx5en(4).
Leftover from when DRBR was removed.
MFC after:1 week
Sponsored by: Mellanox Technologies
Modified:
head/sys/dev/mlx5/mlx5_en/en.h
head/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
Modified: head/sys/dev/mlx5/mlx5_en/en.h
==
--- head/sys/dev/mlx5/mlx5_en/en.h Wed Apr 8 08:05:02 2020
(r359722)
+++ head/sys/dev/mlx5/mlx5_en/en.h Wed Apr 8 08:53:31 2020
(r359723)
@@ -827,7 +827,6 @@ struct mlx5e_sq {
/* pointers to per packet info: write@xmit, read@completion */
struct mlx5e_sq_mbuf *mbuf;
- struct buf_ring *br;
/* read only */
struct mlx5_wq_cyc wq;
Modified: head/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
==
--- head/sys/dev/mlx5/mlx5_en/mlx5_en_main.cWed Apr 8 08:05:02 2020
(r359722)
+++ head/sys/dev/mlx5/mlx5_en/mlx5_en_main.cWed Apr 8 08:53:31 2020
(r359723)
@@ -852,7 +852,6 @@ mlx5e_update_stats_locked(struct mlx5e_priv *priv)
struct mlx5_core_dev *mdev = priv->mdev;
struct mlx5e_vport_stats *s = &priv->stats.vport;
struct mlx5e_sq_stats *sq_stats;
- struct buf_ring *sq_br;
#if (__FreeBSD_version < 110)
struct ifnet *ifp = priv->ifp;
#endif
@@ -902,13 +901,10 @@ mlx5e_update_stats_locked(struct mlx5e_priv *priv)
for (j = 0; j < priv->num_tc; j++) {
sq_stats = &pch->sq[j].stats;
- sq_br = pch->sq[j].br;
tso_packets += sq_stats->tso_packets;
tso_bytes += sq_stats->tso_bytes;
tx_queue_dropped += sq_stats->dropped;
- if (sq_br != NULL)
- tx_queue_dropped += sq_br->br_drops;
tx_defragged += sq_stats->defragged;
tx_offload_none += sq_stats->csum_offload_none;
}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r359724 - head/sys/dev/mlx5/mlx5_en
Author: hselasky Date: Wed Apr 8 08:56:27 2020 New Revision: 359724 URL: https://svnweb.freebsd.org/changeset/base/359724 Log: Account out of buffer as dropped packets in mlx5en(4). MFC after:1 week Sponsored by: Mellanox Technologies Modified: head/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Modified: head/sys/dev/mlx5/mlx5_en/mlx5_en_main.c == --- head/sys/dev/mlx5/mlx5_en/mlx5_en_main.cWed Apr 8 08:53:31 2020 (r359723) +++ head/sys/dev/mlx5/mlx5_en/mlx5_en_main.cWed Apr 8 08:56:27 2020 (r359724) @@ -905,6 +905,7 @@ mlx5e_update_stats_locked(struct mlx5e_priv *priv) tso_packets += sq_stats->tso_packets; tso_bytes += sq_stats->tso_bytes; tx_queue_dropped += sq_stats->dropped; + tx_queue_dropped += sq_stats->enobuf; tx_defragged += sq_stats->defragged; tx_offload_none += sq_stats->csum_offload_none; } ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r359726 - head/sys/compat/linuxkpi/common/include/linux
Author: hselasky
Date: Wed Apr 8 16:07:57 2020
New Revision: 359726
URL: https://svnweb.freebsd.org/changeset/base/359726
Log:
Some fixes for SRCU in the LinuxKPI.
- Make sure to use READ_ONCE() when deferring variables.
- Remove superfluous zero initializer.
MFC after:1 week
Sponsored by: Mellanox Technologies
Modified:
head/sys/compat/linuxkpi/common/include/linux/srcu.h
Modified: head/sys/compat/linuxkpi/common/include/linux/srcu.h
==
--- head/sys/compat/linuxkpi/common/include/linux/srcu.hWed Apr 8
14:11:54 2020(r359725)
+++ head/sys/compat/linuxkpi/common/include/linux/srcu.hWed Apr 8
16:07:57 2020(r359726)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2015-2017 Mellanox Technologies, Ltd.
+ * Copyright (c) 2015-2020 Mellanox Technologies, Ltd.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -29,13 +29,16 @@
#ifndef_LINUX_SRCU_H_
#define_LINUX_SRCU_H_
+#include
+
struct srcu_struct {
};
-#definesrcu_dereference(ptr,srcu) ((__typeof(*(ptr)) *)(ptr))
+#definesrcu_dereference(p, srcu) \
+ ((__typeof(*(p)) *)READ_ONCE(p))
#defineDEFINE_STATIC_SRCU(name) \
- static struct srcu_struct name = {}
+ static struct srcu_struct name
/* prototypes */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r359727 - in head/sys: compat/linuxkpi/common/include/linux compat/linuxkpi/common/src sys
Author: hselasky
Date: Wed Apr 8 17:09:45 2020
New Revision: 359727
URL: https://svnweb.freebsd.org/changeset/base/359727
Log:
Clone the RCU interface into a sleepable and a non-sleepable part
in the LinuxKPI.
This allows synchronize RCU to be used inside a SRCU read section.
No functional change intended.
Bump the __FreeBSD_version to force recompilation of external kernel modules.
PR: 242272
MFC after:1 week
Sponsored by: Mellanox Technologies
Modified:
head/sys/compat/linuxkpi/common/include/linux/rcupdate.h
head/sys/compat/linuxkpi/common/src/linux_rcu.c
head/sys/sys/param.h
Modified: head/sys/compat/linuxkpi/common/include/linux/rcupdate.h
==
--- head/sys/compat/linuxkpi/common/include/linux/rcupdate.hWed Apr 8
16:07:57 2020(r359726)
+++ head/sys/compat/linuxkpi/common/include/linux/rcupdate.hWed Apr 8
17:09:45 2020(r359727)
@@ -35,6 +35,11 @@
#defineLINUX_KFREE_RCU_OFFSET_MAX 4096/* exclusive */
+/* BSD specific defines */
+#defineRCU_TYPE_REGULAR 0
+#defineRCU_TYPE_SLEEPABLE 1
+#defineRCU_TYPE_MAX 2
+
#defineRCU_INITIALIZER(v) \
((__typeof(*(v)) *)(v))
@@ -43,27 +48,27 @@
} while (0)
#definecall_rcu(ptr, func) do {\
- linux_call_rcu(ptr, func); \
+ linux_call_rcu(RCU_TYPE_REGULAR, ptr, func);\
} while (0)
#definercu_barrier(void) do { \
- linux_rcu_barrier();\
+ linux_rcu_barrier(RCU_TYPE_REGULAR);\
} while (0)
#definercu_read_lock(void) do {\
- linux_rcu_read_lock(); \
+ linux_rcu_read_lock(RCU_TYPE_REGULAR); \
} while (0)
#definercu_read_unlock(void) do { \
- linux_rcu_read_unlock();\
+ linux_rcu_read_unlock(RCU_TYPE_REGULAR);\
} while (0)
#definesynchronize_rcu(void) do { \
- linux_synchronize_rcu();\
+ linux_synchronize_rcu(RCU_TYPE_REGULAR);\
} while (0)
#definesynchronize_rcu_expedited(void) do {\
- linux_synchronize_rcu();\
+ linux_synchronize_rcu(RCU_TYPE_REGULAR);\
} while (0)
#definekfree_rcu(ptr, rcu_head) do { \
@@ -94,11 +99,11 @@
/* prototypes */
-extern void linux_call_rcu(struct rcu_head *ptr, rcu_callback_t func);
-extern void linux_rcu_barrier(void);
-extern void linux_rcu_read_lock(void);
-extern void linux_rcu_read_unlock(void);
-extern void linux_synchronize_rcu(void);
+extern void linux_call_rcu(unsigned type, struct rcu_head *ptr, rcu_callback_t
func);
+extern void linux_rcu_barrier(unsigned type);
+extern void linux_rcu_read_lock(unsigned type);
+extern void linux_rcu_read_unlock(unsigned type);
+extern void linux_synchronize_rcu(unsigned type);
/* Empty implementation for !DEBUG */
#defineinit_rcu_head(...)
Modified: head/sys/compat/linuxkpi/common/src/linux_rcu.c
==
--- head/sys/compat/linuxkpi/common/src/linux_rcu.c Wed Apr 8 16:07:57
2020(r359726)
+++ head/sys/compat/linuxkpi/common/src/linux_rcu.c Wed Apr 8 17:09:45
2020(r359727)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2016 Matthew Macy (mm...@mattmacy.io)
- * Copyright (c) 2017 Hans Petter Selasky (hsela...@freebsd.org)
+ * Copyright (c) 2017-2020 Hans Petter Selasky (hsela...@freebsd.org)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -90,9 +90,9 @@ CTASSERT(sizeof(struct rcu_head) == sizeof(struct call
*/
CTASSERT(offsetof(struct linux_epoch_record, epoch_record) == 0);
-static ck_epoch_t linux_epoch;
-static struct linux_epoch_head linux_epoch_head;
-DPCPU_DEFINE_STATIC(struct linux_epoch_record, linux_epoch_record);
+static ck_epoch_t linux_epoch[RCU_TYPE_MAX];
+static struct linux_epoch_head linux_epoch_head[RCU_TYPE_MAX];
+DPCPU_DEFINE_STATIC(struct linux_epoch_record,
linux_epoch_record[RCU_TYPE_MAX]);
static void linux_rcu_cleaner_func(void *, int);
@@ -101,23 +101,27 @@ linux_rcu_runtime_init(void *arg __unused)
{
struct linux_epoch_head *head;
int i;
+ int j;
- ck_epoch_init(&linux_epoch);
+ for (j = 0; j != RCU_TYPE_MAX; j++) {
+ ck_epoch_init(&linux_epoch[j]);
- head = &linux_epoch_head;
+ head = &linux_epoch_head[j];
- mtx_init(&head->lock, "LRCU-HEAD", NULL, MTX_DEF);
- TASK_INIT(&head->task, 0, linux_rcu_cleaner_func, NULL);
- STAILQ_INIT(&head->cb_head);
+ mtx_init(&head->lock, "LRCU-HEAD", NULL, MTX_DEF);
+ TASK_INIT(&head->task, 0, linux_rcu_cleaner_func, head);
+ STAILQ_INIT(&head->cb_hea
svn commit: r359729 - head/sys/netinet
Author: imp Date: Wed Apr 8 17:55:45 2020 New Revision: 359729 URL: https://svnweb.freebsd.org/changeset/base/359729 Log: Fix copyright year and eliminate the obsolete all rights reserved line. Reviewed by: rrs@ Modified: head/sys/netinet/tcp_ratelimit.c head/sys/netinet/tcp_ratelimit.h Modified: head/sys/netinet/tcp_ratelimit.c == --- head/sys/netinet/tcp_ratelimit.cWed Apr 8 17:41:28 2020 (r359728) +++ head/sys/netinet/tcp_ratelimit.cWed Apr 8 17:55:45 2020 (r359729) @@ -2,9 +2,8 @@ * * SPDX-License-Identifier: BSD-3-Clause * - * Copyright (c) 2018-2019 + * Copyright (c) 2018-2020 * Netflix Inc. - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: head/sys/netinet/tcp_ratelimit.h == --- head/sys/netinet/tcp_ratelimit.hWed Apr 8 17:41:28 2020 (r359728) +++ head/sys/netinet/tcp_ratelimit.hWed Apr 8 17:55:45 2020 (r359729) @@ -2,9 +2,8 @@ * * SPDX-License-Identifier: BSD-3-Clause * - * Copyright (c) 2018-2019 + * Copyright (c) 2018-2020 * Netflix Inc. - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r359689 - head/usr.sbin/config
> On Apr 7, 2020, at 7:14 AM, Kyle Evans wrote: > > Author: kevans > Date: Tue Apr 7 14:14:59 2020 > New Revision: 359689 > URL: https://svnweb.freebsd.org/changeset/base/359689 > > Log: > config(8): "fix" a couple of buffer overflows > > Recently added/changed lines in various kernel configs have caused some > buffer overflows that went undetected. These were detected with a config > built using -fno-common as these line buffers smashed one of our arrays, > then further triaged with ASAN. > > Double the sizes; this is really not a great fix, but addresses the > immediate need until someone rewrites config. While here, add some bounds > checking so that we don't need to detect this by random bus errors or other > weird failures. Good catch! This seems like it deserves a follow up PR in Bugzilla. Cheers, -Enji ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r359730 - head/usr.bin/logger
Author: oshogbo
Date: Wed Apr 8 18:43:00 2020
New Revision: 359730
URL: https://svnweb.freebsd.org/changeset/base/359730
Log:
logger: temporarily disable Capsicum when a host is provided
We don't have a way to send a UDP package.
PR: 245314
Reported by: dch
Discussed with: emaste
Modified:
head/usr.bin/logger/logger.c
Modified: head/usr.bin/logger/logger.c
==
--- head/usr.bin/logger/logger.cWed Apr 8 17:55:45 2020
(r359729)
+++ head/usr.bin/logger/logger.cWed Apr 8 18:43:00 2020
(r359730)
@@ -181,8 +181,10 @@ main(int argc, char *argv[])
err(1, "Unable to contact Casper");
caph_cache_catpages();
caph_cache_tzdata();
- if (caph_enter() < 0)
- err(1, "Unable to enter capability mode");
+ if (nsock == 0) {
+ if (caph_enter() < 0)
+ err(1, "Unable to enter capability mode");
+ }
capsyslog = cap_service_open(capcas, "system.syslog");
if (capsyslog == NULL)
err(1, "Unable to open system.syslog service");
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r359731 - head/share/man/man5
Author: brueffer Date: Wed Apr 8 20:00:30 2020 New Revision: 359731 URL: https://svnweb.freebsd.org/changeset/base/359731 Log: Add a basic manpage for smbfs(5). Submitted by: Gordon Bergling MFC after:1 week Differential Revision:https://reviews.freebsd.org/D23905 Added: head/share/man/man5/smbfs.5 (contents, props changed) Modified: head/share/man/man5/Makefile Modified: head/share/man/man5/Makefile == --- head/share/man/man5/MakefileWed Apr 8 18:43:00 2020 (r359730) +++ head/share/man/man5/MakefileWed Apr 8 20:00:30 2020 (r359731) @@ -63,6 +63,7 @@ MAN= acct.5 \ resolver.5 \ services.5 \ shells.5 \ + smbfs.5 \ src.conf.5 \ stab.5 \ style.Makefile.5 \ Added: head/share/man/man5/smbfs.5 == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/man/man5/smbfs.5 Wed Apr 8 20:00:30 2020(r359731) @@ -0,0 +1,79 @@ +.\" Copyright (c) 2020 Gordon Bergling +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\"notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\"notice, this list of conditions and the following disclaimer in the +.\"documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd April 8, 2020 +.Dt SMBFS 5 +.Os +.Sh NAME +.Nm smbfs +.Nd "SMB FS" +.Sh SYNOPSIS +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "option NETSMB" +.Ed +.Pp +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +smbfs_load="YES" +.Ed +.Sh DESCRIPTION +The SMB driver is an implementation of the CIFS (Common Internet Filesystem) +network protocol. +.Sh SEE ALSO +.Xr smbutil 1 , +.Xr mount_smbfs 8 +.Sh STANDARDS +.Rs +.%U https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-cifs/ +.%T Common Internet File System (CIFS) Protocol +.%R MS-CIFS +.%D December 2018 +.Re +.Pp +.Rs +.%U https://tools.ietf.org/html/draft-heizer-cifs-v1-spec-00 +.%T Common Internet File System Protocol (CIFS/1.0) +.%D June 13, 1996 +.%A I. Heizer +.%A P. Leach +.%A D. Perry +.Re +.Sh HISTORY +The +.Nm +device driver first appeared in +.Fx 4.4 . +.Sh AUTHORS +The +.Nm +device driver was written by +.An Boris Popov Aq Mt b...@freebsd.org . +The manual page was contributed by +.An Gordon Bergling Aq Mt gbergl...@gmail.com . ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r359685 - in head: . etc lib/libc/gen share/mk share/termcap usr.bin/login usr.bin/vgrind usr.sbin/services_mkdb
On Tue, Apr 7, 2020 at 3:37 AM Rodney W. Grimes wrote: > > Author: sobomax > > Date: Tue Apr 7 02:46:22 2020 > > New Revision: 359685 > > URL: https://svnweb.freebsd.org/changeset/base/359685 > > > > Log: > > Normalize deployment tools usage and definitions by putting into one > place > > instead of sprinkling them out over many disjoint files. This is a > follow-up > > to achieve the same goal in an incomplete rev.348521. > > I have concerns that this factoring out of 5 values that have not changed > in 25 years is a pessimization, it is one more file that make has to > open on each invocation. > Well, luckily enough the cost of opening a file has been exponentially declining over those 25 years, so we are probably many-orders of magnitude faster than we used to be back in 1995. Or so I've heard. :) Having those variables defined in a centralized manner allows us here for example to convert the result of what would be installworld/installkernel/distribution action into a self-extracting archive (optionally signed) with automatically generated script, which does the action in question. As such, we can now build in a completely sandboxed environment with 0 privileges (potentially even on something completely alien like GNU/Linux) and then deploy it to as many systems as we need or use to create VM images / Jails. https://github.com/sobomax/sysmaker/blob/master/makeargs/distribution.sub https://github.com/sobomax/sysmaker/blob/master/makeargs/installkernel.sub https://github.com/sobomax/sysmaker/blob/master/makeargs/installworld.sub I have very few reasons to believe that our needs to be unique in this, I am pretty sure others will find some interesting use for this as well (e.g. signing binaries being installed, etc). -Max ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r359685 - in head: . etc lib/libc/gen share/mk share/termcap usr.bin/login usr.bin/vgrind usr.sbin/services_mkdb
> On Tue, Apr 7, 2020 at 3:37 AM Rodney W. Grimes > wrote: > > > > Author: sobomax > > > Date: Tue Apr 7 02:46:22 2020 > > > New Revision: 359685 > > > URL: https://svnweb.freebsd.org/changeset/base/359685 > > > > > > Log: > > > Normalize deployment tools usage and definitions by putting into one > > place > > > instead of sprinkling them out over many disjoint files. This is a > > follow-up > > > to achieve the same goal in an incomplete rev.348521. > > > > I have concerns that this factoring out of 5 values that have not changed > > in 25 years is a pessimization, it is one more file that make has to > > open on each invocation. > > > > Well, luckily enough the cost of opening a file has been exponentially > declining over those 25 years, so we are probably many-orders of magnitude > faster than we used to be back in 1995. Or so I've heard. :) I believe we are pretty much just on par and no more than 1 order of magnitude on time completion of make world. > > Having those variables defined in a centralized manner allows us here for > example to convert the result of what would be > installworld/installkernel/distribution action into a self-extracting > archive (optionally signed) with automatically generated script, which does > the action in question. As such, we can now build in a completely sandboxed > environment with 0 privileges (potentially even on something completely > alien like GNU/Linux) and then deploy it to as many systems as we need or > use to create VM images / Jails. > > https://github.com/sobomax/sysmaker/blob/master/makeargs/distribution.sub > https://github.com/sobomax/sysmaker/blob/master/makeargs/installkernel.sub > https://github.com/sobomax/sysmaker/blob/master/makeargs/installworld.sub I do not see anything in that set of files that requires this change, am I missing something? All of the existing values should of been overridable from the make command line invocation, and it does not mater if they are in 1 file or 50 files. > I have very few reasons to believe that our needs to be unique in this, I > am pretty sure others will find some interesting use for this as well (e.g. > signing binaries being installed, etc). I do not see that your needs require this change. > > -Max -- Rod Grimes rgri...@freebsd.org ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r359736 - in head: etc/mtree share/mk share/zoneinfo share/zoneinfo/tests
Author: delphij
Date: Thu Apr 9 05:11:18 2020
New Revision: 359736
URL: https://svnweb.freebsd.org/changeset/base/359736
Log:
Always install backward compatibility timezones, as they are installed
on all major Linux distributions as well as NetBSD and OpenBSD.
Remove the undocumented ZONEINFO_OLD_TIMEZONES_SUPPORT and the deprecated
OLDTIMEZONES knobs as they are now the default.
Reviewed by: ngie, rgrimes
MFC after:2 weeks
Differential Revision:https://reviews.freebsd.org/D24306
Modified:
head/etc/mtree/BSD.usr.dist
head/share/mk/src.opts.mk
head/share/zoneinfo/Makefile
head/share/zoneinfo/tests/Makefile
Modified: head/etc/mtree/BSD.usr.dist
==
--- head/etc/mtree/BSD.usr.dist Thu Apr 9 04:50:19 2020(r359735)
+++ head/etc/mtree/BSD.usr.dist Thu Apr 9 05:11:18 2020(r359736)
@@ -1253,15 +1253,25 @@
..
Australia
..
+Brazil
+..
+Canada
+..
+Chile
+..
Etc
..
Europe
..
Indian
..
+Mexico
+..
Pacific
..
SystemV
+..
+US
..
..
..
Modified: head/share/mk/src.opts.mk
==
--- head/share/mk/src.opts.mk Thu Apr 9 04:50:19 2020(r359735)
+++ head/share/mk/src.opts.mk Thu Apr 9 05:11:18 2020(r359736)
@@ -218,7 +218,6 @@ __DEFAULT_NO_OPTIONS = \
SORT_THREADS \
SVN \
ZONEINFO_LEAPSECONDS_SUPPORT \
-ZONEINFO_OLD_TIMEZONES_SUPPORT \
# LEFT/RIGHT. Left options which default to "yes" unless their corresponding
# RIGHT option is disabled.
@@ -466,7 +465,6 @@ MK_GOOGLETEST:= no
.if ${MK_ZONEINFO} == "no"
MK_ZONEINFO_LEAPSECONDS_SUPPORT:= no
-MK_ZONEINFO_OLD_TIMEZONES_SUPPORT:= no
.endif
.if ${MK_CROSS_COMPILER} == "no"
Modified: head/share/zoneinfo/Makefile
==
--- head/share/zoneinfo/MakefileThu Apr 9 04:50:19 2020
(r359735)
+++ head/share/zoneinfo/MakefileThu Apr 9 05:11:18 2020
(r359736)
@@ -40,11 +40,6 @@ CONTRIBDIR= ${SRCTOP}/contrib/tzdata/
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
@@ -53,12 +48,9 @@ LEAPFILE=
TZFILES= africa antarctica asia australasia etcetera europe \
factory northamerica southamerica
+TZFILES+= backward systemv
POSIXRULES=America/New_York
-.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no"
-TZFILES+= backward systemv
-.endif
-
TZFILES:= ${TZFILES:S/^/${CONTRIBDIR}/}
TZBUILDDIR=${.OBJDIR}/builddir
@@ -78,10 +70,7 @@ TZBUILDSUBDIRS= \
Indian \
Pacific \
SystemV
-
-.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no"
TZBUILDSUBDIRS+= US Mexico Chile Canada Brazil
-.endif
.if !defined(_SKIP_BUILD)
all: zoneinfo
Modified: head/share/zoneinfo/tests/Makefile
==
--- head/share/zoneinfo/tests/Makefile Thu Apr 9 04:50:19 2020
(r359735)
+++ head/share/zoneinfo/tests/Makefile Thu Apr 9 05:11:18 2020
(r359736)
@@ -8,10 +8,8 @@ PACKAGE= tests
FILESGROUPS+= TESTFILES
-.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no"
ATF_TESTS_SH+= backward_test
TESTFILES+=backward
-.endif
TESTFILES+=zoneinfo_common.sh
TESTFILESPACKAGE= ${PACKAGE}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
