mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-21 14:31:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1028 from marineam/docker

Browse Source 
Linux 3.18 and Docker 1.4
This commit is contained in:
Michael Marineau 2014-12-27 14:27:37 -08:00
commit 256f852816
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.4.0.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.4.1.ebuild vendored
View File

4
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild vendored
View File

@ -15,9 +15,9 @@ 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"
KEYWORDS="amd64"
fi
inherit bash-completion-r1 linux-info multilib systemd udev user cros-workon

3
sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords vendored
View File

@ -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

2
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.18.1.ebuild vendored
View File

@ -5,4 +5,4 @@ EAPI=5
inherit coreos-kernel
DESCRIPTION="CoreOS Linux kernel"
KEYWORDS="~amd64"
KEYWORDS="amd64"

2
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-3.18.1.ebuild vendored
View File

@ -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