Gentoo Archives: gentoo-dev

From: hasufell <hasufell@g.o>
To: gentoo-dev@l.g.o
Subject: Re: [gentoo-dev] [PATCH vcs-snapshot] Use ${WORKDIR}/${P} rather than ${S} to support ${S} overrides.
Date: Mon, 04 Jun 2012 14:24:02
Message-Id: 4FCCC412.6000000@gentoo.org
In Reply to: [gentoo-dev] [PATCH vcs-snapshot] Use ${WORKDIR}/${P} rather than ${S} to support ${S} overrides. by "Michał Górny"
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 06/04/2012 11:59 AM, Michał Górny wrote:
> One could set S to work on a subtree of the tarball rather than the > whole tarball. Considering that, it's probably better to use > ${WORKDIR}/${P} rather than ${S}. > > Fixes: https://bugs.gentoo.org/show_bug.cgi?id=419479 --- > gx86/eclass/vcs-snapshot.eclass | 5 +++-- 1 file changed, 3 > insertions(+), 2 deletions(-) > > diff --git a/gx86/eclass/vcs-snapshot.eclass > b/gx86/eclass/vcs-snapshot.eclass index 6748360..23cd696 100644 --- > a/gx86/eclass/vcs-snapshot.eclass +++ > b/gx86/eclass/vcs-snapshot.eclass @@ -9,7 +9,8 @@ # @DESCRIPTION: # > This eclass provides a convenience src_unpack() which does support > # working with snapshots generated by various VCS-es. It unpacks > those -# to ${S} rather than the original directory containing > commit id. +# to ${WORKDIR}/${P} rather than the original directory > containing +# commit id. # # Note that this eclass handles only > unpacking. You need to specify # SRC_URI yourself, and call any > autoreconfiguration as necessary. @@ -41,5 +42,5 @@ > vcs-snapshot_src_unpack() { > > # github, bitbucket: username-projectname-hash # gitweb: > projectname-tagname-hash - mv *-*-[0-9a-f]*[0-9a-f]/ "${S}" || die > + mv *-*-[0-9a-f]*[0-9a-f]/ "${WORKDIR}"/${P} || die }
Currently that eclass does not support multiple snapshot sources/tarballs. I would suggest to fix that. My proposal currently breaks 6 ebuilds which do not follow the newly described standard. This way you could merge data and source snapshots from vcs. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQEcBAEBAgAGBQJPzMQSAAoJEFpvPKfnPDWzJdMH/AuhgbDeVdnJViP+zZNjsq4B C2FlaPCpl3HHTrMi7HhbFmbOnZeLA3VLaffdvaPvZU0O1RxhOQPNfp4t8/E2iuHF q9vVwQFQe19izFa7EgapD2EOUVUeaNMGoX0K2qRgtfLeBwnLWsnagMYZkV2+5skA 84vnyRYtaDEx6Z+M0UipwFnubrgmItbvX7F3XZ3omCdlSjXaRDO0sc2hqMFjeZ5P ESGfbWxFX59ztmxBni0iSJE3NdSiYr1mjuW6eFZazIq9T6cinByXfMJgbdz7N14e 8HaSxMTc6PVWUTVbmpj3POWnZ+KCHbFze39rO5HzY4ZPMIL4xTxXAppg2FnyhF4= =KUJi -----END PGP SIGNATURE-----

Attachments

File name MIME type
vcs-snapshot.eclass.diff text/x-patch
vcs-snapshot.eclass text/plain

Replies