Date: Tue, 27 Oct 2009 19:48:54 -0400 From: Ben Kaduk <minimarmot@gmail.com> To: Edwin Groothuis <edwin@mavetju.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Andriy Gapon <avg@freebsd.org> Subject: Re: svn commit: r198351 - head/share/zoneinfo Message-ID: <47d0403c0910271648v71670fecn4ef3a9e2b80d6eaa@mail.gmail.com> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Oct 27, 2009 at 2:45 AM, Edwin Groothuis <edwin@mavetju.org> 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/
>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?47d0403c0910271648v71670fecn4ef3a9e2b80d6eaa>