On Sun, Feb 27, 2022 at 12:46:00AM -0500, Ionen Wolkens wrote: > On Sat, Feb 26, 2022 at 10:38:33PM -0600, William Hubbs wrote: > > diff --git a/eclass/go-module.eclass b/eclass/go-module.eclass > > index 66fe52c9ad7..b9686ad555a 100644 > > --- a/eclass/go-module.eclass > > +++ b/eclass/go-module.eclass > > @@ -25,9 +25,26 @@ > > # > > # If the software has a directory named vendor in its > > # top level directory, the only thing you need to do is inherit the > > -# eclass. Otherwise, you need to also populate > > -# EGO_SUM and call go-module_set_globals as discussed below. > > +# eclass. If it doesn't, you need to also create a vendor tarball and > > Unnecessary double space. > > > +# host it somewhere, for example in your dev space. > > # > > +# Here are the commands to create a vendor tarball. > > +# > > +# @CODE > > +# > > +# $ cd /path/to/project > > +# $ go mod vendor > > +# $ tar -acf project-1.0-vendor.tar.xz vendor --xform 's:^":project-1.0/:' > > Typo, that " doesn't exist at start of paths and it'd do nothing. > Should just be 's:^:project-1.0/:'
This is fixed. > > > -# SRC_URI="https://github.com/example/${PN}/archive/v${PV}.tar.gz -> > > ${P}.tar.gz > > -# ${EGO_SUM_SRC_URI}" > > +# SRC_URI="https://github.com/example/${PN}/archive/v${PV}.tar.gz -> > > ${P}.tar.gz" > > +# Do not add the next line if you don't have a vendor tarball > > +# SRC_URI+="${P}-vendor.tar.gz" > > Since example use .xz, should use it over .gz for vendor tarball. Fixed, but note that it doesn't really matter. you can use .z, .gz, .zip, or whatever you want to use. > > > @@ -256,7 +197,7 @@ go-module_set_globals() { > > # Relative URI within a GOPROXY for a file > > _reluri="${_dir}/@v/${version}.${_ext}" > > # SRC_URI: LHS entry > > - _uri="${_GOMODULE_GOPROXY_BASEURI}/${_reluri}" > > + _uri="mirror://goproxy/${_reluri}" > > # _uri="mirror://goproxy/${_reluri}" > > Unnecessary comment that duplicates the now-used above line. This part of the eclass is out of scope for what I was changing, and since most of this code will go away eventually, I'm not really worried about this extra comment. William
signature.asc
Description: PGP signature
