Date: Wed, 28 Jun 2017 13:56:11 +0100 From: Edward Napierala <trasz@freebsd.org> To: Cy Schubert <Cy.Schubert@komquats.com> Cc: Sean Bruno <sbruno@freebsd.org>, "src-committers@freebsd.org" <src-committers@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "svn-src-head@freebsd.org" <svn-src-head@freebsd.org> Subject: Re: svn commit: r320362 - head/share/zoneinfo Message-ID: <CAFLM3-rTjsQmMrDWSPPNpTqvnt3p33sOsmwmKFM7ngEqiW86_g@mail.gmail.com> In-Reply-To: <201706270348.v5R3mvkV076055@slippy.cwsent.com> References: <sbruno@freebsd.org> <f6014fd3-9f4b-b6f5-6997-38293f10e25a@freebsd.org> <201706270348.v5R3mvkV076055@slippy.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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@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@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@freebsd.org>
> > To: Edward Tomasz Napierala <trasz@FreeBSD.org>,
> src-committers@freebsd.org,
> > svn-src-all@freebsd.org, svn-src-head@freebsd.org
> > Message-ID: <f6014fd3-9f4b-b6f5-6997-38293f10e25a@freebsd.org>
> > Subject: Re: svn commit: r320362 - head/share/zoneinfo
> > References: <201706261540.v5QFeOTj072841@repo.freebsd.org>
> > In-Reply-To: <201706261540.v5QFeOTj072841@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@cschubert.com>
> FreeBSD UNIX: <cy@FreeBSD.org> Web: http://www.FreeBSD.org
>
> The need of the many outweighs the greed of the few.
>
>
>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFLM3-rTjsQmMrDWSPPNpTqvnt3p33sOsmwmKFM7ngEqiW86_g>