1 |
On Sun, Feb 27, 2022 at 12:46:00AM -0500, Ionen Wolkens wrote: |
2 |
> On Sat, Feb 26, 2022 at 10:38:33PM -0600, William Hubbs wrote: |
3 |
> > diff --git a/eclass/go-module.eclass b/eclass/go-module.eclass |
4 |
> > index 66fe52c9ad7..b9686ad555a 100644 |
5 |
> > --- a/eclass/go-module.eclass |
6 |
> > +++ b/eclass/go-module.eclass |
7 |
> > @@ -25,9 +25,26 @@ |
8 |
> > # |
9 |
> > # If the software has a directory named vendor in its |
10 |
> > # top level directory, the only thing you need to do is inherit the |
11 |
> > -# eclass. Otherwise, you need to also populate |
12 |
> > -# EGO_SUM and call go-module_set_globals as discussed below. |
13 |
> > +# eclass. If it doesn't, you need to also create a vendor tarball and |
14 |
> |
15 |
> Unnecessary double space. |
16 |
> |
17 |
> > +# host it somewhere, for example in your dev space. |
18 |
> > # |
19 |
> > +# Here are the commands to create a vendor tarball. |
20 |
> > +# |
21 |
> > +# @CODE |
22 |
> > +# |
23 |
> > +# $ cd /path/to/project |
24 |
> > +# $ go mod vendor |
25 |
> > +# $ tar -acf project-1.0-vendor.tar.xz vendor --xform 's:^":project-1.0/:' |
26 |
> |
27 |
> Typo, that " doesn't exist at start of paths and it'd do nothing. |
28 |
> Should just be 's:^:project-1.0/:' |
29 |
|
30 |
This is fixed. |
31 |
|
32 |
> |
33 |
> > -# SRC_URI="https://github.com/example/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz |
34 |
> > -# ${EGO_SUM_SRC_URI}" |
35 |
> > +# SRC_URI="https://github.com/example/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
36 |
> > +# Do not add the next line if you don't have a vendor tarball |
37 |
> > +# SRC_URI+="${P}-vendor.tar.gz" |
38 |
> |
39 |
> Since example use .xz, should use it over .gz for vendor tarball. |
40 |
|
41 |
Fixed, but note that it doesn't really matter. you can use .z, .gz, |
42 |
.zip, or whatever you want to use. |
43 |
|
44 |
> |
45 |
> > @@ -256,7 +197,7 @@ go-module_set_globals() { |
46 |
> > # Relative URI within a GOPROXY for a file |
47 |
> > _reluri="${_dir}/@v/${version}.${_ext}" |
48 |
> > # SRC_URI: LHS entry |
49 |
> > - _uri="${_GOMODULE_GOPROXY_BASEURI}/${_reluri}" |
50 |
> > + _uri="mirror://goproxy/${_reluri}" |
51 |
> > # _uri="mirror://goproxy/${_reluri}" |
52 |
> |
53 |
> Unnecessary comment that duplicates the now-used above line. |
54 |
|
55 |
This part of the eclass is out of scope for what I was changing, and |
56 |
since most of this code will go away eventually, I'm not really worried |
57 |
about this extra comment. |
58 |
|
59 |
William |