diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r233.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r234.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r233.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r234.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild index 82a584897e..529931dadf 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild @@ -132,7 +132,6 @@ RDEPEND="${RDEPEND} sys-apps/systemd sys-apps/systemd-sysv-utils sys-apps/util-linux - sys-fs/aufs-util sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm 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 3eafb47dbb..69cd385ea4 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 @@ -46,9 +46,6 @@ >=sys-apps/kexec-tools-2.0.4-r1 ~amd64 >=sys-kernel/dracut-027-r3 ~amd64 -# Needed for docker -=sys-fs/aufs-util-3.7.6 ~amd64 - # Needed by gsutil-3.34 =dev-python/httplib2-0.8 ~amd64 =dev-python/crcmod-1.7-r1 ~amd64 @@ -65,8 +62,6 @@ =app-portage/gentoolkit-0.3.0.8 # Docker dependencies are needed -=sys-fs/aufs-util-3* ~amd64 -=sys-fs/aufs-headers-3* ~amd64 =dev-util/boost-build-1.52.0-r1 ~amd64 # Fixes ruby dependency diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.provided b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.provided index 547536d82c..7e87b34be8 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.provided +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.provided @@ -5,4 +5,3 @@ # even a simple mta (like ssmtp). http://crosbug.com/5777 mail-mta/ssmtp-2.64 net-mail/mailbase-1 -sys-fs/aufs3-9999 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use index 14f8916352..dbbb72a080 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use @@ -39,8 +39,6 @@ app-emulation/qemu aio caps curl jpeg ncurses png python seccomp threads uuid vh dev-libs/libaio static-libs cross-armv7a-cros-linux-gnueabi/gcc hardfp cross-armv6j-cros-linux-gnueabi/gcc hardfp -thumb -# we need aufs and bridging in the kernel for docker -sys-kernel/coreos-kernel aufs bridge # pciutils is required by flashrom / mosys which is required to be statically # compiled to reduce dependency during auto update. sys-apps/pciutils static-libs diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/README b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/README index 8ee417150e..6f5dba5e36 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/README +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/README @@ -1,4 +1,4 @@ -The kernel tree is managed in git and is essentially the stable kernel + aufs. +The kernel tree is managed in git and is just the latest stable kernel. To bump to a new version do the following: @@ -24,9 +24,6 @@ To bump to a new version do the following: [remote "stable"] url = https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable fetch = +refs/heads/*:refs/remotes/stable/* -[remote "aufs"] - url = http://git.code.sf.net/p/aufs/aufs3-linux - fetch = +refs/heads/*:refs/remotes/aufs/* ``` 3) git fetch --all @@ -35,8 +32,6 @@ To bump to a new version do the following: 4) git reset --hard v3.10.10 -5) git pull . aufs/aufs-3.10 - 5a) apply any coreos-specific patches that are not yet upstream (i.e. 9p patch) that happened to be in a previous kernel branch.