Hello community, here is the log from the commit of package docker for openSUSE:Factory checked in at 2015-12-09 19:52:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docker (Old) and /work/SRC/openSUSE:Factory/.docker.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docker" Changes: -------- --- /work/SRC/openSUSE:Factory/docker/docker.changes 2015-12-06 07:40:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.docker.new/docker.changes 2015-12-09 22:15:08.000000000 +0100 @@ -1,0 +2,14 @@ +Fri Dec 4 16:08:22 UTC 2015 - [email protected] + +- remove 2 patches and add 5 others after 1.9.1 upgrade + Removed: + docker_missing_ppc64le_netlink_linux_files.patch + docker_rename_jump_amd64_as_jump_linux.patch + Added: + add_bolt_ppc64.patch + add_bolt_arm64.patch + docker_remove_journald_to_fix_dynbinary_build_on_arm.patch + docker_remove_journald_to_fix_dynbinary_build_on_powerpc.patch + docker_remove_journald_to_fix_dynbinary_build_on_arm64.patch + +------------------------------------------------------------------- Old: ---- docker_missing_ppc64le_netlink_linux_files.patch docker_rename_jump_amd64_as_jump_linux.patch New: ---- add_bolt_arm64.patch add_bolt_ppc64.patch docker_remove_journald_to_fix_dynbinary_build_on_arm.patch docker_remove_journald_to_fix_dynbinary_build_on_arm64.patch docker_remove_journald_to_fix_dynbinary_build_on_powerpc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docker.spec ++++++ --- /var/tmp/diff_new_pack.TGlde4/_old 2015-12-09 22:15:10.000000000 +0100 +++ /var/tmp/diff_new_pack.TGlde4/_new 2015-12-09 22:15:10.000000000 +0100 @@ -49,8 +49,11 @@ # to simply disable this check Patch100: ignore-dockerinit-checksum.patch Patch101: gcc-go-build-static-libgo.patch -Patch102: docker_rename_jump_amd64_as_jump_linux.patch -Patch103: docker_missing_ppc64le_netlink_linux_files.patch +Patch102: add_bolt_ppc64.patch +Patch103: docker_remove_journald_to_fix_dynbinary_build_on_arm.patch +Patch104: docker_remove_journald_to_fix_dynbinary_build_on_powerpc.patch +Patch105: add_bolt_arm64.patch +Patch106: docker_remove_journald_to_fix_dynbinary_build_on_arm64.patch BuildRequires: bash-completion BuildRequires: device-mapper-devel >= 1.2.68 BuildRequires: glibc-devel-static @@ -147,6 +150,9 @@ %patch101 -p0 %patch102 -p1 %patch103 -p1 +%patch104 -p1 +%patch105 -p1 +%patch106 -p1 %endif cp %{SOURCE7} . ++++++ add_bolt_arm64.patch ++++++ From: Michel Normand <[email protected]> Subject: add bolt arm64 Date: Fri, 04 Dec 2015 17:07:22 +0100 add bolt arm64 Signed-off-by: Michel Normand <[email protected]> --- vendor/src/github.com/boltdb/bolt/bolt_arm64.go | 4 ++++ 1 file changed, 4 insertions(+) Index: docker-1.9.1/vendor/src/github.com/boltdb/bolt/bolt_arm64.go =================================================================== --- /dev/null +++ docker-1.9.1/vendor/src/github.com/boltdb/bolt/bolt_arm64.go @@ -0,0 +1,4 @@ +package bolt + +// maxMapSize represents the largest mmap size supported by Bolt. +const maxMapSize = 0xFFFFFFFFFFFF // 256TB ++++++ add_bolt_ppc64.patch ++++++ --- vendor/src/github.com/boltdb/bolt/bolt_ppc64.go | 4 ++++ vendor/src/github.com/boltdb/bolt/bolt_ppc64le.go | 4 ++++ 2 files changed, 8 insertions(+) Index: docker-1.9.1/vendor/src/github.com/boltdb/bolt/bolt_ppc64.go =================================================================== --- /dev/null +++ docker-1.9.1/vendor/src/github.com/boltdb/bolt/bolt_ppc64.go @@ -0,0 +1,4 @@ +package bolt + +// maxMapSize represents the largest mmap size supported by Bolt. +const maxMapSize = 0xFFFFFFFFFFFF // 256TB Index: docker-1.9.1/vendor/src/github.com/boltdb/bolt/bolt_ppc64le.go =================================================================== --- /dev/null +++ docker-1.9.1/vendor/src/github.com/boltdb/bolt/bolt_ppc64le.go @@ -0,0 +1,4 @@ +package bolt + +// maxMapSize represents the largest mmap size supported by Bolt. +const maxMapSize = 0xFFFFFFFFFFFF // 256TB ++++++ docker_remove_journald_to_fix_dynbinary_build_on_arm.patch ++++++ >From 6f6f10a75f8b447637e8a89d685452871899e9c0 Mon Sep 17 00:00:00 2001 From: Stefan Scherer <[email protected]> Date: Thu, 19 Nov 2015 17:09:20 +0100 Subject: [PATCH] prevent journald from being built on ARM Signed-off-by: Govinda Fichtner <[email protected]> --- daemon/logger/journald/journald.go | 2 +- daemon/logger/journald/journald_unsupported.go | 2 +- daemon/logger/journald/read.go | 2 +- daemon/logger/journald/read_unsupported.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) Index: docker-1.9.1/daemon/logger/journald/journald.go =================================================================== --- docker-1.9.1.orig/daemon/logger/journald/journald.go +++ docker-1.9.1/daemon/logger/journald/journald.go @@ -1,4 +1,4 @@ -// +build linux +// +build linux,!arm // Package journald provides the log driver for forwarding server logs // to endpoints that receive the systemd format. Index: docker-1.9.1/daemon/logger/journald/journald_unsupported.go =================================================================== --- docker-1.9.1.orig/daemon/logger/journald/journald_unsupported.go +++ docker-1.9.1/daemon/logger/journald/journald_unsupported.go @@ -1,3 +1,3 @@ -// +build !linux +// +build !linux linux,arm package journald Index: docker-1.9.1/daemon/logger/journald/read.go =================================================================== --- docker-1.9.1.orig/daemon/logger/journald/read.go +++ docker-1.9.1/daemon/logger/journald/read.go @@ -1,4 +1,4 @@ -// +build linux,cgo,!static_build,journald +// +build linux,cgo,!static_build,journald,!arm package journald Index: docker-1.9.1/daemon/logger/journald/read_unsupported.go =================================================================== --- docker-1.9.1.orig/daemon/logger/journald/read_unsupported.go +++ docker-1.9.1/daemon/logger/journald/read_unsupported.go @@ -1,4 +1,4 @@ -// +build !linux !cgo static_build !journald +// +build !linux !cgo static_build !journald linux,arm package journald ++++++ docker_remove_journald_to_fix_dynbinary_build_on_arm64.patch ++++++ From: Michel Normand <[email protected]> Subject: docker remove journald to fix dynbinary build on arm64 Date: Fri, 04 Dec 2015 17:07:12 +0100 docker remove journald to fix dynbinary build on arm64 Signed-off-by: Michel Normand <[email protected]> --- daemon/logger/journald/journald.go | 2 +- daemon/logger/journald/journald_unsupported.go | 2 +- daemon/logger/journald/read.go | 2 +- daemon/logger/journald/read_unsupported.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) Index: docker-1.9.1/daemon/logger/journald/journald.go =================================================================== --- docker-1.9.1.orig/daemon/logger/journald/journald.go +++ docker-1.9.1/daemon/logger/journald/journald.go @@ -1,4 +1,4 @@ -// +build linux,!arm linux,!ppc64 linux,!ppc64le +// +build linux,!arm linux,!arm64 linux,!ppc64 linux,!ppc64le // Package journald provides the log driver for forwarding server logs // to endpoints that receive the systemd format. Index: docker-1.9.1/daemon/logger/journald/journald_unsupported.go =================================================================== --- docker-1.9.1.orig/daemon/logger/journald/journald_unsupported.go +++ docker-1.9.1/daemon/logger/journald/journald_unsupported.go @@ -1,3 +1,3 @@ -// +build !linux linux,arm linux,ppc64 linux,ppc64le +// +build !linux linux,arm linux,arm64 linux,ppc64 linux,ppc64le package journald Index: docker-1.9.1/daemon/logger/journald/read.go =================================================================== --- docker-1.9.1.orig/daemon/logger/journald/read.go +++ docker-1.9.1/daemon/logger/journald/read.go @@ -1,4 +1,4 @@ -// +build linux,cgo,!static_build,journald,!arm,!ppc64,!ppc64le +// +build linux,cgo,!static_build,journald,!arm,!arm64,!ppc64,!ppc64le package journald Index: docker-1.9.1/daemon/logger/journald/read_unsupported.go =================================================================== --- docker-1.9.1.orig/daemon/logger/journald/read_unsupported.go +++ docker-1.9.1/daemon/logger/journald/read_unsupported.go @@ -1,4 +1,4 @@ -// +build !linux !cgo static_build !journald linux,arm linux,ppc64 linux,ppc64le +// +build !linux !cgo static_build !journald linux,arm linux,arm64 linux,ppc64 linux,ppc64le package journald ++++++ docker_remove_journald_to_fix_dynbinary_build_on_powerpc.patch ++++++ From: Michel Normand <[email protected]> Subject: docker remove journald to fix dynbinary build on powerpc Date: Fri, 04 Dec 2015 14:45:43 +0100 docker remove journald to fix dynbinary build on powerpc Signed-off-by: Michel Normand <[email protected]> --- daemon/logger/journald/journald.go | 2 +- daemon/logger/journald/journald_unsupported.go | 2 +- daemon/logger/journald/read.go | 2 +- daemon/logger/journald/read_unsupported.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) Index: docker-1.9.1/daemon/logger/journald/journald.go =================================================================== --- docker-1.9.1.orig/daemon/logger/journald/journald.go +++ docker-1.9.1/daemon/logger/journald/journald.go @@ -1,4 +1,4 @@ -// +build linux,!arm +// +build linux,!arm linux,!ppc64 linux,!ppc64le // Package journald provides the log driver for forwarding server logs // to endpoints that receive the systemd format. Index: docker-1.9.1/daemon/logger/journald/journald_unsupported.go =================================================================== --- docker-1.9.1.orig/daemon/logger/journald/journald_unsupported.go +++ docker-1.9.1/daemon/logger/journald/journald_unsupported.go @@ -1,3 +1,3 @@ -// +build !linux linux,arm +// +build !linux linux,arm linux,ppc64 linux,ppc64le package journald Index: docker-1.9.1/daemon/logger/journald/read.go =================================================================== --- docker-1.9.1.orig/daemon/logger/journald/read.go +++ docker-1.9.1/daemon/logger/journald/read.go @@ -1,4 +1,4 @@ -// +build linux,cgo,!static_build,journald,!arm +// +build linux,cgo,!static_build,journald,!arm,!ppc64,!ppc64le package journald Index: docker-1.9.1/daemon/logger/journald/read_unsupported.go =================================================================== --- docker-1.9.1.orig/daemon/logger/journald/read_unsupported.go +++ docker-1.9.1/daemon/logger/journald/read_unsupported.go @@ -1,4 +1,4 @@ -// +build !linux !cgo static_build !journald linux,arm +// +build !linux !cgo static_build !journald linux,arm linux,ppc64 linux,ppc64le package journald
