Hello community, here is the log from the commit of package docker-runc for openSUSE:Factory checked in at 2017-12-21 11:25:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docker-runc (Old) and /work/SRC/openSUSE:Factory/.docker-runc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docker-runc" Thu Dec 21 11:25:20 2017 rev:5 rq:558282 version:1.0.0rc4+gitr3338_3f2f8b84a77f Changes: -------- --- /work/SRC/openSUSE:Factory/docker-runc/docker-runc.changes 2017-10-20 14:39:25.490334421 +0200 +++ /work/SRC/openSUSE:Factory/.docker-runc.new/docker-runc.changes 2017-12-21 11:25:22.343167320 +0100 @@ -1,0 +2,7 @@ +Mon Dec 11 12:31:09 UTC 2017 - [email protected] + +- Update to docker-runc 0351df1c5a66838d0c392b4ac4cf9450de844e2d requirement + for Docker v17.09.1-ce. This also includes a switch to the upstream + opencontainers sources. + +------------------------------------------------------------------- Old: ---- docker-runc-git.2d41c047c83e09a6d61d464906feb2a2f3c52aa4.tar.xz New: ---- docker-runc-git.3f2f8b84a77f73d38244dd690525642a72156c64.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docker-runc.spec ++++++ --- /var/tmp/diff_new_pack.heXnxb/_old 2017-12-21 11:25:22.959137286 +0100 +++ /var/tmp/diff_new_pack.heXnxb/_new 2017-12-21 11:25:22.963137091 +0100 @@ -18,14 +18,14 @@ # MANUAL: Update the git_version, git_short, and git_revision -%define git_version 2d41c047c83e09a6d61d464906feb2a2f3c52aa4 -%define git_short 2d41c04 +%define git_version 3f2f8b84a77f73d38244dd690525642a72156c64 +%define git_short 3f2f8b84a77f # How to get the git_revision # git clone ${url}.git runc-upstream # cd runc-upstream # git checkout $git_version # git_revision=r$(git rev-list HEAD | wc -l) -%define git_revision r3201 +%define git_revision r3338 %define go_tool go %define _name runc @@ -45,7 +45,7 @@ %endif Name: docker-runc -Version: 1.0.0rc3+git%{git_revision}_%{git_short} +Version: 1.0.0rc4+git%{git_revision}_%{git_short} Release: 0 Summary: Tool for spawning and running OCI containers License: Apache-2.0 @@ -65,6 +65,8 @@ Recommends: criu BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: runc <= 1.0 +# We provide a git revision so that Docker can require it properly. +Provides: %{name}-git = %{git_version} %description runc is a CLI tool for spawning and running containers according to the OCI @@ -98,10 +100,11 @@ # Do not use symlinks. If you want to run the unit tests for this package at # some point during the build and you need to directly use go list directly it # will get confused by symlinks. -export GOPATH=${HOME}/go:${HOME}/go/src/%project/Godeps/_workspace -mkdir -pv $HOME/go/src/%project -rm -rf $HOME/go/src/%project/* -cp -av * $HOME/go/src/%project +export GOPATH=${HOME}/go +export PROJECT=${HOME}/go/src/%project +mkdir -pv $PROJECT +rm -rf $PROJECT/* +cp -av * $PROJECT # Additionally enable seccomp. %if 0%{?with_libseccomp} @@ -122,8 +125,8 @@ source ./.runc_build_env # Build runc. -make -C "$HOME/go/src/%project" EXTRA_FLAGS="-x $BUILDFLAGS" BUILDTAGS="$BUILDTAGS" COMMIT_NO="%{git_version}" runc -mv "$HOME/go/src/%project/runc" %{name}-%{version} +make -C $PROJECT EXTRA_FLAGS="-x $BUILDFLAGS" BUILDTAGS="$BUILDTAGS" COMMIT_NO=%{git_version} runc +cp $PROJECT/runc %{name}-%{version} # Build man pages, this can only be done on arches where we can build go-md2man. man/md2man-all.sh ++++++ _service ++++++ --- /var/tmp/diff_new_pack.heXnxb/_old 2017-12-21 11:25:22.987135920 +0100 +++ /var/tmp/diff_new_pack.heXnxb/_new 2017-12-21 11:25:22.987135920 +0100 @@ -1,10 +1,10 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="url">https://github.com/docker/runc.git</param> + <param name="url">https://github.com/opencontainers/runc.git</param> <param name="scm">git</param> <param name="filename">docker-runc</param> <param name="versionformat">git.%H</param> - <param name="revision">2d41c047c83e09a6d61d464906feb2a2f3c52aa4</param> + <param name="revision">3f2f8b84a77f73d38244dd690525642a72156c64</param> <param name="exclude">.git</param> </service> <service name="recompress" mode="disabled"> ++++++ bsc1053532-0001-makefile-drop-usage-of-install.patch ++++++ --- /var/tmp/diff_new_pack.heXnxb/_old 2017-12-21 11:25:22.995135530 +0100 +++ /var/tmp/diff_new_pack.heXnxb/_new 2017-12-21 11:25:22.995135530 +0100 @@ -1,29 +1,24 @@ -From 87d1669e9704cff42dab0ea4b564a86ab6f026e6 Mon Sep 17 00:00:00 2001 -From: Valentin Rothberg <[email protected]> -Date: Tue, 12 Sep 2017 12:07:21 +0200 +From 6581d0f488b3bfa00760cc71c5f1fccfee302b0d Mon Sep 17 00:00:00 2001 +From: Aleksa Sarai <[email protected]> +Date: Mon, 14 Aug 2017 00:10:28 +1000 Subject: [PATCH] makefile: drop usage of --install The "go build -i" invocation may slightly help with incremental recompilation, but it will cause builds to fail if $GOROOT is not -writeable by the current user. While this does appear to work sometim -it's a concern for external build systems where "-i" causes build err +writeable by the current user. While this does appear to work sometimes, +it's a concern for external build systems where "-i" causes build errors for no real gain. Given the size of the runc project, --install is not really giving us much anyway. -SUSE-Bug: https://bugzilla.opensuse.org/show_bug.cgi?id=1053532 -SUSE-Backport: https://github.com/opencontainers/runc/pull/1555 Signed-off-by: Aleksa Sarai <[email protected]> - -(ported to 2d41c04) -Signed-off-by: Valentin Rothberg <[email protected]> --- - Makefile | 23 ++++++++++++----------- - 1 file changed, 12 insertions(+), 11 deletions(-) + Makefile | 22 ++++++++++++---------- + 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile -index d6d337dab5ca..dc13d2e5296e 100644 +index 6781ac74e8a0..dc13d2e5296e 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,8 @@ @@ -39,7 +34,7 @@ .DEFAULT: runc runc: $(SOURCES) -- go build -i -ldflags "-X main.gitCommit=${COMMIT} -X main.version=${VERSION}" -tags "$(BUILDTAGS)" -o runc . +- go build -i $(EXTRA_FLAGS) -ldflags "-X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -tags "$(BUILDTAGS)" -o runc . + $(GO) build $(EXTRA_FLAGS) -ldflags "-X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -tags "$(BUILDTAGS)" -o runc . all: runc recvtty @@ -47,12 +42,12 @@ recvtty: contrib/cmd/recvtty/recvtty contrib/cmd/recvtty/recvtty: $(SOURCES) -- go build -i -ldflags "-X main.gitCommit=${COMMIT} -X main.version=${VERSION}" -tags "$(BUILDTAGS)" -o contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty +- go build -i $(EXTRA_FLAGS) -ldflags "-X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -tags "$(BUILDTAGS)" -o contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty + $(GO) build $(EXTRA_FLAGS) -ldflags "-X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -tags "$(BUILDTAGS)" -o contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty static: $(SOURCES) -- CGO_ENABLED=1 go build -i -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X main.version=${VERSION}" -o runc . -- CGO_ENABLED=1 go build -i -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X main.version=${VERSION}" -o contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty +- CGO_ENABLED=1 go build -i $(EXTRA_FLAGS) -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -o runc . +- CGO_ENABLED=1 go build -i $(EXTRA_FLAGS) -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -o contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty + CGO_ENABLED=1 $(GO) build $(EXTRA_FLAGS) -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -o runc . + CGO_ENABLED=1 $(GO) build $(EXTRA_FLAGS) -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -o contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty @@ -62,7 +57,7 @@ CGO_ENABLED=1; \ }; \ echo "Building target: $$output"; \ -- go build -i -ldflags "$$ldflags" -tags "$$tags" -o "$$output" .; \ +- go build -i $(EXTRA_FLAGS) -ldflags "$$ldflags $(EXTRA_LDFLAGS)" -tags "$$tags" -o "$$output" .; \ + $(GO) build $(EXTRA_FLAGS) -ldflags "$$ldflags $(EXTRA_LDFLAGS)" -tags "$$tags" -o "$$output" .; \ done @@ -86,11 +81,10 @@ integration: runcimage docker run -e TESTFLAGS -t --privileged --rm -v $(CURDIR):/go/src/$(PROJECT) $(RUNC_IMAGE) make localintegration -@@ -133,11 +135,10 @@ clean: +@@ -133,10 +135,10 @@ clean: validate: script/validate-gofmt -- script/validate-shfmt - go vet $(allpackages) + $(GO) vet $(allpackages) @@ -101,5 +95,5 @@ +_allpackages = $(shell $(GO) list ./... | grep -v vendor) allpackages = $(if $(__allpackages),,$(eval __allpackages := $$(_allpackages)))$(__allpackages) -- -2.14.1 +2.15.0 ++++++ docker-runc-git.2d41c047c83e09a6d61d464906feb2a2f3c52aa4.tar.xz -> docker-runc-git.3f2f8b84a77f73d38244dd690525642a72156c64.tar.xz ++++++ ++++ 64007 lines of diff (skipped)
