From c63069daddd49bfec3a15a4a88288c1d67c784e757d32a53cf5d4c711f8b6520 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Tue, 18 Dec 2018 10:34:21 +0000 Subject: [PATCH] Accepting request 659068 from home:cyphar:go:remove_goroot_profile - Handle build breakage due to missing 'export GOPATH' (caused by resolution of boo#1119634). I believe Docker is one of the only packages with this problem. OBS-URL: https://build.opensuse.org/request/show/659068 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=275 --- docker.changes | 6 ++++++ docker.spec | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/docker.changes b/docker.changes index e2790f4..584012e 100644 --- a/docker.changes +++ b/docker.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 18 10:10:06 UTC 2018 - Aleksa Sarai + +- Handle build breakage due to missing 'export GOPATH' (caused by resolution of + boo#1119634). I believe Docker is one of the only packages with this problem. + ------------------------------------------------------------------- Mon Dec 3 16:14:22 UTC 2018 - Aleksa Sarai diff --git a/docker.spec b/docker.spec index 9066a47..9ce6b2f 100644 --- a/docker.spec +++ b/docker.spec @@ -314,10 +314,10 @@ EOF # Preparing GOPATH so that the client is visible to the compiler mkdir -p src/github.com/docker/ ln -s $(pwd)/components/cli $(pwd)/src/github.com/docker/cli -GOPATH=$GOPATH:$(pwd) +export GOPATH=$GOPATH:$(pwd) # DOCKER ENGINE -cd components/engine/ +pushd components/engine/ # ignore the warning that we compile outside a Docker container ./hack/make.sh dynbinary # build the tests binary @@ -325,17 +325,17 @@ GOPATH=$(pwd)/vendor:$(pwd)/.gopath/ go test \ -buildmode=pie \ -tags "$DOCKER_BUILDTAGS daemon autogen" \ -c github.com/docker/docker/integration-cli -o tests.main -cd ../.. +popd # DOCKER CLIENT -cd components/cli +pushd components/cli ./scripts/build/dynbinary mkdir -p ./man/man1 go build -buildmode=pie -o gen-manpages github.com/docker/cli/man ./gen-manpages --root "$(pwd)" --target "$(pwd)/man/man1" ./man/md2man-all.sh -cd ../.. +popd %check # We used to run 'go test' here, however we found that this actually didn't