svn commit: r320362 - head/share/zoneinfo
Cy Schubert
Cy.Schubert at komquats.com
Wed Jun 28 14:31:49 UTC 2017
It doesn't matter who commits it. If you want me to, I will commit it at
noon my time as I'm already a tad late for $JOB.
~cy
In message <CAFLM3-rTjsQmMrDWSPPNpTqvnt3p33sOsmwmKFM7ngEqiW86_g at mail.gmail.c
om>
, Edward Napierala writes:
> --001a113d0020693f04055304b5a4
> Content-Type: text/plain; charset="UTF-8"
>
> This patch seems to fix the problem with "make -j4 installworld" for me.
> Do you intend to commit it? Thanks! (And sorry for the breakage.)
>
>
> 2017-06-27 4:48 GMT+01:00 Cy Schubert <Cy.Schubert at komquats.com>:
>
> > (since we're top posting.... )
> >
> > Hi Sean,
> >
> > Do you want to give this a spin?
> >
> > Index: share/zoneinfo/Makefile
> > ===================================================================
> > --- share/zoneinfo/Makefile (revision 320389)
> > +++ share/zoneinfo/Makefile (working copy)
> > @@ -94,7 +94,7 @@
> > .for f in ${TZS}
> > ${INSTALL} ${TAG_ARGS} \
> > -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
> > - ${TZBUILDDIR:C,^${.OBJDIR}/,,}/${f}
> > ${DESTDIR}/usr/share/zoneinfo/${f}
> > + ${TZBUILDDIR}/${f} ${DESTDIR}/usr/share/zoneinfo/${f}
> > .endfor
> > ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
> > ${CONTRIBDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/
> >
> > ~cy
> >
> >
> > In message <f6014fd3-9f4b-b6f5-6997-38293f10e25a at freebsd.org>, Sean Bruno
> > write
> > s:
> > > This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
> > > --WTKxh8RiNpWJJ66LumpxWUq5KMtbGfm2f
> > > Content-Type: multipart/mixed; boundary="VFqTarnRbgKj5gwWULxfLoTjWIwLn2
> > loQ";
> > > protected-headers="v1"
> > > From: Sean Bruno <sbruno at freebsd.org>
> > > To: Edward Tomasz Napierala <trasz at FreeBSD.org>,
> > src-committers at freebsd.org,
> > > svn-src-all at freebsd.org, svn-src-head at freebsd.org
> > > Message-ID: <f6014fd3-9f4b-b6f5-6997-38293f10e25a at freebsd.org>
> > > Subject: Re: svn commit: r320362 - head/share/zoneinfo
> > > References: <201706261540.v5QFeOTj072841 at repo.freebsd.org>
> > > In-Reply-To: <201706261540.v5QFeOTj072841 at repo.freebsd.org>
> > >
> > > --VFqTarnRbgKj5gwWULxfLoTjWIwLn2loQ
> > > Content-Type: text/plain; charset=utf-8
> > > Content-Language: en-US
> > > Content-Transfer-Encoding: quoted-printable
> > >
> > > Hmmm ... This seems to break 'poudriere jail -c jailname -m
> > src=3D/usr/sr=
> > > c
> > > -v head"
> > >
> > > --- realinstall_subdir_share/zoneinfo ---
> > > install: builddir/Africa/Abidjan: No such file or directory
> > >
> > >
> > > On 06/26/17 09:40, Edward Tomasz Napierala wrote:
> > > > Author: trasz
> > > > Date: Mon Jun 26 15:40:24 2017
> > > > New Revision: 320362
> > > > URL: https://svnweb.freebsd.org/changeset/base/320362
> > > >=20
> > > > Log:
> > > > Provide visual feedback when timezone files are installed.
> > > > After r320003 it wasn't being shown in any way.
> > > > =20
> > > > Submitted by: bdrewery
> > > > MFC after: 1 month
> > > > Differential Revision: https://reviews.freebsd.org/D11154
> > > >=20
> > > > Modified:
> > > > head/share/zoneinfo/Makefile
> > > >=20
> > > > Modified: head/share/zoneinfo/Makefile
> > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> > 3D=3D=3D=3D=3D=
> > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> > 3D=3D=3D=3D=3D=3D=
> > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> > 3D=3D=3D=3D=3D=3D=
> > > =3D=3D=3D=3D
> > > > --- head/share/zoneinfo/Makefile Mon Jun 26 15:23:12 2017
> > (r32036
> > > 1)
> > > > +++ head/share/zoneinfo/Makefile Mon Jun 26 15:40:24 2017
> > (r32036
> > > 2)
> > > > @@ -83,14 +83,19 @@ zoneinfo: yearistype ${TDATA}
> > > > zic -D -d ${TZBUILDDIR} -p ${POSIXRULES} -m ${NOBINMODE} \
> > > > ${LEAPFILE} -y ${.OBJDIR}/yearistype ${TZFILES}
> > > > =20
> > > > +.if make(*install*)
> > > > +TZS!=3D cd ${TZBUILDDIR} && find -s * -type f
> > > > +.endif
> > > > +
> > > > beforeinstall: install-zoneinfo
> > > > install-zoneinfo:
> > > > mkdir -p ${DESTDIR}/usr/share/zoneinfo
> > > > cd ${DESTDIR}/usr/share/zoneinfo; mkdir -p ${TZBUILDSUBDIRS}
> > > > - cd ${TZBUILDDIR} && \
> > > > - find -s * -type f -exec ${INSTALL} ${TAG_ARGS} \
> > > > +.for f in ${TZS}
> > > > + ${INSTALL} ${TAG_ARGS} \
> > > > -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
> > > > - \{} ${DESTDIR}/usr/share/zoneinfo/\{} \;
> > > > + ${TZBUILDDIR:C,^${.OBJDIR}/,,}/${f}
> > ${DESTDIR}/usr/share/zoneinfo=
> > > /${f}
> > > > +.endfor
> > > > ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
> > > > ${CONTRIBDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/
> > > > =20
> > > >=20
> > > >=20
> > >
> > >
> > > --VFqTarnRbgKj5gwWULxfLoTjWIwLn2loQ--
> > >
> > > --WTKxh8RiNpWJJ66LumpxWUq5KMtbGfm2f
> > > Content-Type: application/pgp-signature; name="signature.asc"
> > > Content-Description: OpenPGP digital signature
> > > Content-Disposition: attachment; filename="signature.asc"
> > >
> > > -----BEGIN PGP SIGNATURE-----
> > >
> > > iQGTBAEBCgB9FiEE6MTp+IA1BOHj9Lo0veT1/om1/LYFAllRUJtfFIAAAAAALgAo
> > > aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEU4
> > > QzRFOUY4ODAzNTA0RTFFM0Y0QkEzNEJERTRGNUZFODlCNUZDQjYACgkQveT1/om1
> > > /LaIFggAlEX4pLTfDUaRsGoxWbGI0DiirmhR1nW74ESXjGXd4u9WSYKfvxK+oGPJ
> > > LRwxcimGw/v+h8piM102ijsmquE0+NlyyMAYjFNLb9tsZuR+kfzRbDwqiu3FNg8R
> > > zDnsvo69JHiyoi7r9BJB30Q6P9fZDGBtCrSQ9Up2IUiPHjz+pLUK6jxy29wflPSr
> > > qVDHitG2A7l7Sdn3Jsj8MWNw/4ehRNlhxudgg+F8v7tEJH9eNBpP6K6jR6B+aU/P
> > > VCPrKO1rRmmJTPxxPwskLLX4/xXrf8hmUFTm0uBbLtKbvzsaO5IZ9HKXJdYFlaRo
> > > dCw6yY1xFlMv/OrUWgSxj02fsd7GHg==
> > > =9Mia
> > > -----END PGP SIGNATURE-----
> > >
> > > --WTKxh8RiNpWJJ66LumpxWUq5KMtbGfm2f--
> > >
> > >
> >
> > --
> > Cheers,
> > Cy Schubert <Cy.Schubert at cschubert.com>
> > FreeBSD UNIX: <cy at FreeBSD.org> Web: http://www.FreeBSD.org
> >
> > The need of the many outweighs the greed of the few.
> >
> >
> >
>
> --001a113d0020693f04055304b5a4
> Content-Type: text/html; charset="UTF-8"
> Content-Transfer-Encoding: quoted-printable
>
> <div dir=3D"ltr">This patch seems to fix the problem with "make -j4 in=
> stallworld" for me.<div>Do you intend to commit it?=C2=A0 Thanks! =C2=
> =A0(And sorry for the breakage.)</div><div><br></div><div class=3D"gmail_ex=
> tra"><br><div class=3D"gmail_quote">2017-06-27 4:48 GMT+01:00 Cy Schubert <=
> span dir=3D"ltr"><<a href=3D"mailto:Cy.Schubert at komquats.com" target=3D"=
> _blank">Cy.Schubert at komquats.com</a>></span>:<br><blockquote class=3D"gm=
> ail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-le=
> ft:1ex">(since we're top posting.... )<br>
> <br>
> Hi Sean,<br>
> <br>
> Do you want to give this a spin?<br>
> <br>
> Index: share/zoneinfo/Makefile<br>
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D<wbr>=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D<wbr>=3D=3D=3D=3D=3D=3D=3D<br>
> --- share/zoneinfo/Makefile=C2=A0 =C2=A0 =C2=A0(revision 320389)<br>
> +++ share/zoneinfo/Makefile=C2=A0 =C2=A0 =C2=A0(working copy)<br>
> @@ -94,7 +94,7 @@<br>
> =C2=A0.for f in ${TZS}<br>
> <span class=3D"">=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${INSTALL} ${TAG_ARGS} \<br>
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -o ${BINOWN} -g ${BINGRP} -m ${NO=
> BINMODE} \<br>
> </span>-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${TZBUILDDIR:C,^${.OBJDIR}=
> /,,}<wbr>/${f} ${DESTDIR}/usr/share/zoneinfo/<wbr>${f}<br>
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${TZBUILDDIR}/${f} ${DESTDIR}/usr=
> /share/zoneinfo/<wbr>${f}<br>
> <span class=3D"">=C2=A0.endfor<br>
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP=
> } -m ${NOBINMODE} \<br>
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${CONTRIBDIR}/zone.tab ${DESTDIR}=
> /usr/share/zoneinfo/<br>
> <br>
> </span>~cy<br>
> <br>
> <br>
> In message <<a href=3D"mailto:f6014fd3-9f4b-b6f5-6997-38293f10e25a at freeb=
> sd.org">f6014fd3-9f4b-b6f5-6997-<wbr>38293f10e25a at freebsd.org</a>>, Sean=
> Bruno<br>
> write<br>
> s:<br>
> > This is an OpenPGP/MIME signed message (RFC 4880 and 3156)<br>
> > --<wbr>WTKxh8RiNpWJJ66LumpxWUq5KMtbGf<wbr>m2f<br>
> > Content-Type: multipart/mixed; boundary=3D"<wbr>VFqTarnRbgKj5gwWU=
> LxfLoTjWIwLn2<wbr>loQ";<br>
> >=C2=A0 protected-headers=3D"v1"<br>
> > From: Sean Bruno <<a href=3D"mailto:sbruno at freebsd.org">sbruno at free=
> bsd.org</a>><br>
> > To: Edward Tomasz Napierala <trasz at FreeBSD.org>, <a href=3D"mail=
> to:src-committers at freebsd.org">src-committers at freebsd.org</a>,<br>
> >=C2=A0 <a href=3D"mailto:svn-src-all at freebsd.org">svn-src-all at freebsd.o=
> rg</a>, <a href=3D"mailto:svn-src-head at freebsd.org">svn-src-head at freebsd.or=
> g</a><br>
> > Message-ID: <<a href=3D"mailto:f6014fd3-9f4b-b6f5-6997-38293f10e25a=
> @freebsd.org">f6014fd3-9f4b-b6f5-6997-<wbr>38293f10e25a at freebsd.org</a>>=
> <br>
> > Subject: Re: svn commit: r320362 - head/share/zoneinfo<br>
> > References: <<a href=3D"mailto:201706261540.v5QFeOTj072841 at repo.fre=
> ebsd.org">201706261540.v5QFeOTj072841@<wbr>repo.freebsd.org</a>><br>
> > In-Reply-To: <<a href=3D"mailto:201706261540.v5QFeOTj072841 at repo.fr=
> eebsd.org">201706261540.v5QFeOTj072841@<wbr>repo.freebsd.org</a>><br>
> ><br>
> > --<wbr>VFqTarnRbgKj5gwWULxfLoTjWIwLn2<wbr>loQ<br>
> > Content-Type: text/plain; charset=3Dutf-8<br>
> > Content-Language: en-US<br>
> > Content-Transfer-Encoding: quoted-printable<br>
> ><br>
> > Hmmm ... This seems to break 'poudriere jail -c jailname -m src=3D=
> 3D/usr/sr=3D<br>
> <span class=3D"">> c<br>
> > -v head"<br>
> ><br>
> > --- realinstall_subdir_share/<wbr>zoneinfo ---<br>
> > install: builddir/Africa/Abidjan: No such file or directory<br>
> ><br>
> ><br>
> > On 06/26/17 09:40, Edward Tomasz Napierala wrote:<br>
> > > Author: trasz<br>
> > > Date: Mon Jun 26 15:40:24 2017<br>
> > > New Revision: 320362<br>
> > > URL: <a href=3D"https://svnweb.freebsd.org/changeset/base/320362"=
> rel=3D"noreferrer" target=3D"_blank">https://svnweb.freebsd.org/<wbr>chang=
> eset/base/320362</a><br>
> </span>> >=3D20<br>
> <span class=3D"">> > Log:<br>
> > >=C2=A0 =C2=A0Provide visual feedback when timezone files are insta=
> lled.<br>
> > >=C2=A0 =C2=A0After r320003 it wasn't being shown in any way.<b=
> r>
> </span>> >=C2=A0 =3D20<br>
> <span class=3D"">> >=C2=A0 =C2=A0Submitted by:=C2=A0 =C2=A0 =C2=A0bdr=
> ewery<br>
> > >=C2=A0 =C2=A0MFC after:=C2=A0 =C2=A0 =C2=A0 =C2=A0 1 month<br>
> > >=C2=A0 =C2=A0Differential Revision:=C2=A0 =C2=A0 <a href=3D"https:=
> //reviews.freebsd.org/D11154" rel=3D"noreferrer" target=3D"_blank">https://=
> reviews.freebsd.org/<wbr>D11154</a><br>
> </span>> >=3D20<br>
> > > Modified:<br>
> > >=C2=A0 =C2=A0head/share/zoneinfo/Makefile<br>
> > >=3D20<br>
> > > Modified: head/share/zoneinfo/Makefile<br>
> > > =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D<wbr>3D=3D3D=3D3D=
> =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D<wbr>3D=3D3D=3D3D=3D3D=3D3D=3D<br>
> > =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D<wbr>3D=3D3D=3D3D=3D3D=
> =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D<wbr>3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D<br>
> > =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D<wbr>3D=3D3D=3D3D=3D3D=
> =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D<wbr>3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D<br>
> > =3D3D=3D3D=3D3D=3D3D<br>
> <span class=3D"">> > --- head/share/zoneinfo/Makefile=C2=A0 =C2=A0 Mo=
> n Jun 26 15:23:12 2017=C2=A0 =C2=A0 =C2=A0 =C2=A0 (r32036<br>
> > 1)<br>
> > > +++ head/share/zoneinfo/Makefile=C2=A0 =C2=A0 Mon Jun 26 15:40:24=
> 2017=C2=A0 =C2=A0 =C2=A0 =C2=A0 (r32036<br>
> > 2)<br>
> > > @@ -83,14 +83,19 @@ zoneinfo: yearistype ${TDATA}<br>
> > >=C2=A0 =C2=A0 =C2=A0zic -D -d ${TZBUILDDIR} -p ${POSIXRULES} -m ${=
> NOBINMODE} \<br>
> > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${LEAPFILE} -y ${.OBJDIR}/yearis=
> type ${TZFILES}<br>
> </span>> > =3D20<br>
> > > +.if make(*install*)<br>
> > > +TZS!=3D3D cd ${TZBUILDDIR} && find -s * -type f<br>
> <span class=3D"">> > +.endif<br>
> > > +<br>
> > >=C2=A0 beforeinstall: install-zoneinfo<br>
> > >=C2=A0 install-zoneinfo:<br>
> > >=C2=A0 =C2=A0 =C2=A0mkdir -p ${DESTDIR}/usr/share/zoneinfo<br>
> > >=C2=A0 =C2=A0 =C2=A0cd ${DESTDIR}/usr/share/zoneinfo;=C2=A0 mkdir =
> -p ${TZBUILDSUBDIRS}<br>
> > > -=C2=A0 =C2=A0cd ${TZBUILDDIR} && \<br>
> > > -=C2=A0 =C2=A0 =C2=A0 =C2=A0find -s * -type f -exec ${INSTALL} ${=
> TAG_ARGS} \<br>
> > > +.for f in ${TZS}<br>
> > > +=C2=A0 =C2=A0${INSTALL} ${TAG_ARGS} \<br>
> > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-o ${BINOWN} -g ${BINGRP} -m ${N=
> OBINMODE} \<br>
> > > -=C2=A0 =C2=A0 =C2=A0 =C2=A0\{} ${DESTDIR}/usr/share/zoneinfo/<wb=
> r>\{} \;<br>
> </span>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0${TZBUILDDIR:C,^${.OBJDIR}/,,}=
> <wbr>/${f} ${DESTDIR}/usr/share/zoneinfo=3D<br>
> <span class=3D"">> /${f}<br>
> > > +.endfor<br>
> > >=C2=A0 =C2=A0 =C2=A0${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGR=
> P} -m ${NOBINMODE} \<br>
> > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${CONTRIBDIR}/zone.tab ${DESTDIR=
> }/usr/share/zoneinfo/<br>
> </span>> > =3D20<br>
> > >=3D20<br>
> > >=3D20<br>
> ><br>
> ><br>
> > --<wbr>VFqTarnRbgKj5gwWULxfLoTjWIwLn2<wbr>loQ--<br>
> ><br>
> > --<wbr>WTKxh8RiNpWJJ66LumpxWUq5KMtbGf<wbr>m2f<br>
> > Content-Type: application/pgp-signature; name=3D"signature.asc&qu=
> ot;<br>
> > Content-Description: OpenPGP digital signature<br>
> > Content-Disposition: attachment; filename=3D"signature.asc"<=
> br>
> ><br>
> > -----BEGIN PGP SIGNATURE-----<br>
> ><br>
> > iQGTBAEBCgB9FiEE6MTp+<wbr>IA1BOHj9Lo0veT1/om1/<wbr>LYFAllRUJtfFIAAAAAA=
> LgAo<br>
> > aXNzdWVyLWZwckBub3RhdGlvbnMub3<wbr>BlbnBncC5maWZ0aGhvcnNlbWFuLm5l<wbr>=
> dEU4<br>
> > QzRFOUY4ODAzNTA0RTFFM0Y0QkEzNE<wbr>JERTRGNUZFODlCNUZDQjYACgkQveT1<wbr>=
> /om1<br>
> > /<wbr>LaIFggAlEX4pLTfDUaRsGoxWbGI0Di<wbr>irmhR1nW74ESXjGXd4u9WSYKfvxK+=
> <wbr>oGPJ<br>
> > LRwxcimGw/v+h8piM102ijsmquE0+<wbr>NlyyMAYjFNLb9tsZuR+<wbr>kfzRbDwqiu3F=
> Ng8R<br>
> > zDnsvo69JHiyoi7r9BJB30Q6P9fZDG<wbr>BtCrSQ9Up2IUiPHjz+<wbr>pLUK6jxy29wf=
> lPSr<br>
> > qVDHitG2A7l7Sdn3Jsj8MWNw/<wbr>4ehRNlhxudgg+<wbr>F8v7tEJH9eNBpP6K6jR6B+=
> aU/P<br>
> > VCPrKO1rRmmJTPxxPwskLLX4/<wbr>xXrf8hmUFTm0uBbLtKbvzsaO5IZ9HK<wbr>XJdYF=
> laRo<br>
> > dCw6yY1xFlMv/<wbr>OrUWgSxj02fsd7GHg=3D=3D<br>
> > =3D9Mia<br>
> > -----END PGP SIGNATURE-----<br>
> ><br>
> > --<wbr>WTKxh8RiNpWJJ66LumpxWUq5KMtbGf<wbr>m2f--<br>
> ><br>
> ><br>
> <span class=3D"HOEnZb"><font color=3D"#888888"><br>
> --<br>
> Cheers,<br>
> Cy Schubert <<a href=3D"mailto:Cy.Schubert at cschubert.com">Cy.Schubert at cs=
> chubert.com</a>><br>
> FreeBSD UNIX:=C2=A0 <cy at FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 <a href=
> =3D"http://www.FreeBSD.org" rel=3D"noreferrer" target=3D"_blank">http://www=
> .FreeBSD.org</a><br>
> <br>
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 The need of the many outweighs the greed of the=
> few.<br>
> <br>
> <br>
> </font></span></blockquote></div><br></div></div>
>
> --001a113d0020693f04055304b5a4--
>
--
Cheers,
Cy Schubert <Cy.Schubert at cschubert.com>
FreeBSD UNIX: <cy at FreeBSD.org> Web: http://www.FreeBSD.org
The need of the many outweighs the greed of the few.
More information about the svn-src-all
mailing list