From owner-svn-src-head@freebsd.org Sat Mar 16 13:34:23 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EF491152D126; Sat, 16 Mar 2019 13:34:22 +0000 (UTC) (envelope-from ronald-lists@klop.ws) Received: from smarthost1.greenhost.nl (smarthost1.greenhost.nl [195.190.28.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 07BA888CBD; Sat, 16 Mar 2019 13:34:20 +0000 (UTC) (envelope-from ronald-lists@klop.ws) Received: from smtp.greenhost.nl ([213.108.110.112]) by smarthost1.greenhost.nl with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1h59S0-0006Bj-TM; Sat, 16 Mar 2019 14:34:13 +0100 Content-Type: text/plain; charset=utf-8; format=flowed; delsp=yes To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org, "Emmanuel Vadot" Subject: Re: svn commit: r345159 - head References: <201903142208.x2EM8Akf049649@repo.freebsd.org> Date: Sat, 16 Mar 2019 14:34:30 +0100 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: "Ronald Klop" Message-ID: In-Reply-To: <201903142208.x2EM8Akf049649@repo.freebsd.org> User-Agent: Opera Mail/12.16 (FreeBSD) X-Authenticated-As-Hash: 398f5522cb258ce43cb679602f8cfe8b62a256d1 X-Virus-Scanned: by clamav at smarthost1.samage.net X-Spam-Level: / X-Spam-Score: -0.2 X-Spam-Status: No, score=-0.2 required=5.0 tests=ALL_TRUSTED, BAYES_50 autolearn=disabled version=3.4.2 X-Scan-Signature: c09395f469c52153b963e4ff2d10f427 X-Rspamd-Queue-Id: 07BA888CBD X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; spf=pass (mx1.freebsd.org: domain of ronald-lists@klop.ws designates 195.190.28.88 as permitted sender) smtp.mailfrom=ronald-lists@klop.ws X-Spamd-Result: default: False [-2.52 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.93)[-0.927,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:195.190.28.64/27]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[klop.ws]; NEURAL_HAM_LONG(-1.00)[-0.996,0]; TO_DN_SOME(0.00)[]; IP_SCORE(-0.26)[ipnet: 195.190.28.0/24(-0.74), asn: 47172(-0.56), country: NL(0.01)]; MX_GOOD(-0.01)[mx2.greenhost.nl,mx1.greenhost.nl]; NEURAL_HAM_SHORT(-0.53)[-0.525,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MID_RHS_NOT_FQDN(0.50)[]; ASN(0.00)[asn:47172, ipnet:195.190.28.0/24, country:NL]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Mar 2019 13:34:23 -0000 Thanks! A very welcome user friendlyness. On Thu, 14 Mar 2019 23:08:10 +0100, Emmanuel Vadot wrote: > Author: manu > Date: Thu Mar 14 22:08:09 2019 > New Revision: 345159 > URL: https://svnweb.freebsd.org/changeset/base/345159 > > Log: > pkgbase: Use uname as ABI_FILE > uname is always rebuild on FreeBSD so use this as ABI_FILE for pkg when > building pkg for pkgbase. > pkg uses uname too as default ABI_FILE as of commit > d8bbf980b7f6f424fb7cc672c23ab2dfc82b6599 > https://github.com/freebsd/pkg/commit/d8bbf980b7f6f424fb7cc672c23ab2dfc82b6599 > Discussed with: bapt > MFC after: 1 week > > Modified: > head/Makefile.inc1 > > Modified: head/Makefile.inc1 > ============================================================================== > --- head/Makefile.inc1 Thu Mar 14 21:08:48 2019 (r345158) > +++ head/Makefile.inc1 Thu Mar 14 22:08:09 2019 (r345159) > @@ -1864,11 +1864,11 @@ create-world-package-${pkgname}: .PHONY > @if [ "${pkgname}" == "runtime" ]; then \ > sed -i '' -e "s/%VCS_REVISION%/${VCS_REVISION}/" > ${WSTAGEDIR}/${pkgname}.ucl ; \ > fi > - ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \ > + ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname -o > ALLOW_BASE_SHLIBS=yes \ > create -M ${WSTAGEDIR}/${pkgname}.ucl \ > -p ${WSTAGEDIR}/${pkgname}.plist \ > -r ${WSTAGEDIR} \ > - -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config > ABI)/${PKG_VERSION} > + -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname > config ABI)/${PKG_VERSION} > .endfor > _default_flavor= -default > _______________________________________________ > svn-src-all@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"