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.
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?
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.
Best,
-rt
From 547c4f99d53b4a9382298d46b3a8066839e1f3ac Mon Sep 17 00:00:00 2001
From: Reinhard Tartler <siret...@tauware.de>
Date: Thu, 14 Mar 2019 07:52:46 -0400
Subject: [PATCH] Additional missing sources for openshift/imagebuilder
---
debian/control | 5 +++++
debian/golang-github-docker-docker-dev.install | 9 +++++++++
2 files changed, 14 insertions(+)
diff --git a/debian/control b/debian/control
index 8e13a2ea..53cb9ccb 100644
--- a/debian/control
+++ b/debian/control
@@ -230,6 +230,11 @@ Depends: ${misc:Depends}
,golang-github-hashicorp-serf-dev
,golang-github-vishvananda-netlink-dev (>= 1.0.0~)
,golang-github-vishvananda-netns-dev
+# containerd
+ ,golang-github-tonistiigi-fifo-dev
+ ,golang-github-containerd-fifo-dev
+# moby/buildkit/session
+ ,golang-github-opentracing-opentracing-go-dev
Replaces: golang-docker-dev (<< 1.8.2~ds1-1~)
,golang-github-docker-go-metrics-dev
,golang-github-docker-libnetwork-dev
diff --git a/debian/golang-github-docker-docker-dev.install b/debian/golang-github-docker-docker-dev.install
index 17d0abfb..89d21387 100644
--- a/debian/golang-github-docker-docker-dev.install
+++ b/debian/golang-github-docker-docker-dev.install
@@ -10,6 +10,7 @@
## Engine
engine/dockerversion usr/share/gocode/src/github.com/docker/docker/
+engine/daemon usr/share/gocode/src/github.com/docker/docker/
.gopath/src/github.com/docker/docker/api usr/share/gocode/src/github.com/docker/docker/
.gopath/src/github.com/docker/docker/builder usr/share/gocode/src/github.com/docker/docker/
.gopath/src/github.com/docker/docker/cli usr/share/gocode/src/github.com/docker/docker/
@@ -39,8 +40,12 @@ engine/dockerversion usr/share/gocode/src/github.
## Sub-vendoring:
+engine/vendor/github.com/containerd/continuity/devices usr/share/gocode/src/github.com/docker/docker/vendor/github.com/containerd/continuity/
engine/vendor/github.com/containerd/continuity/driver usr/share/gocode/src/github.com/docker/docker/vendor/github.com/containerd/continuity/
+engine/vendor/github.com/containerd/continuity/fs usr/share/gocode/src/github.com/docker/docker/vendor/github.com/containerd/continuity/
engine/vendor/github.com/containerd/continuity/pathdriver usr/share/gocode/src/github.com/docker/docker/vendor/github.com/containerd/continuity/
+engine/vendor/github.com/containerd/continuity/sysx usr/share/gocode/src/github.com/docker/docker/vendor/github.com/containerd/continuity/
+engine/vendor/github.com/containerd/continuity/syscallx usr/share/gocode/src/github.com/docker/docker/vendor/github.com/containerd/continuity/
engine/vendor/github.com/Nvveen/Gotty usr/share/gocode/src/github.com/docker/docker/vendor/github.com/Nvveen/
@@ -48,3 +53,7 @@ distribution/reference usr/share/gocode/sr
distribution/digestset usr/share/gocode/src/github.com/docker/docker/vendor/github.com/docker/distribution/
cli/vendor/github.com/moby/buildkit/ usr/share/gocode/src/github.com/moby/
+
+containerd/cio usr/share/gocode/src/github.com/containerd/containerd/
+containerd/defaults usr/share/gocode/src/github.com/containerd/containerd/
+containerd/log usr/share/gocode/src/github.com/containerd/containerd/
--
2.11.0
