From owner-freebsd-emulation@FreeBSD.ORG Wed Feb 12 20:15:34 2014 Return-Path: Delivered-To: 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 3B822517; Wed, 12 Feb 2014 20:15:34 +0000 (UTC) Received: from mx1a.lautre.net (eyra.lautre.net [80.67.160.71]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B57901901; Wed, 12 Feb 2014 20:15:32 +0000 (UTC) Received: from graf.pompo.net (unknown [78.225.128.39]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: thierry@pompo.net) by mx1a.lautre.net (Postfix) with ESMTPSA id C29DD40DF6; Wed, 12 Feb 2014 21:15:25 +0100 (CET) Received: by graf.pompo.net (Postfix, from userid 1001) id 8192371E4AF; Wed, 12 Feb 2014 21:15:24 +0100 (CET) To: FreeBSD-gnats-submit@freebsd.org Subject: Mk/bsd.linux-rpm.mk does not allow grouping rules (:something) From: Thierry Thomas X-send-pr-version: 3.114 X-GNATS-Notify: Message-Id: <20140212201524.8192371E4AF@graf.pompo.net> Date: Wed, 12 Feb 2014 21:15:24 +0100 (CET) Cc: emulation@FreeBSD.org X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: Thierry Thomas List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Feb 2014 20:15:34 -0000 >Submitter-Id: current-users >Originator: Thierry Thomas >Organization: Kabbale Eros >Confidential: no >Synopsis: Mk/bsd.linux-rpm.mk does not allow grouping rules (:something) >Severity: non-critical >Priority: medium >Category: ports >Class: change-request >Release: FreeBSD 10.0-STABLE amd64 >Environment: System: FreeBSD graf.pompo.net 10.0-STABLE FreeBSD 10.0-STABLE #0 r261650: Sun Feb 9 17:56:57 CET 2014 thierry@graf.pompo.net:/usr/obj/usr/src/sys/GRAF140209 amd64 >Description: If a Linux port has many distfiles, and then many src rpm, with different MASTER_SITES for sources and binaries, the port tries to download each src rpm from each master sites for binaries, without success untill it reaches the src master sites. To speed up this step, it would be useful to allow grouping rules, by suffixing e.g. :bin to the binaries MASTER_SITES and the binaries DISTFILES, and :src for the sources. This works fine untill `make checksum', but unfirtunately it fails during do-extract, because the :group is not removed. >How-To-Repeat: As an example, try the port devel/linux-f10-devtoolsa with the hereunder patch: --- Makefile+group_rules.diff begins here --- --- devel/linux-f10-devtools/Makefile.orig 2014-02-12 20:53:43.000000000 +0100 +++ devel/linux-f10-devtools/Makefile 2014-02-12 20:22:35.000000000 +0100 @@ -4,30 +4,30 @@ PORTNAME= devtools PORTVERSION= 10 CATEGORIES= devel -MASTER_SITES= http://archives.fedoraproject.org/pub/archive/fedora/linux/updates/${PORTVERSION}/${LINUX_RPM_ARCH}/ \ - http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/${PORTVERSION}/Fedora/${LINUX_RPM_ARCH}/os/Packages/ +MASTER_SITES= http://archives.fedoraproject.org/pub/archive/fedora/linux/updates/${PORTVERSION}/${LINUX_RPM_ARCH}/:bin \ + http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/${PORTVERSION}/Fedora/${LINUX_RPM_ARCH}/os/Packages/:bin PKGNAMEPREFIX= linux-f10- -DISTFILES= binutils-2.18.50.0.9-8.fc10.${LINUX_RPM_ARCH}.rpm \ - binutils-devel-2.18.50.0.9-8.fc10.${LINUX_RPM_ARCH}.rpm \ - glibc-devel-2.9-3.${LINUX_RPM_ARCH}.rpm \ - glibc-headers-2.9-3.${LINUX_RPM_ARCH}.rpm \ - gmp-4.2.2-8.fc10.${LINUX_RPM_ARCH}.rpm \ - kernel-headers-2.6.27.41-170.2.117.fc10.${LINUX_RPM_ARCH}.rpm \ - mpfr-2.3.2-1.fc10.${LINUX_RPM_ARCH}.rpm \ - cpp-4.3.2-7.${LINUX_RPM_ARCH}.rpm \ - gcc-4.3.2-7.${LINUX_RPM_ARCH}.rpm \ - gcc-c++-4.3.2-7.${LINUX_RPM_ARCH}.rpm \ - gcc-gfortran-4.3.2-7.${LINUX_RPM_ARCH}.rpm +DISTFILES= binutils-2.18.50.0.9-8.fc10.${LINUX_RPM_ARCH}.rpm:bin \ + binutils-devel-2.18.50.0.9-8.fc10.${LINUX_RPM_ARCH}.rpm:bin \ + glibc-devel-2.9-3.${LINUX_RPM_ARCH}.rpm:bin \ + glibc-headers-2.9-3.${LINUX_RPM_ARCH}.rpm:bin \ + gmp-4.2.2-8.fc10.${LINUX_RPM_ARCH}.rpm:bin \ + kernel-headers-2.6.27.41-170.2.117.fc10.${LINUX_RPM_ARCH}.rpm:bin \ + mpfr-2.3.2-1.fc10.${LINUX_RPM_ARCH}.rpm:bin \ + cpp-4.3.2-7.${LINUX_RPM_ARCH}.rpm:bin \ + gcc-4.3.2-7.${LINUX_RPM_ARCH}.rpm:bin \ + gcc-c++-4.3.2-7.${LINUX_RPM_ARCH}.rpm:bin \ + gcc-gfortran-4.3.2-7.${LINUX_RPM_ARCH}.rpm:bin .if defined(PACKAGE_BUILDING) -MASTER_SITES+= http://archives.fedoraproject.org/pub/archive/fedora/linux/updates/${PORTVERSION}/SRPMS/ \ - http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/${PORTVERSION}/Fedora/source/SRPMS/ -SRC_DISTFILES= binutils-2.18.50.0.9-8.fc10.src.rpm \ - glibc-2.9-3.src.rpm \ - gmp-4.2.2-8.fc10.src.rpm \ - kernel-2.6.27.5-117.fc10.src.rpm \ - mpfr-2.3.2-1.fc10.src.rpm \ - gcc-4.3.2-7.src.rpm +MASTER_SITES+= http://archives.fedoraproject.org/pub/archive/fedora/linux/updates/${PORTVERSION}/SRPMS/:src \ + http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/${PORTVERSION}/Fedora/source/SRPMS/:src +SRC_DISTFILES= binutils-2.18.50.0.9-8.fc10.src.rpm:src \ + glibc-2.9-3.src.rpm:src \ + gmp-4.2.2-8.fc10.src.rpm:src \ + kernel-2.6.27.5-117.fc10.src.rpm:src \ + mpfr-2.3.2-1.fc10.src.rpm:src \ + gcc-4.3.2-7.src.rpm:src .endif MAINTAINER= jwbacon@tds.net --- Makefile+group_rules.diff ends here --- >Fix: Please apply this patch: --- bsd.linux-rpm.mk.diff begins here --- --- Mk/bsd.linux-rpm.mk.orig 2014-01-21 21:18:37.000000000 +0100 +++ Mk/bsd.linux-rpm.mk 2014-02-12 21:03:50.000000000 +0100 @@ -95,7 +95,7 @@ # is not true. DISTFILES?= ${DISTNAME}${EXTRACT_SUFX} -BIN_DISTFILES:= ${DISTFILES} +BIN_DISTFILES:= ${_DISTFILES} SRC_DISTFILES?= ${DISTNAME}${SRC_SUFX} EXTRACT_ONLY?= ${BIN_DISTFILES} --- bsd.linux-rpm.mk.diff ends here ---