From b6e7849c27e9e5a978b0ce0b8ccd23b3047e9bbe Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 26 Dec 2014 15:40:29 -0800 Subject: [PATCH 1/4] profiles: update btrfs-progs to 3.17.1 --- .../profiles/coreos/base/package.accept_keywords | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index d1f8dcebb6..8814d6f761 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -109,3 +109,6 @@ dev-util/checkbashisms # Fixes a few bugs but has not yet been marked stable upstream. =app-arch/lbzip2-2.5 + +# >=3.16 required by docker 1.4 +=sys-fs/btrfs-progs-3.17.1 From 7607f28ddf11e70fe3f04bf9072307d26c93d14a Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 26 Dec 2014 15:41:40 -0800 Subject: [PATCH 2/4] coreos-kernel: mark 3.18.1 stable --- .../sys-kernel/coreos-kernel/coreos-kernel-3.18.1.ebuild | 2 +- .../sys-kernel/coreos-sources/coreos-sources-3.18.1.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.18.1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.18.1.ebuild index cb66ab245d..ecbb54a069 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.18.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.18.1.ebuild @@ -5,4 +5,4 @@ EAPI=5 inherit coreos-kernel DESCRIPTION="CoreOS Linux kernel" -KEYWORDS="~amd64" +KEYWORDS="amd64" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-3.18.1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-3.18.1.ebuild index 9d70d3a709..358a9fd69d 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-3.18.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-3.18.1.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Full sources for the Linux kernel" HOMEPAGE="http://www.kernel.org" SRC_URI="${KERNEL_URI}" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="" # This ebuild is essentially equivalent to the upstream vanilla-sources From 6600a6e9a1497507d6406a8cf131150fa13d41f3 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 26 Dec 2014 15:54:28 -0800 Subject: [PATCH 3/4] docker: add docker 1.4.1 --- .../docker/{docker-1.4.0.ebuild => docker-1.4.1.ebuild} | 0 .../coreos-overlay/app-emulation/docker/docker-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-1.4.0.ebuild => docker-1.4.1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.4.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.4.1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.4.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.4.1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild index a128501970..53322c2497 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then DOCKER_GITCOMMIT="" KEYWORDS="" else - CROS_WORKON_COMMIT="4595d4fb03093acf87b905bebc5ba4964d7c0707" # v1.4.0 + CROS_WORKON_COMMIT="5bc2ff8a36e9a768e8b479de4fe3ea9c9daf4121" # v1.4.1 DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}" KEYWORDS="~amd64" fi From 40e1253deb4c87b7cceb749e840edfd4bd8b2fd9 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 26 Dec 2014 15:54:46 -0800 Subject: [PATCH 4/4] docker: mark 1.4.1 stable --- .../coreos-overlay/app-emulation/docker/docker-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild index 53322c2497..485d5a464e 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then else CROS_WORKON_COMMIT="5bc2ff8a36e9a768e8b479de4fe3ea9c9daf4121" # v1.4.1 DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}" - KEYWORDS="~amd64" + KEYWORDS="amd64" fi inherit bash-completion-r1 linux-info multilib systemd udev user cros-workon