Re: Basics of packaging with the new workflow

2020-03-09 Thread Tong Sun
On Mon, Mar 9, 2020 at 1:10 AM Anthony Fok  wrote:
>
> On Sun, Mar 8, 2020 at 10:18 PM Tong Sun  wrote:
> >
> > Hi Shengjing,
> >
> > On Sat, Feb 22, 2020 at 1:03 PM Shengjing Zhu  wrote:
> > >
> > > ...So when you create a new package with dh-make-golang, it creates two
> > > branches for you,
> > > + debian/sid
> > > + upstream
> > > upstream branch contains upstream history.
> > > If the vendor directory should be removed, it still needs manual process.
> >
> > Would you explain what are all the manual process I need to do pls?
> >
> > I'm packing a module that has vendor directory now, and even after
> > I've removed the vendor directory, I'm still getting a lot of errors
> > of, source-includes-file-in-files-excluded vendor... e.g.:
> >
> > source: source-includes-file-in-files-excluded 
> > vendor/gopkg.in/yaml.v2/yaml.go
> >
> > What are all the manual process I need to do pls? thx.
>
> Hi Tong,
>
> There is currently a bug in dh-make-golang v0.3.x, including v0.3.3,
> where it fails to repack if tracking released tarballs.  Which is my
> fault as I had inadvertently created this bug, and haven't had the
> chance to fix it yet, see
> https://github.com/Debian/dh-make-golang/issues/134
>
> Could you please tell me the XS-Go-Import-Path of the Go package you
> are working on?  It would really help me test and fix this bug in
> dh-make-golang v0.3.3.  Many thanks!

Sure,

It is sigs.k8s.io/structured-merge-diff that I'm trying to pack and
its XS-Go-Import-Path is

XS-Go-Import-Path: sigs.k8s.io/structured-merge-diff

Thanks Anthony



Re: RFS: golang-github-tonistiigi-units

2020-03-09 Thread Tong Sun
On Mon, Mar 9, 2020 at 12:03 AM Utkarsh Gupta  wrote:
>
> Hi Tong,
>
> On Mon, Mar 9, 2020 at 2:03 AM Tong Sun
>  wrote:
> > It is at:
> >   https://salsa.debian.org/go-team/packages/golang-github-tonistiigi-units
>
> It seems that you didn't quite push your changes yet :)

Haha, indeed, I only pushed to my
https://salsa.debian.org/suntong-guest/golang-github-tonistiigi-units

and then forgot to follow through the rest of the steps, :)

Should be there now.

cheers



Re: undefined: proto.GoGoProtoPackageIsVersion3

2020-03-09 Thread Tong Sun
On Mon, Mar 9, 2020 at 12:06 AM Shengjing Zhu  wrote:

> 1. you should regenerate the pb.go files, as these are not preferred source.

Thanks Shengjing,

The pb.go files should have been regenerated by the go:generate at
https://github.com/tonistiigi/fsutil/blob/dac69f7f60df46c672470671a08245018ea14ca0/types/generate.go#L3

Investigating why it is not happening; meanwhile, if any one knows why
please chip in.

Once again the full build log is enclosed below and we can see that go
generate is somehow not called:

The full build log:
dpkg-buildpackage: info: source package golang-github-tonistiigi-fsutil
dpkg-buildpackage: info: source version 0.0~git20200225.013a9fe-1
dpkg-buildpackage: info: source distribution unstable
dpkg-buildpackage: info: source changed by Tong Sun

 dpkg-source -i --before-build .
dpkg-buildpackage: info: host architecture amd64
 debian/rules clean
dh clean --builddirectory=_build --buildsystem=golang --with=golang
   dh_auto_clean -O--builddirectory=_build -O--buildsystem=golang
   dh_autoreconf_clean -O--builddirectory=_build -O--buildsystem=golang
   dh_clean -O--builddirectory=_build -O--buildsystem=golang
 debian/rules binary
dh binary --builddirectory=_build --buildsystem=golang --with=golang
   dh_update_autotools_config -O--builddirectory=_build -O--buildsystem=golang
   dh_autoreconf -O--builddirectory=_build -O--buildsystem=golang
   dh_auto_configure -O--builddirectory=_build -O--buildsystem=golang
   dh_auto_build -O--builddirectory=_build -O--buildsystem=golang
cd _build && go install -trimpath -v -p 2
github.com/tonistiigi/fsutil github.com/tonistiigi/fsutil/bench
github.com/tonistiigi/fsutil/cmd/receive
github.com/tonistiigi/fsutil/cmd/send
github.com/tonistiigi/fsutil/cmd/walk
github.com/tonistiigi/fsutil/copy github.com/tonistiigi/fsutil/types
github.com/tonistiigi/fsutil/util
internal/cpu
runtime/internal/atomic
runtime/internal/sys
internal/bytealg
runtime/internal/math
internal/race
sync/atomic
runtime
unicode
unicode/utf8
math/bits
math
internal/testlog
runtime/cgo
encoding
unicode/utf16
crypto/internal/subtle
crypto/subtle
internal/reflectlite
sync
math/rand
errors
sort
io
strconv
bytes
reflect
internal/oserror
syscall
time
internal/poll
internal/fmtsort
internal/syscall/unix
strings
os
path
context
github.com/containerd/continuity/syscallx
fmt
path/filepath
io/ioutil
encoding/binary
golang.org/x/sys/unix
os/user
github.com/containerd/continuity/sysx
bufio
encoding/base64
archive/tar
encoding/json
log
regexp/syntax
github.com/sirupsen/logrus
text/scanner
regexp
hash
crypto
github.com/pkg/errors
github.com/gogo/protobuf/proto
github.com/docker/docker/pkg/fileutils
github.com/opencontainers/go-digest
github.com/gogo/protobuf/sortkeys
golang.org/x/sync/errgroup
crypto/cipher
crypto/aes
math/big
github.com/tonistiigi/fsutil/types
# github.com/tonistiigi/fsutil/types
src/github.com/tonistiigi/fsutil/types/stat.pb.go:27:11: undefined:
proto.GoGoProtoPackageIsVersion3
src/github.com/tonistiigi/fsutil/types/wire.pb.go:27:11: undefined:
proto.GoGoProtoPackageIsVersion3
encoding/hex
flag
crypto/rand
github.com/containerd/continuity/fs
github.com/tonistiigi/fsutil/copy
dh_auto_build: error: cd _build && go install -trimpath -v -p 2
github.com/tonistiigi/fsutil github.com/tonistiigi/fsutil/bench
github.com/tonistiigi/fsutil/cmd/receive
github.com/tonistiigi/fsutil/cmd/send
github.com/tonistiigi/fsutil/cmd/walk
github.com/tonistiigi/fsutil/copy github.com/tonistiigi/fsutil/types
github.com/tonistiigi/fsutil/util returned exit code 2
make: *** [debian/rules:4: binary] Error 25
dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2
debuild: fatal error at line 1182:



Re: undefined: proto.GoGoProtoPackageIsVersion3

2020-03-09 Thread Shengjing Zhu
On Mon, Mar 9, 2020 at 11:48 PM Tong Sun  wrote:
>
> On Mon, Mar 9, 2020 at 12:06 AM Shengjing Zhu  wrote:
>
> > 1. you should regenerate the pb.go files, as these are not preferred source.
>
> Thanks Shengjing,
>
> The pb.go files should have been regenerated by the go:generate at
> https://github.com/tonistiigi/fsutil/blob/dac69f7f60df46c672470671a08245018ea14ca0/types/generate.go#L3
>
> Investigating why it is not happening; meanwhile, if any one knows why
> please chip in.

DH_GOLANG_GO_GENERATE in
https://manpages.debian.org/unstable/dh-golang/Debian::Debhelper::Buildsystem::golang.3pm.en.html


-- 
Shengjing Zhu



Re: Basics of packaging with the new workflow

2020-03-09 Thread Martina Ferrari
Stephen,

On 08/03/2020 00:43, Stephen Gelman wrote:

> One small point about not using pristine-tar:  today I tried to upload 
> backports of a number of packages packaged with the new workflow.  All of the 
> uploads got rejected because of a mismatched tarball.  The fix was pretty 
> easy - just grab the orig from the archives and rebuild, but it was 
> definitely an added hassle that wasn’t a problem when using pristine-tar.  
> Not really complaining, just wanted to add another datapoint. :)

This is normal when switching from pristine-tar to no-pristine-tar
without a new upstream release: the way the tarballs are generated is
not compatible and you need to get the original tarball from the
archive. After switching, this has never been an issue for me.



Re: RFS: golang-github-tonistiigi-units

2020-03-09 Thread Tong Sun
On Mon, Mar 9, 2020 at 11:42 AM Tong Sun
 wrote:
>
> On Mon, Mar 9, 2020 at 12:03 AM Utkarsh Gupta  wrote:
> >
> > Hi Tong,
> >
> > On Mon, Mar 9, 2020 at 2:03 AM Tong Sun
> >  wrote:
> > > It is at:
> > >   https://salsa.debian.org/go-team/packages/golang-github-tonistiigi-units
> >
> > It seems that you didn't quite push your changes yet :)
>
> Haha, indeed, I only pushed to my
> https://salsa.debian.org/suntong-guest/golang-github-tonistiigi-units
>
> and then forgot to follow through the rest of the steps, :)
>
> Should be there now.

While you're at it Utkarsh, please check out golang-github-tonistiigi-fsutil at
https://salsa.debian.org/suntong-guest/golang-github-tonistiigi-fsutil
as well.

I just pushed it and it should be all clean as well.

thx



Re: RFS: golang-github-tonistiigi-units

2020-03-09 Thread Tong Sun
On Mon, Mar 9, 2020 at 12:37 PM Tong Sun
 wrote:
>
> On Mon, Mar 9, 2020 at 11:42 AM Tong Sun
>  wrote:
> >
> > On Mon, Mar 9, 2020 at 12:03 AM Utkarsh Gupta  wrote:
> > >
> > > Hi Tong,
> > >
> > > On Mon, Mar 9, 2020 at 2:03 AM Tong Sun
> > >  wrote:
> > > > It is at:
> > > >   
> > > > https://salsa.debian.org/go-team/packages/golang-github-tonistiigi-units
> > >
> > > It seems that you didn't quite push your changes yet :)
> >
> > Haha, indeed, I only pushed to my
> > https://salsa.debian.org/suntong-guest/golang-github-tonistiigi-units
> >
> > and then forgot to follow through the rest of the steps, :)
> >
> > Should be there now.
>
> While you're at it Utkarsh, please check out golang-github-tonistiigi-fsutil 
> at
> https://salsa.debian.org/suntong-guest/golang-github-tonistiigi-fsutil

ops, I meant 
https://salsa.debian.org/go-team/packages/golang-github-tonistiigi-fsutil

> as well.
>
> I just pushed it and it should be all clean as well.
>
> thx



Re: Basics of packaging with the new workflow

2020-03-09 Thread Stephen Gelman
On Mon, Mar 9, 2020 at 11:13 AM Martina Ferrari  wrote:
>
> Stephen,
>
> On 08/03/2020 00:43, Stephen Gelman wrote:
>
> > One small point about not using pristine-tar:  today I tried to upload 
> > backports of a number of packages packaged with the new workflow.  All of 
> > the uploads got rejected because of a mismatched tarball.  The fix was 
> > pretty easy - just grab the orig from the archives and rebuild, but it was 
> > definitely an added hassle that wasn’t a problem when using pristine-tar.  
> > Not really complaining, just wanted to add another datapoint. :)
>
> This is normal when switching from pristine-tar to no-pristine-tar
> without a new upstream release: the way the tarballs are generated is
> not compatible and you need to get the original tarball from the
> archive. After switching, this has never been an issue for me.

Martina,

This was on a brand new package.  When backporting, the archive
generated on a buster box was different from the one generated on my
sid box, so I think there's at least a somewhat different issue here.

Stephen



Re: RFS: golang-github-tonistiigi-units

2020-03-09 Thread Utkarsh Gupta
Hi,

On Mon, Mar 9, 2020 at 10:09 PM Tong Sun
 wrote:
> > > > It seems that you didn't quite push your changes yet :)
> > >
> > > Haha, indeed, I only pushed to my
> > > https://salsa.debian.org/suntong-guest/golang-github-tonistiigi-units
> > >
> > > and then forgot to follow through the rest of the steps, :)
> > >
> > > Should be there now.

Uploaded this, thank you! :)

> > While you're at it Utkarsh, please check out 
> > golang-github-tonistiigi-fsutil at
> > https://salsa.debian.org/suntong-guest/golang-github-tonistiigi-fsutil
> ops, I meant 
> https://salsa.debian.org/go-team/packages/golang-github-tonistiigi-fsutil
> > I just pushed it and it should be all clean as well.

This doesn't seem to build for me. I get some test failures when running sbuild.
Could you check back and confirm?


Best,
Utkarsh



RFS: golang-github-tonistiigi-fsutil

2020-03-09 Thread Tong Sun
On Mon, Mar 9, 2020 at 3:31 PM Utkarsh Gupta  wrote:

> > > While you're at it Utkarsh, please check out 
> > > golang-github-tonistiigi-fsutil at
> > > https://salsa.debian.org/suntong-guest/golang-github-tonistiigi-fsutil
> > ops, I meant 
> > https://salsa.debian.org/go-team/packages/golang-github-tonistiigi-fsutil
> > > I just pushed it and it should be all clean as well.
>
> This doesn't seem to build for me. I get some test failures when running 
> sbuild.
> Could you check back and confirm?

Thanks for checking, Utkarsh.

I just tried again and it works for me. I've put my log here--
https://pastebin.com/YkrJS0Zm

Post your log there as well I'll compare and see if I can find anything.

NB, http://paste.debian.net/ is not used because the log is too big, :)