Date: Thu, 16 Jun 2016 09:40:32 +0200 From: Stefan Esser <se@freebsd.org> To: svn-src-all@freebsd.org Subject: Re: svn commit: r301944 - head/share/zoneinfo Message-ID: <a42cdb4f-2ad5-ecad-e44b-7e9ad6115d1d@freebsd.org> In-Reply-To: <201606160300.u5G30AQ8042969@repo.freebsd.org> References: <201606160300.u5G30AQ8042969@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Am 16.06.2016 um 05:00 schrieb Glen Barber: > Author: gjb > Date: Thu Jun 16 03:00:10 2016 > New Revision: 301944 > URL: https://svnweb.freebsd.org/changeset/base/301944 > > Log: > Fix zoneinfo file packaging. > > This change fixes 468 of 488 zoneinfo file packaging issues, > the rest still to be investigated. > > Approved by: re (blanket, pkgbase) > Sponsored by: The FreeBSD Foundation > > Modified: > head/share/zoneinfo/Makefile > > Modified: head/share/zoneinfo/Makefile > ============================================================================== > --- head/share/zoneinfo/Makefile Thu Jun 16 02:48:18 2016 (r301943) > +++ head/share/zoneinfo/Makefile Thu Jun 16 03:00:10 2016 (r301944) > @@ -82,10 +82,10 @@ zoneinfo: yearistype ${TDATA} > beforeinstall: install-zoneinfo > install-zoneinfo: > cd ${TZBUILDDIR} && \ > - find -s * -type f -print -exec ${INSTALL} \ > + find -s * -type f -print -exec ${INSTALL} -T ${TAGS} \ > -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ > \{} ${DESTDIR}/usr/share/zoneinfo/\{} \; > - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ > + ${INSTALL} -T ${TAGS} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ > ${CONTRIBDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/ This change breaks installworld for me. ${TAGS} is empty and makes ${INSTALL} fail: ===> share/zoneinfo (install) cd /usr/obj/usr/svn/base/head/share/zoneinfo/builddir && find -s * -type f -print -exec install -T -o root -g wheel -m 444 \{} //usr/share/zoneinfo/\{} \; Africa/Abidjan install: target `//usr/share/zoneinfo/Africa/Abidjan' is not a directory usage: install [-bCcpSsUv] [-f flags] [-g group] [-m mode] [-o owner] [-M log] [-D dest] [-h hash] [-T tags] [-B suffix] [-l linkflags] [-N dbdir] file1 file2 install [-bCcpSsUv] [-f flags] [-g group] [-m mode] [-o owner] [-M log] [-D dest] [-h hash] [-T tags] [-B suffix] [-l linkflags] [-N dbdir] file1 ... fileN directory install -dU [-vU] [-g group] [-m mode] [-N dbdir] [-o owner] [-M log] [-D dest] [-h hash] [-T tags] directory ... ... A simple work-around might be double quotes around ${TAGS} which makes ${INSTALL} happy - it accepts the empty string as parameter for -T without complaints. Regards, STefan
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?a42cdb4f-2ad5-ecad-e44b-7e9ad6115d1d>