From owner-svn-src-all@FreeBSD.ORG Tue Oct 27 06:46:07 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 97954106566B; Tue, 27 Oct 2009 06:46:07 +0000 (UTC) (envelope-from edwin@mavetju.org) Received: from k7.mavetju.org (ppp113-58.static.internode.on.net [150.101.113.58]) by mx1.freebsd.org (Postfix) with ESMTP id 35E5C8FC13; Tue, 27 Oct 2009 06:46:06 +0000 (UTC) Received: by k7.mavetju.org (Postfix, from userid 1001) id BA80045167; Tue, 27 Oct 2009 17:45:17 +1100 (EST) Date: Tue, 27 Oct 2009 17:45:17 +1100 From: Edwin Groothuis To: Ben Kaduk Message-ID: <20091027064517.GA34072@mavetju.org> References: <200910212059.n9LKxDDQ010447@svn.freebsd.org> <47d0403c0910261705s68cd23dcq67433dd831603416@mail.gmail.com> <20091027004213.GA13626@mavetju.org> <4AE67CA3.5080109@freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4AE67CA3.5080109@freebsd.org> User-Agent: Mutt/1.4.2.3i Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Andriy Gapon Subject: Re: svn commit: r198351 - head/share/zoneinfo X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Oct 2009 06:46:07 -0000 On Tue, Oct 27, 2009 at 06:52:51AM +0200, Andriy Gapon wrote: > on 27/10/2009 02:42 Edwin Groothuis said the following: > > On Mon, Oct 26, 2009 at 08:05:31PM -0400, Ben Kaduk wrote: > >>> + fi; \ > >>> + echo "Updating /etc/localtime"; \ > >>> + tzsetup ${optC} -r; \ > >> > >> This breaks installworld for me. Replacing tzsetup with a hardcoded > >> /usr/sbin/tzsetup allowed installworld to finish. > > > > ===> share/zoneinfo (install) > > umask 022; cd /usr/src/share/zoneinfo; zic -D -d /usr/share/zoneinfo -p America/New_York -u root -g wheel -m 444 -y /usr/obj/usr/src/share/zoneinfo/yearistype africa antarctica asia australasia etcetera europe factory northamerica southamerica > > "factory", line 11: warning: time zone abbreviation differs from POSIX standard (Local time zone must be set--use tzsetup) > > install -o root -g wheel -m 444 /usr/src/share/zoneinfo/zone.tab /usr/share/zoneinfo/ > > Updating /etc/localtime > > tzsetup: not found > > *** Error code 127 > > > > I'll check it out, just wonder why you can run zic(8) but not > > tzsetup(8). They are both in /usr/sbin. > > Perhaps ITOOLS variable has something to do with this. > (installworld may be executed from a rather unpopulated environment). Ben, Can you confirm that this resolves it? Index: Makefile.inc1 =================================================================== --- Makefile.inc1 (revision 198253) +++ Makefile.inc1 (working copy) @@ -599,11 +599,14 @@ .if ${MK_INFO} != "no" _install-info= install-info .endif +.if ${MK_ZONEINFO} != "no" +_zoneinfo= zic tzsetup +.endif ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ date echo egrep find grep ${_install-info} \ ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ - test true uname wc zic + test true uname wc ${_zoneinfo} # # distributeworld Edwin -- Edwin Groothuis Website: http://www.mavetju.org/ edwin@mavetju.org Weblog: http://www.mavetju.org/weblog/