On 3/17/19 7:40 PM, Reinhard Tartler wrote: > > On 3/13/19 10:29 AM, Arnaud Rebillout wrote: >> On 3/13/19 6:47 PM, Reinhard Tartler wrote: >>> [...] could you please update debian/changelog in experimental, and provide >>> me with a link to your pre-built *source* package [new version of >>> src:docker.io]? I'd be happy to testbuild it here, ensure that >>> github:openstack/imagebuilder still works, and sponsor the upload to >>> experimental. >> >> I just pushed your patch to experimental, thanks again, and sorry for >> the back and forth. I don't have permissions to give you access to this >> repo, let me CC Dmitry so that he can give you permissions. > Great! > >> I didn't forget any commit, it's just that the package doesn't build >> with gbp, the pristine-tar and upstream branches are not used anymore. >> There's a procedure to know, nothing complicated, but nothing obvious >> either. Here comes the magic: >> >> # Clean the place if need be >> git clean -dfx && git reset --hard >> >> # Import and unpack upstream sources (will trigger uscan and download >> orig tarballs if need be) >> origtargz --unpack && ./debian/unpack-components.sh >> >> # Build with your favorite tool >> dpkg-buildpackage -S -us -uc -i --no-check-builddeps >> >> >> That's it, that should give you a source package. >> > Thanks for the clarification. I'm really not comfortable with git > repositories for source packages, which choose to not include the full > sources. I feel that they cause more trouble than that their work (for > instance, I have to resort to http://sources.debian.org to inspect upstream > sources), but I realize that others (for instance Dmitry) disagree here. > Please excuse my questions for clarifications caused by ignorance here.
When I started to work on docker.io, I "revived" the upstream and pristine-tar branches, and followed the "standard" gpb workflow, with the upstream branch merged in master. And honestly, it was a real pain, because the docker.io package makes heavy use of the `Files-Excluded` field in debian/copyright, and there's a lot of work going on there, especially when you want to update the package to a new version. So I was constantly working on the long list of Files-Excluded, and each time I changed something in there, I had to regenerate the orig tarball, which also meant that I had to roll back on the 3 branches, so that gbp could regenerate the orig tarball and do the work on the upstream branch, pristine-tar branch, and merge upstream in master. Then I would try to build, fix errors, modify something in the Files-Excluded list, and bam! Rollback everything again so that gbp can regenerate the orig tarball. A real pain. I'm not saying that you **can't** enjoy a gbp workflow with the docker.io package, at the time I was working on that I was still fresh and had a lot to learn, so maybe I lacked some commands that could have make the situation easier. But clearly, after I stopped fiddling with these 3 branches, a lot of headache is gone. I even think that this can apply to every package that uses the `Files-Excluded` extensively, the way we do in docker.io (which is awkward, but I don't know any better way). That's just my experience :) > As for uploading the new version of src:docker.io to experimental, I > successfully built the package from the sources at > https://salsa.debian.org/docker-team/docker/tree/experimental, and confirmed > that my locally updated version of the github.com/containers/storage packages > continues to work (that package is currently still in the NEW queue). > However, github.com/openshift/imagebuilder continues to fail to build. At > first, I've identified a number of additional missing imports that I could > resolve with the attached patch. Would that be acceptable to include in the > next upload? I just pushed, along with a new changelog entry. Thanks! > But even with this attached patch, I'm still running into compilation and > have asked for help at > https://github.com/openshift/imagebuilder/pull/125#issuecomment-473562682 - > Upstream is really responsive and started to work on it at > https://github.com/openshift/imagebuilder/pull/127 - at the time of writing, > we are still working on clarifying and resolving the issue. I'm having a quick look, don't hesitate to ping me on this conversations if needed (my github nick is elboulangero). Cheers!
