From owner-freebsd-emulation@FreeBSD.ORG Fri Mar 21 19:11:23 2014 Return-Path: Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 09B6BCEA; Fri, 21 Mar 2014 19:11:23 +0000 (UTC) Received: from mail-yk0-x22e.google.com (mail-yk0-x22e.google.com [IPv6:2607:f8b0:4002:c07::22e]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B10BB3EF; Fri, 21 Mar 2014 19:11:22 +0000 (UTC) Received: by mail-yk0-f174.google.com with SMTP id 20so7338560yks.5 for ; Fri, 21 Mar 2014 12:11:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=IOpvsrytdl7K56Unmq9nk0bYc8ZmxKqstxPsZ6Aa/ZE=; b=Hd/IHV6gMLE3QmiM80YHtzLhLZTKdpa367PRwUux77909O1Zs/mSHBKcyEoA5rSN0a x9SrQr3BgNNplf6oHlQtCqhFFMqdReg2nIJ7TLg6xt2u7ao60Lxf425eZtmiJoOO1FYU q5UaDulrkvizEghtJhLwdcdW7N/77dZWp8NsjqmRIPKLoOWVNtbYBnpOAxz3rFXDRU46 LlrO29Lg9X6tifnDwqjriV0JjGJnBJ8TUctUYaR4vFE14a8rUrVEVnrC0jEgDIh1/wia ztDxd56Ux8fFV48IZN7X4gpCuW95Q810Ivh3Ux0V1c74VLFEa+L+ztZb2K4uJyepva68 2jKw== MIME-Version: 1.0 X-Received: by 10.236.94.197 with SMTP id n45mr43932560yhf.46.1395429081797; Fri, 21 Mar 2014 12:11:21 -0700 (PDT) Sender: antoine.brodin.freebsd@gmail.com Received: by 10.170.80.11 with HTTP; Fri, 21 Mar 2014 12:11:21 -0700 (PDT) In-Reply-To: References: <201403182219.s2IMJ1A3078580@svn.freebsd.org> Date: Fri, 21 Mar 2014 20:11:21 +0100 X-Google-Sender-Auth: haaMjDwQ_7CBsCTuqBcgyhj31M8 Message-ID: Subject: Re: svn commit: r348601 - head/Mk From: Antoine Brodin To: Thierry Thomas Content-Type: multipart/mixed; boundary=20cf301af897bae78504f522a681 Cc: freebsd-emulation@freebsd.org X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Mar 2014 19:11:23 -0000 --20cf301af897bae78504f522a681 Content-Type: text/plain; charset=ISO-8859-1 On Fri, Mar 21, 2014 at 6:00 PM, Antoine Brodin wrote: > On Tue, Mar 18, 2014 at 11:19 PM, Thierry Thomas wrote: >> Author: thierry >> Date: Tue Mar 18 22:19:01 2014 >> New Revision: 348601 >> URL: http://svnweb.freebsd.org/changeset/ports/348601 >> QAT: https://qat.redports.org/buildarchive/r348601/ >> >> Log: >> Let the linux rpm ports use grouping rules, e.g. to download the >> binaries and the sources from differents MASTER_SITES. >> >> PR: ports/186702 >> Approved by: netchild >> >> Modified: >> head/Mk/bsd.linux-rpm.mk >> >> Modified: head/Mk/bsd.linux-rpm.mk >> ============================================================================== >> --- head/Mk/bsd.linux-rpm.mk Tue Mar 18 21:53:40 2014 (r348600) >> +++ head/Mk/bsd.linux-rpm.mk Tue Mar 18 22:19:01 2014 (r348601) >> @@ -95,7 +95,7 @@ PKGNAMEPREFIX?= linux- >> # is not true. >> >> DISTFILES?= ${DISTNAME}${EXTRACT_SUFX} >> -BIN_DISTFILES:= ${DISTFILES} >> +BIN_DISTFILES:= ${_DISTFILES} >> SRC_DISTFILES?= ${DISTNAME}${SRC_SUFX} >> EXTRACT_ONLY?= ${BIN_DISTFILES} > > > Hi, > > This commit has bad side effects, now both the .rpm and the .src.rpm > are extracted on the package builders: > > textproc/linux-f10-expat % make -VEXTRACT_ONLY -DPACKAGE_BUILDING > expat-2.0.1-5.i386.rpm expat-2.0.1-5.src.rpm Please try attached patch. Index: Mk/bsd.linux-rpm.mk =================================================================== --- Mk/bsd.linux-rpm.mk (revision 348741) +++ Mk/bsd.linux-rpm.mk (working copy) @@ -95,9 +95,9 @@ # is not true. DISTFILES?= ${DISTNAME}${EXTRACT_SUFX} -BIN_DISTFILES:= ${_DISTFILES} +BIN_DISTFILES:= ${DISTFILES} SRC_DISTFILES?= ${DISTNAME}${SRC_SUFX} -EXTRACT_ONLY?= ${BIN_DISTFILES} +EXTRACT_ONLY?= ${BIN_DISTFILES:C/:[^:]+$//} . if defined(PACKAGE_BUILDING) DISTFILES+= ${SRC_DISTFILES} Cheers, Antoine --20cf301af897bae78504f522a681 Content-Type: text/plain; charset=US-ASCII; name="rpm-grouping.diff" Content-Disposition: attachment; filename="rpm-grouping.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_ht1ue3by0 SW5kZXg6IE1rL2JzZC5saW51eC1ycG0ubWsKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTWsvYnNkLmxpbnV4LXJw bS5tawkocmV2aXNpb24gMzQ4NzQxKQorKysgTWsvYnNkLmxpbnV4LXJwbS5tawkod29ya2luZyBj b3B5KQpAQCAtOTUsOSArOTUsOSBAQAogIyBpcyBub3QgdHJ1ZS4KIAogRElTVEZJTEVTPz0JCSR7 RElTVE5BTUV9JHtFWFRSQUNUX1NVRlh9Ci1CSU5fRElTVEZJTEVTOj0JCSR7X0RJU1RGSUxFU30K K0JJTl9ESVNURklMRVM6PQkJJHtESVNURklMRVN9CiBTUkNfRElTVEZJTEVTPz0JCSR7RElTVE5B TUV9JHtTUkNfU1VGWH0KLUVYVFJBQ1RfT05MWT89CQkke0JJTl9ESVNURklMRVN9CitFWFRSQUNU X09OTFk/PQkJJHtCSU5fRElTVEZJTEVTOkMvOlteOl0rJC8vfQogCiAuICBpZiBkZWZpbmVkKFBB Q0tBR0VfQlVJTERJTkcpCiBESVNURklMRVMrPQkJJHtTUkNfRElTVEZJTEVTfQo= --20cf301af897bae78504f522a681--