Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH vcs-snapshot] Use ${WORKDIR}/${P} rather than ${S} to support ${S} overrides.
Date: Mon, 04 Jun 2012 09:59:00
Message-Id: 1338803954-3814-1-git-send-email-mgorny@gentoo.org
1 One could set S to work on a subtree of the tarball rather than
2 the whole tarball. Considering that, it's probably better to use
3 ${WORKDIR}/${P} rather than ${S}.
4
5 Fixes: https://bugs.gentoo.org/show_bug.cgi?id=419479
6 ---
7 gx86/eclass/vcs-snapshot.eclass | 5 +++--
8 1 file changed, 3 insertions(+), 2 deletions(-)
9
10 diff --git a/gx86/eclass/vcs-snapshot.eclass b/gx86/eclass/vcs-snapshot.eclass
11 index 6748360..23cd696 100644
12 --- a/gx86/eclass/vcs-snapshot.eclass
13 +++ b/gx86/eclass/vcs-snapshot.eclass
14 @@ -9,7 +9,8 @@
15 # @DESCRIPTION:
16 # This eclass provides a convenience src_unpack() which does support
17 # working with snapshots generated by various VCS-es. It unpacks those
18 -# to ${S} rather than the original directory containing commit id.
19 +# to ${WORKDIR}/${P} rather than the original directory containing
20 +# commit id.
21 #
22 # Note that this eclass handles only unpacking. You need to specify
23 # SRC_URI yourself, and call any autoreconfiguration as necessary.
24 @@ -41,5 +42,5 @@ vcs-snapshot_src_unpack() {
25
26 # github, bitbucket: username-projectname-hash
27 # gitweb: projectname-tagname-hash
28 - mv *-*-[0-9a-f]*[0-9a-f]/ "${S}" || die
29 + mv *-*-[0-9a-f]*[0-9a-f]/ "${WORKDIR}"/${P} || die
30 }
31 --
32 1.7.10.2

Replies