Date: Fri, 21 Mar 2014 20:11:21 +0100 From: Antoine Brodin <antoine@FreeBSD.org> To: Thierry Thomas <thierry@freebsd.org> Cc: freebsd-emulation@freebsd.org Subject: Re: svn commit: r348601 - head/Mk Message-ID: <CAALwa8m%2BAti-%2BRNxok2E9x0HLk7HK7S2JnnRRSwz5dJMjAB_7A@mail.gmail.com> In-Reply-To: <CAALwa8=kYC8YVMjvAw9Hi=zBe%2B_u%2BKcVs3ghfL4-kTYf48Nyag@mail.gmail.com> References: <201403182219.s2IMJ1A3078580@svn.freebsd.org> <CAALwa8=kYC8YVMjvAw9Hi=zBe%2B_u%2BKcVs3ghfL4-kTYf48Nyag@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Fri, Mar 21, 2014 at 6:00 PM, Antoine Brodin <antoine@freebsd.org> wrote: > On Tue, Mar 18, 2014 at 11:19 PM, Thierry Thomas <thierry@freebsd.org> 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 [-- Attachment #2 --] 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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAALwa8m%2BAti-%2BRNxok2E9x0HLk7HK7S2JnnRRSwz5dJMjAB_7A>