From owner-svn-src-all@freebsd.org Thu Jun 16 07:47:23 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4FC3CA473D9 for ; Thu, 16 Jun 2016 07:47:23 +0000 (UTC) (envelope-from se@freebsd.org) Received: from mailout12.t-online.de (mailout12.t-online.de [194.25.134.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mailout00.t-online.de", Issuer "TeleSec ServerPass DE-2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B6C41174A; Thu, 16 Jun 2016 07:47:22 +0000 (UTC) (envelope-from se@freebsd.org) Received: from fwd25.aul.t-online.de (fwd25.aul.t-online.de [172.20.26.130]) by mailout12.t-online.de (Postfix) with SMTP id 3604941F0C0B; Thu, 16 Jun 2016 09:40:43 +0200 (CEST) Received: from [192.168.119.34] (TEQcxUZVoh1ouvJW-EJfgC3fpFtoBLYQr7JjamnXnCk9bAuFPYv+PYlHtfyM2qWZtp@[84.154.107.192]) by fwd25.t-online.de with (TLSv1.2:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1bDRuq-0izQ7E0; Thu, 16 Jun 2016 09:40:40 +0200 Subject: Re: svn commit: r301944 - head/share/zoneinfo To: svn-src-all@freebsd.org References: <201606160300.u5G30AQ8042969@repo.freebsd.org> From: Stefan Esser Message-ID: Date: Thu, 16 Jun 2016 09:40:32 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.1.1 MIME-Version: 1.0 In-Reply-To: <201606160300.u5G30AQ8042969@repo.freebsd.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-ID: TEQcxUZVoh1ouvJW-EJfgC3fpFtoBLYQr7JjamnXnCk9bAuFPYv+PYlHtfyM2qWZtp X-TOI-MSGID: 46e23570-0758-4879-a668-8b7c9e5cbcb7 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jun 2016 07:47:23 -0000 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