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 19:30:22
Message-Id: 4FCD0BC8.6050608@gentoo.org
In Reply to: Re: [gentoo-dev] [PATCH vcs-snapshot] Use ${WORKDIR}/${P} rather than ${S} to support ${S} overrides. by "Michał Górny"
1 -----BEGIN PGP SIGNED MESSAGE-----
2 Hash: SHA1
3
4 On 06/04/2012 05:50 PM, Michał Górny wrote:
5 > On Mon, 04 Jun 2012 16:20:02 +0200 hasufell <hasufell@g.o>
6 > wrote:
7 >
8 >> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
9 >>
10 >> On 06/04/2012 11:59 AM, Michał Górny wrote:
11 >>> One could set S to work on a subtree of the tarball rather than
12 >>> the whole tarball. Considering that, it's probably better to
13 >>> use ${WORKDIR}/${P} rather than ${S}.
14 >>>
15 >>> Fixes: https://bugs.gentoo.org/show_bug.cgi?id=419479 ---
16 >>> gx86/eclass/vcs-snapshot.eclass | 5 +++-- 1 file changed, 3
17 >>> insertions(+), 2 deletions(-)
18 >>>
19 >>> diff --git a/gx86/eclass/vcs-snapshot.eclass
20 >>> b/gx86/eclass/vcs-snapshot.eclass index 6748360..23cd696 100644
21 >>> --- a/gx86/eclass/vcs-snapshot.eclass +++
22 >>> b/gx86/eclass/vcs-snapshot.eclass @@ -9,7 +9,8 @@ #
23 >>> @DESCRIPTION: # This eclass provides a convenience src_unpack()
24 >>> which does support # working with snapshots generated by
25 >>> various VCS-es. It unpacks those -# to ${S} rather than the
26 >>> original directory containing commit id. +# to ${WORKDIR}/${P}
27 >>> rather than the original directory containing +# commit id. # #
28 >>> Note that this eclass handles only unpacking. You need to
29 >>> specify # SRC_URI yourself, and call any autoreconfiguration as
30 >>> necessary. @@ -41,5 +42,5 @@ vcs-snapshot_src_unpack() {
31 >>>
32 >>> # github, bitbucket: username-projectname-hash # gitweb:
33 >>> projectname-tagname-hash - mv *-*-[0-9a-f]*[0-9a-f]/ "${S}" ||
34 >>> die + mv *-*-[0-9a-f]*[0-9a-f]/ "${WORKDIR}"/${P} || die }
35 >>
36 >> Currently that eclass does not support multiple snapshot
37 >> sources/tarballs.
38 >
39 > Use case?
40 >
41
42 ANY case where I need more than one tarball/source. There are just not
43 many because this eclass is widely unknown.
44
45 But minetest in sunrise for example which has two different repos, one
46 for the engine, one for the data. It's currently split in two, but I
47 guess I will merge those soon.
48
49 Lately there was an ebuild proposal in sunrise too which had that
50 issue, see here https://gist.github.com/2829184
51
52 It would also enable me to use gtk-youtube-viewer and youtube-viewer
53 in one ebuild with vcs-snapshot eclass while adding a gtk useflag
54 (currently split too).
55 Otherwise I will have to fix it on my own again.
56
57 I am pretty sure it will get more in the future when people start to
58 use this eclass or it will just prevent them from using it.
59
60 I find the logic very clear:
61
62 SRC="https://my/github/shit -> ${P}.tar.gz"
63 results in ${WORKDIR}/${P}
64 and
65 SRC="https://my/github/shit -> ${P}-src.tar.gz"
66 results in ${WORKDIR}/${P}-src
67 -----BEGIN PGP SIGNATURE-----
68 Version: GnuPG v2.0.19 (GNU/Linux)
69 Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
70
71 iQEcBAEBAgAGBQJPzQvIAAoJEFpvPKfnPDWzOikH/0R35jeWyWj1j7RNxQ9Rbpt6
72 JPSBmNx2ZOdFDF8jIqbOERwFwSe87mLitOrZafCxNL4eNZmhP4lXTcVny574CxuS
73 DE6k5n7k265eYzZm4A/1CjdKp4ptTzpGVil4/iVObFaz3B7tS5PCvqzySWc/ZO/7
74 040x2d4g94nqkcMM130ua970pbgO7MWZsVsBH3mnLE4AGCZY4vtRlH9dMOHbcAgG
75 46Vuu9/m4BfGadfGqNVTZz7KbxDBt5h3vOHZZe6JEf3smMr9GiK/gcIc4l97faN7
76 B601V8kIBWQhPENgeh+SZsMpx24E8DIMvLA7ltMLF8/WLULQBxzW3xR4/CxoNOk=
77 =aaKu
78 -----END PGP SIGNATURE-----

Replies