Date: Mon, 24 Mar 2014 21:45:23 +0100 From: Antoine Brodin <antoine@FreeBSD.org> To: Antoine Brodin <antoine@freebsd.org>, freebsd-emulation@freebsd.org Subject: Re: svn commit: r348601 - head/Mk Message-ID: <CAALwa8=K0cHkAFz9uAYM7F2UOHuS8s40mgWgTPDgvmfLm4SWFw@mail.gmail.com> In-Reply-To: <20140324203827.GC32368@graf.pompo.net> References: <201403182219.s2IMJ1A3078580@svn.freebsd.org> <CAALwa8=kYC8YVMjvAw9Hi=zBe%2B_u%2BKcVs3ghfL4-kTYf48Nyag@mail.gmail.com> <CAALwa8m%2BAti-%2BRNxok2E9x0HLk7HK7S2JnnRRSwz5dJMjAB_7A@mail.gmail.com> <20140324203827.GC32368@graf.pompo.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Mar 24, 2014 at 9:38 PM, Thierry Thomas <thierry@freebsd.org> wrote=
:
> Le ven 21 mar 14 =E0 20:11:21 +0100, Antoine Brodin <antoine@FreeBSD.org>
> =E9crivait :
>
>> > Hi,
>
> Hello,
>
>> > 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
>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
>> --- Mk/bsd.linux-rpm.mk (revision 348741)
>> +++ Mk/bsd.linux-rpm.mk (working copy)
>> @@ -95,9 +95,9 @@
>> # is not true.
>>
>> DISTFILES?=3D ${DISTNAME}${EXTRACT_SUFX}
>> -BIN_DISTFILES:=3D ${_DISTFILES}
>> +BIN_DISTFILES:=3D ${DISTFILES}
>> SRC_DISTFILES?=3D ${DISTNAME}${SRC_SUFX}
>> -EXTRACT_ONLY?=3D ${BIN_DISTFILES}
>> +EXTRACT_ONLY?=3D ${BIN_DISTFILES:C/:[^:]+$//}
>>
>> . if defined(PACKAGE_BUILDING)
>> DISTFILES+=3D ${SRC_DISTFILES}
>>
>>
>> Cheers,
>
> After applying your patch, I cannot see any differences:
>
> cd /usr/ports/emulators/linux_base-f10
> make extract -DPACKAGE_BUILDING
> =3D=3D=3D> linux_base-f10-10_7 depends on file: /usr/local/sbin/pkg - f=
ound
> =3D=3D=3D> Fetching all distfiles required by linux_base-f10-10_7 for bui=
lding
> =3D=3D=3D> Extracting for linux_base-f10-10_7
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/basesystem-10.0-1.noarch.r=
pm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/bash-3.2-30.fc10.i386.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/bzip2-1.0.5-3.fc10.i386.rp=
m.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/bzip2-libs-1.0.5-3.fc10.i3=
86.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/compat-db-4.6.21-5.fc10.i3=
86.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/compat-libstdc++-296-2.96-=
141.i386.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/compat-libstdc++-33-3.2.3-=
64.i386.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/coreutils-6.12-20.fc10.i38=
6.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/db4-4.7.25-7.fc10.i386.rpm=
.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/e2fsprogs-1.41.4-6.fc10.i3=
86.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/e2fsprogs-libs-1.41.4-6.fc=
10.i386.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/elfutils-0.142-1.fc10.i386=
.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/fedora-release-10-1.noarch=
.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/filesystem-2.4.19-1.fc10.i=
386.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/freetype-2.3.7-3.fc10.i386=
.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/gamin-0.1.9-6.fc10.i386.rp=
m.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/gdbm-1.8.0-29.fc10.i386.rp=
m.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/glib-1.2.10-32.fc10.i386.r=
pm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/glib2-2.18.4-2.fc10.i386.r=
pm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/glibc-2.9-3.i386.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/glibc-common-2.9-3.i386.rp=
m.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/grep-2.5.1a-61.fc10.i386.r=
pm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/info-4.12-4.fc10.i386.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/keyutils-libs-1.2-3.fc9.i3=
86.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/krb5-libs-1.6.3-18.fc10.i3=
86.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/libacl-2.2.47-3.fc10.i386.=
rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/libattr-2.4.43-2.fc10.i386=
.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/libcap-2.10-2.fc10.i386.rp=
m.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/libgcc-4.3.2-7.i386.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/libidn-0.6.14-8.i386.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/libselinux-2.0.78-1.fc10.i=
386.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/libsepol-2.0.33-1.fc10.i38=
6.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/libstdc++-4.3.2-7.i386.rpm=
.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/ncurses-5.6-20.20080927.fc=
10.i386.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/ncurses-libs-5.6-20.200809=
27.fc10.i386.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/pcre-7.8-1.fc10.i386.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/popt-1.13-4.fc10.i386.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/readline-5.2-13.fc9.i386.r=
pm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/setserial-2.17-22.fc9.i386=
.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/setup-2.7.4-4.fc10.noarch.=
rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/slang-2.1.4-1.fc10.i386.rp=
m.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/zlib-1.2.3-18.fc9.i386.rpm=
.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/acl-2.2.47-3.fc10.src.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/attr-2.4.43-1.fc10.src.rpm=
.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/basesystem-10.0-1.src.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/bash-3.2-29.fc10.src.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/bzip2-1.0.5-3.fc10.src.rpm=
.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/compat-db-4.6.21-5.fc10.sr=
c.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/coreutils-6.12-17.fc10.src=
.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/db4-4.7.25-5.fc10.src.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/e2fsprogs-1.41.4-6.fc10.sr=
c.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/elfutils-0.142-1.fc10.src.=
rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/fedora-release-10-1.src.rp=
m.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/filesystem-2.4.19-1.fc10.s=
rc.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/freetype-2.3.7-1.fc10.src.=
rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/gamin-0.1.9-6.fc10.src.rpm=
.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/gcc-4.3.2-7.src.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/gdbm-1.8.0-29.fc10.src.rpm=
.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/glib-1.2.10-32.fc10.src.rp=
m.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/glib2-2.18.2-3.fc10.src.rp=
m.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/glibc-2.9-2.src.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/grep-2.5.1a-61.fc10.src.rp=
m.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/keyutils-1.2-3.fc9.src.rpm=
.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/krb5-1.6.3-16.fc10.src.rpm=
.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/libcap-2.10-2.fc10.src.rpm=
.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/libidn-0.6.14-8.src.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/libselinux-2.0.73-1.fc10.s=
rc.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/libsepol-2.0.33-1.fc10.src=
.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/ncurses-5.6-20.20080927.fc=
10.src.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/pcre-7.8-1.fc10.src.rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/readline-5.2-13.fc9.src.rp=
m.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/setserial-2.17-22.fc9.src.=
rpm.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/setup-2.7.4-1.fc10.src.rpm=
.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/slang-2.1.4-1.fc10.src.rpm=
.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/texinfo-4.12-4.fc10.src.rp=
m.
> =3D> SHA256 Checksum OK for rpm/i386/fedora/10/zlib-1.2.3-18.fc9.src.rpm.
>
> Same results for devel/linux-f10-devtools.
>
> I'm looking for another solution.
Hi,
Yes it checksums all of them... but only extracts the non src ones ;-)
Cheers,
Antoine
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAALwa8=K0cHkAFz9uAYM7F2UOHuS8s40mgWgTPDgvmfLm4SWFw>