From owner-svn-src-head@freebsd.org Thu Apr 9 05:11:20 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2A23E2AE4FB; Thu, 9 Apr 2020 05:11:20 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48yTkv6kS1z45h3; Thu, 9 Apr 2020 05:11:19 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E21AD7749; Thu, 9 Apr 2020 05:11:19 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0395BJWV093510; Thu, 9 Apr 2020 05:11:19 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0395BJTq093506; Thu, 9 Apr 2020 05:11:19 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <202004090511.0395BJTq093506@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Thu, 9 Apr 2020 05:11:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359736 - in head: etc/mtree share/mk share/zoneinfo share/zoneinfo/tests X-SVN-Group: head X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: in head: etc/mtree share/mk share/zoneinfo share/zoneinfo/tests X-SVN-Commit-Revision: 359736 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Apr 2020 05:11:20 -0000 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/Makefile Thu Apr 9 04:50:19 2020 (r359735) +++ head/share/zoneinfo/Makefile Thu 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}