From owner-svn-src-all@FreeBSD.ORG Tue Oct 27 23:48:56 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 4FD57106566C; Tue, 27 Oct 2009 23:48:56 +0000 (UTC) (envelope-from minimarmot@gmail.com) Received: from ey-out-2122.google.com (ey-out-2122.google.com [74.125.78.24]) by mx1.freebsd.org (Postfix) with ESMTP id 8A35C8FC20; Tue, 27 Oct 2009 23:48:54 +0000 (UTC) Received: by ey-out-2122.google.com with SMTP id 9so87850eyd.9 for ; Tue, 27 Oct 2009 16:48:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type; bh=ysfEfC0aRUg5GUMHco5NrCmdi1MI76+P+jeJGYlfBqQ=; b=uvDwrz6I+201L3zxNolrZxyTLgjzRkrIGDtiEB0stZNRqzOBxfgWBt6/311MmVvzjB P8flwu7Nve8SXNoEcKb8rTRsc81JAZ5B/uepahBzWj44JkOnHa3TnyF2N/9L2wTGtbOE HgCOvfRqje6xUxrfvJqe4BGEAV5xJ9tvUkbNs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=MUpnn26BxCUNMyGpiOdUU7xnNuchdTr6eozd3sLVpKdjm81PQsN/3JkgmFYZzVzXQR /20K/RIyXAZPYNDAfs6Rk64BBDZjYBQYU82nrqmLh/nlSM6iDg+qoxsEUkkhPeL7saIi IeJwPDwOGvIbM2/B292EGSpXDGI6Hz3y2eZk0= MIME-Version: 1.0 Received: by 10.211.131.36 with SMTP id i36mr446747ebn.33.1256687334231; Tue, 27 Oct 2009 16:48:54 -0700 (PDT) In-Reply-To: <20091027064517.GA34072@mavetju.org> References: <200910212059.n9LKxDDQ010447@svn.freebsd.org> <47d0403c0910261705s68cd23dcq67433dd831603416@mail.gmail.com> <20091027004213.GA13626@mavetju.org> <4AE67CA3.5080109@freebsd.org> <20091027064517.GA34072@mavetju.org> Date: Tue, 27 Oct 2009 19:48:54 -0400 Message-ID: <47d0403c0910271648v71670fecn4ef3a9e2b80d6eaa@mail.gmail.com> From: Ben Kaduk To: Edwin Groothuis Content-Type: text/plain; charset=ISO-8859-1 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 23:48:56 -0000 On Tue, Oct 27, 2009 at 2:45 AM, Edwin Groothuis wrote: > 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? Edwin, Yes, this patch works well. (Reverting my hack caused installworld to fail again, and applying this patch allowed it to work.) Thanks! -Ben Kaduk > > 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/ >