svn commit: r198351 - head/share/zoneinfo

[Ben Kaduk]

On Tue, Oct 27, 2009 at 2:45 AM, Edwin Groothuis <edwin at 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 at mavetju.org       Weblog:  http://www.mavetju.org/weblog/
>