diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r33.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r34.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r33.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r34.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild
index 9053cc01ea..820934d3c0 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild
@@ -30,6 +30,7 @@ DEPEND="
dev-libs/nss
dev-python/setuptools
dev-util/boost-build
+ dev-util/cargo
dev-util/checkbashisms
dev-util/patchelf
dev-vcs/repo
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/rustlib/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-libs/rustlib/Manifest
new file mode 100644
index 0000000000..ac8292b06d
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/rustlib/Manifest
@@ -0,0 +1,5 @@
+DIST cmake-0.1.24.crate 11525 SHA256 b8ebbb35d3dc9cd09497168f33de1acb79b265d350ab0ac34133b98f8509af1f SHA512 e8191d4f6b1474cb02fb66d2c32bd6a49c052bb91169a6091623a288f751a7ed595e4b07676c82687fc7fb55850631ff26a50016c56acdc0f74fa31b6a17ab84 WHIRLPOOL ab630d413b7550b9f864071e2fba729586429faee68ad52ac2c5a91b8adedd83c00d0b461601761bf5f0f179eb19a67e5f7f8a5d8390ec422bf110ed4b7540b0
+DIST filetime-0.1.10.crate 8884 SHA256 5363ab8e4139b8568a6237db5248646e5a8a2f89bd5ccb02092182b11fd3e922 SHA512 19245d71f60f144828adb6f9336adc5371e559decc8740338122327d28b7c548d011d9e6454b12475f0eb2db7dacdb1e2bfbef01311f59e8338f44d27c3345eb WHIRLPOOL 2af8d65033a9cef609d6688a32953c8ec9ac591ed6c357b62f86a028124d1a0c50199daadf839079771c00b4201971bacecc3928094fd77f9d4c872be8e01c10
+DIST gcc-0.3.51.crate 33348 SHA256 120d07f202dcc3f72859422563522b66fe6463a4c513df062874daad05f85f0a SHA512 0759969001bcc8104fb66beb7c42248d583a857d6b06bf6eb00e4ac1f72f63e1ec6a314f4a67a5d6c4b788eb6c891b98dd76dbf6f72dd74f8b33ab56087ca9a3 WHIRLPOOL 673f1b75f7e0cd8349f24659ffc4d8e1d6cfe64d52b30538902576c6b3b1732caeee7f9ab025400a12fca012eb6ad71b62950dc167cbd513a162e71fae4f99ff
+DIST libc-0.2.26.crate 171187 SHA256 30885bcb161cf67054244d10d4a7f4835ffd58773bc72e07d35fecf472295503 SHA512 547d1705c372a8b46169262d277c6d8129fdab8c00d3e6a62827b8ab5eb5948e8bc8c7643d0b2abfbed778ca97993f1fa47eabff1db76f315c64c02aa4b60617 WHIRLPOOL c5b786cd4636d71a215be117ea041fd5f5f80edda0d9c2afd9c90e4a9ba7509e158cffd8ba5a737bda3864603c06c41511c7657702fbdf95aac3b8298e3952bc
+DIST rustc-1.19.0-src.tar.gz 50108626 SHA256 15231f5053fb72ad82be91f5abfd6aa60cb7898c5089e4f1ac5910a731090c51 SHA512 080a8625fc15bc4fc17ab910bdcc0d9a88ce8922f1a3eb241d0f956b5799e4db6df45ebabb5497295c198be08686e5a94dff65569582fc6a5ecb9200cfee5c24 WHIRLPOOL 1dabcc0966a2e69f6c8105e39b82f31bc1c64803318c3a82f63f82afbc67e566d6969568678e86079e1fb515f73feb23d981920c232d836d297abf58010612fe
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/rustlib/metadata.xml b/sdk_container/src/third_party/coreos-overlay/dev-libs/rustlib/metadata.xml
new file mode 100644
index 0000000000..097975e3ad
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/rustlib/metadata.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/rustlib/rustlib-1.19.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/rustlib/rustlib-1.19.0.ebuild
new file mode 100644
index 0000000000..00ee2483c9
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/rustlib/rustlib-1.19.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 2017 CoreOS, Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit coreos-cargo
+
+DESCRIPTION="Standard libraries for Rust"
+HOMEPAGE="http://www.rust-lang.org/"
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+
+CRATES="
+cmake-0.1.24
+filetime-0.1.10
+gcc-0.3.51
+libc-0.2.26
+"
+SRC_URI="
+https://static.rust-lang.org/dist/rustc-${PV}-src.tar.gz
+$(cargo_crate_uris ${CRATES})
+"
+S="${WORKDIR}/rustc-${PV}-src"
+
+RDEPEND="!dev-lang/rust"
+
+SLOT="0"
+KEYWORDS="amd64 arm64"
+
+src_configure() {
+ # get rid of the top level Cargo.toml or else cargo tries to use this one
+ # too, and we don't want that since we aren't building the whole compiler
+ rm src/Cargo.toml
+
+ # Wrap ar for gcc-rs to work around rust-lang/cargo#4456.
+ export TARGET_AR="${T}/rustproof-ar"
+ cat <<- EOF > "${TARGET_AR}" && chmod 0755 "${TARGET_AR}"
+ #!/bin/sh
+ unset LD_LIBRARY_PATH
+ exec $(tc-getAR) "\$@"
+ EOF
+
+ # Wrap gcc for gcc-rs to work around rust-lang/cargo#4456.
+ export TARGET_CC="${T}/rustproof-cc"
+ cat <<- EOF > "${TARGET_CC}" && chmod 0755 "${TARGET_CC}"
+ #!/bin/sh
+ unset LD_LIBRARY_PATH
+ exec $(tc-getCC) "\$@"
+ EOF
+
+ # Wrap g++ for gcc-rs to work around rust-lang/cargo#4456.
+ export TARGET_CXX="${T}/rustproof-cxx"
+ cat <<- EOF > "${TARGET_CXX}" && chmod 0755 "${TARGET_CXX}"
+ #!/bin/sh
+ unset LD_LIBRARY_PATH
+ exec $(tc-getCXX) "\$@"
+ EOF
+
+ # Make cargo use the wrappers as well.
+ sed -i \
+ -e "s,^ar *=.*,ar = \"${TARGET_AR}\"," \
+ -e "s,^linker *=.*,linker = \"${TARGET_CC}\"," \
+ "${ECARGO_HOME}/config"
+}
+
+src_compile() {
+ # put the target dir somewhere predictable
+ local -x CARGO_TARGET_DIR="${T}/target"
+ # look up required crates in our fake registry
+ local -x CARGO_HOME="${ECARGO_HOME}"
+ # fake out the compiler so that it lets us use #!feature attributes
+ # really building the std libs is bootstrapping anyway, so I don't feel bad
+ local -x RUSTC_BOOTSTRAP=1
+ # various required flags for compiling thes std libs
+ local -x RUSTFLAGS="-Z force-unstable-if-unmarked"
+ # make sure we can find the custom ChromeOS target definitions
+ local -x RUST_TARGET_PATH="/usr/$(get_libdir)/rustlib"
+
+ # build the std lib, which also builds all the other important libraries
+ # (core, collections, etc). build it for the target we want for this build.
+ # also make sure that the jemalloc libraries are included.
+ local -a features=( $(usex debug debug-jemalloc jemalloc) panic-unwind )
+ cargo build -p std -v $(usex debug '' --release) \
+ --features "${features[*]}" \
+ --manifest-path src/libstd/Cargo.toml \
+ --target "${RUST_TARGET}"
+
+ # Correct the directory name prior to installing it.
+ mv "${T}/target/${RUST_TARGET}/release/deps" "${T}/target/${RUST_TARGET}/release/lib"
+}
+
+src_install() {
+ insinto "/usr/$(get_libdir)/rustlib/${RUST_TARGET}"
+ doins -r "${T}/target/${RUST_TARGET}/release/lib"
+}
diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-cargo.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-cargo.eclass
new file mode 100644
index 0000000000..5ebe69be1d
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-cargo.eclass
@@ -0,0 +1,77 @@
+# Copyright 2017 CoreOS, Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: coreos-cargo.eclass
+# @MAINTAINER:
+# team-os@coreos.com
+# @AUTHOR:
+# David Michael
+# @BLURB: cargo cross-compilation support for CoreOS/ChromeOS targets
+
+if [[ -z ${_COREOS_CARGO_ECLASS} ]]; then
+_COREOS_CARGO_ECLASS=1
+
+# XXX: Don't require host dependencies to also be in the sysroot.
+CATEGORY=dev-util PN=cargo inherit cargo
+inherit toolchain-funcs
+
+EXPORT_FUNCTIONS src_unpack
+
+[[ ${CATEGORY}/${PN} != dev-libs/rustlib ]] && DEPEND="|| (
+ dev-libs/rustlib
+ dev-util/cargo
+)"
+
+# @FUNCTION: coreos-cargo_src_unpack
+# @DESCRIPTION:
+# This amends the src_unpack from cargo.eclass to add support for Rust
+# cross-compiling to the ChromeOS targets. It maps the host triplet to
+# one built into rustc and uses the board root as its sysroot.
+coreos-cargo_src_unpack() {
+ debug-print-function ${FUNCNAME} "$@"
+ cargo_src_unpack "$@"
+
+ [[ ${CBUILD:-${CHOST}} != ${CHOST} ]] || return 0
+
+ # Define the cross-compilers for rust-gcc commands.
+ export TARGET_AR="$(tc-getAR)"
+ export TARGET_CC="$(tc-getCC)"
+ export TARGET_CFLAGS="${CFLAGS}"
+ export TARGET_CXX="$(tc-getCXX)"
+ export TARGET_CXXFLAGS="${CXXFLAGS}"
+
+ # Map the SDK host triplet to one that is built into rustc.
+ function rust_builtin_target() case "$1" in
+ aarch64-*-linux-gnu) echo aarch64-unknown-linux-gnu ;;
+ x86_64-*-linux-gnu) echo x86_64-unknown-linux-gnu ;;
+ *) die "Unknown host triplet: $1" ;;
+ esac
+
+ # Allow searching host libraries when targeting incompatible systems.
+ export RUST_TARGET=$(rust_builtin_target "${CHOST}")
+ local build_triplet=$(rust_builtin_target "${CBUILD}")
+ [[ ${RUST_TARGET} = ${build_triplet} ]] ||
+ local crossflags="-L /usr/lib64/rustlib/${build_triplet}/lib"
+
+ # Create a compiler wrapper to work around rust-lang/cargo#4456.
+ if [[ ${CATEGORY}/${PN} != dev-libs/rustlib ]]; then
+ cat <<- EOF > "${T}/wrustc" && chmod 0755 "${T}/wrustc"
+ #!/bin/sh
+ exec rustc --sysroot="${ROOT:-/}usr" ${crossflags-} "\$@"
+ EOF
+ export RUSTC="${T}/wrustc"
+ fi
+
+ # Compile for the built-in target, using the SDK cross-tools.
+ cat <<- EOF >> "${ECARGO_HOME}/config"
+
+ [build]
+ target = "${RUST_TARGET}"
+
+ [target.${RUST_TARGET}]
+ ar = "${TARGET_AR}"
+ linker = "${TARGET_CC}"
+ EOF
+}
+
+fi
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/locksmith-0.5.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/locksmith-0.6.0
similarity index 96%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/locksmith-0.5.0
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/locksmith-0.6.0
index dfe851972a..281c2bdc8b 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/locksmith-0.5.0
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/locksmith-0.6.0
@@ -9,4 +9,4 @@ LICENSE=Apache-2.0
REQUIRED_USE=go_version_go1_7
SLOT=0
_eclasses_=coreos-go 1eab220bf637f29eebeb6ae0f31ef484 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b git-r3 cbafa3261c37c7e3af44bb16a34ea390 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=010e0c33cf7176b0685c343e05366654
+_md5_=8bf6a9db5c3af545e979fc3e93a4c0fe
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/locksmith-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/locksmith-9999
index a22947178d..03bf02dc21 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/locksmith-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/locksmith-9999
@@ -9,4 +9,4 @@ LICENSE=Apache-2.0
REQUIRED_USE=go_version_go1_7
SLOT=0
_eclasses_=coreos-go 1eab220bf637f29eebeb6ae0f31ef484 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b git-r3 cbafa3261c37c7e3af44bb16a34ea390 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=010e0c33cf7176b0685c343e05366654
+_md5_=8bf6a9db5c3af545e979fc3e93a4c0fe
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-17.06.2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-17.06.2-r1
similarity index 97%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-17.06.2
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-17.06.2-r1
index f798d7cb7b..9f1a489ddb 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-17.06.2
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-17.06.2-r1
@@ -12,4 +12,4 @@ RESTRICT=installsources strip
SLOT=0
SRC_URI=https://github.com/docker/docker-ce/archive/v17.06.2-ce.tar.gz -> docker-17.06.2.tar.gz
_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 udev d91cac2c73b94629cad2daea66e0d182 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=935be9e9d82a2c7a7615dc777eaf4cf5
+_md5_=4fa2009bab07870cc3f8438745fd06c6
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-9999
index a6c0c64367..9e93cc3e6b 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-9999
@@ -11,4 +11,4 @@ REQUIRED_USE=go_version_go1_8
RESTRICT=installsources strip
SLOT=0
_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b git-r3 cbafa3261c37c7e3af44bb16a34ea390 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 udev d91cac2c73b94629cad2daea66e0d182 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=935be9e9d82a2c7a7615dc777eaf4cf5
+_md5_=4fa2009bab07870cc3f8438745fd06c6
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-text/marker-0.5.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-text/marker-0.5.0
deleted file mode 100644
index 870d6fc9b0..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-text/marker-0.5.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Rust testing repo
-EAPI=6
-HOMEPAGE=https://github.com/crawford/marker
-IUSE=debug
-KEYWORDS=amd64 arm64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://crates.io/api/v1/crates/marker/0.5.0/download -> marker-0.5.0.crate https://crates.io/api/v1/crates/ansi_term/0.9.0/download -> ansi_term-0.9.0.crate https://crates.io/api/v1/crates/atty/0.2.2/download -> atty-0.2.2.crate https://crates.io/api/v1/crates/base64/0.6.0/download -> base64-0.6.0.crate https://crates.io/api/v1/crates/bitflags/0.7.0/download -> bitflags-0.7.0.crate https://crates.io/api/v1/crates/bitflags/0.9.1/download -> bitflags-0.9.1.crate https://crates.io/api/v1/crates/byteorder/1.1.0/download -> byteorder-1.1.0.crate https://crates.io/api/v1/crates/clap/2.26.0/download -> clap-2.26.0.crate https://crates.io/api/v1/crates/coco/0.1.1/download -> coco-0.1.1.crate https://crates.io/api/v1/crates/conv/0.3.3/download -> conv-0.3.3.crate https://crates.io/api/v1/crates/custom_derive/0.1.7/download -> custom_derive-0.1.7.crate https://crates.io/api/v1/crates/either/1.1.0/download -> either-1.1.0.crate https://crates.io/api/v1/crates/futures/0.1.15/download -> futures-0.1.15.crate https://crates.io/api/v1/crates/gcc/0.3.53/download -> gcc-0.3.53.crate https://crates.io/api/v1/crates/getopts/0.2.14/download -> getopts-0.2.14.crate https://crates.io/api/v1/crates/httparse/1.2.3/download -> httparse-1.2.3.crate https://crates.io/api/v1/crates/hyper/0.10.13/download -> hyper-0.10.13.crate https://crates.io/api/v1/crates/hyper-rustls/0.6.1/download -> hyper-rustls-0.6.1.crate https://crates.io/api/v1/crates/idna/0.1.4/download -> idna-0.1.4.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/language-tags/0.2.2/download -> language-tags-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.8/download -> lazy_static-0.2.8.crate https://crates.io/api/v1/crates/libc/0.2.29/download -> libc-0.2.29.crate https://crates.io/api/v1/crates/log/0.3.8/download -> log-0.3.8.crate https://crates.io/api/v1/crates/magenta/0.1.1/download -> magenta-0.1.1.crate https://crates.io/api/v1/crates/magenta-sys/0.1.1/download -> magenta-sys-0.1.1.crate https://crates.io/api/v1/crates/matches/0.1.6/download -> matches-0.1.6.crate https://crates.io/api/v1/crates/mime/0.2.6/download -> mime-0.2.6.crate https://crates.io/api/v1/crates/num_cpus/1.6.2/download -> num_cpus-1.6.2.crate https://crates.io/api/v1/crates/percent-encoding/1.0.0/download -> percent-encoding-1.0.0.crate https://crates.io/api/v1/crates/pulldown-cmark/0.0.15/download -> pulldown-cmark-0.0.15.crate https://crates.io/api/v1/crates/rand/0.3.16/download -> rand-0.3.16.crate https://crates.io/api/v1/crates/rayon/0.7.1/download -> rayon-0.7.1.crate https://crates.io/api/v1/crates/rayon/0.8.2/download -> rayon-0.8.2.crate https://crates.io/api/v1/crates/rayon-core/1.2.1/download -> rayon-core-1.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.30/download -> redox_syscall-0.1.30.crate https://crates.io/api/v1/crates/ring/0.11.0/download -> ring-0.11.0.crate https://crates.io/api/v1/crates/rustls/0.9.0/download -> rustls-0.9.0.crate https://crates.io/api/v1/crates/safemem/0.2.0/download -> safemem-0.2.0.crate https://crates.io/api/v1/crates/same-file/0.1.3/download -> same-file-0.1.3.crate https://crates.io/api/v1/crates/scopeguard/0.3.2/download -> scopeguard-0.3.2.crate https://crates.io/api/v1/crates/strsim/0.6.0/download -> strsim-0.6.0.crate https://crates.io/api/v1/crates/term_size/0.3.0/download -> term_size-0.3.0.crate https://crates.io/api/v1/crates/textwrap/0.7.0/download -> textwrap-0.7.0.crate https://crates.io/api/v1/crates/time/0.1.38/download -> time-0.1.38.crate https://crates.io/api/v1/crates/traitobject/0.1.0/download -> traitobject-0.1.0.crate https://crates.io/api/v1/crates/typeable/0.1.2/download -> typeable-0.1.2.crate https://crates.io/api/v1/crates/unicase/1.4.2/download -> unicase-1.4.2.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.5/download -> unicode-normalization-0.1.5.crate https://crates.io/api/v1/crates/unicode-segmentation/1.2.0/download -> unicode-segmentation-1.2.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.4/download -> unicode-width-0.1.4.crate https://crates.io/api/v1/crates/untrusted/0.5.0/download -> untrusted-0.5.0.crate https://crates.io/api/v1/crates/url/1.5.1/download -> url-1.5.1.crate https://crates.io/api/v1/crates/vec_map/0.8.0/download -> vec_map-0.8.0.crate https://crates.io/api/v1/crates/version_check/0.1.3/download -> version_check-0.1.3.crate https://crates.io/api/v1/crates/walkdir/1.0.7/download -> walkdir-1.0.7.crate https://crates.io/api/v1/crates/webpki/0.14.0/download -> webpki-0.14.0.crate https://crates.io/api/v1/crates/webpki-roots/0.11.0/download -> webpki-roots-0.11.0.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate
-_eclasses_=cargo 4a14060dec0a7e707d952d502c09ca2e coreos-cargo 9dd7d23f63478f52578e57dcfdb6d5a1 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=f528aba716ce2e8155dc94194d225e47
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-text/sync-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-text/sync-9999
deleted file mode 100644
index d5b0b7b2d9..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-text/sync-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Rust testing repo
-EAPI=6
-HOMEPAGE=https://github.com/crawford/marker
-IUSE=debug
-KEYWORDS=amd64 arm64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=pages-master.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.5.3/download -> aho-corasick-0.5.3.crate https://crates.io/api/v1/crates/ansi_term/0.9.0/download -> ansi_term-0.9.0.crate https://crates.io/api/v1/crates/atty/0.2.2/download -> atty-0.2.2.crate https://crates.io/api/v1/crates/base64/0.2.1/download -> base64-0.2.1.crate https://crates.io/api/v1/crates/bitflags/0.8.2/download -> bitflags-0.8.2.crate https://crates.io/api/v1/crates/clap/2.23.3/download -> clap-2.23.3.crate https://crates.io/api/v1/crates/deque/0.3.2/download -> deque-0.3.2.crate https://crates.io/api/v1/crates/filetime/0.1.10/download -> filetime-0.1.10.crate https://crates.io/api/v1/crates/flate2/0.2.19/download -> flate2-0.2.19.crate https://crates.io/api/v1/crates/gcc/0.3.45/download -> gcc-0.3.45.crate https://crates.io/api/v1/crates/httparse/1.2.2/download -> httparse-1.2.2.crate https://crates.io/api/v1/crates/hyper/0.10.9/download -> hyper-0.10.9.crate https://crates.io/api/v1/crates/hyper-rustls/0.3.3/download -> hyper-rustls-0.3.3.crate https://crates.io/api/v1/crates/idna/0.1.1/download -> idna-0.1.1.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/language-tags/0.2.2/download -> language-tags-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.8/download -> lazy_static-0.2.8.crate https://crates.io/api/v1/crates/libc/0.2.22/download -> libc-0.2.22.crate https://crates.io/api/v1/crates/linked-hash-map/0.3.0/download -> linked-hash-map-0.3.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.4.2/download -> linked-hash-map-0.4.2.crate https://crates.io/api/v1/crates/log/0.3.7/download -> log-0.3.7.crate https://crates.io/api/v1/crates/matches/0.1.4/download -> matches-0.1.4.crate https://crates.io/api/v1/crates/memchr/0.1.11/download -> memchr-0.1.11.crate https://crates.io/api/v1/crates/mime/0.2.3/download -> mime-0.2.3.crate https://crates.io/api/v1/crates/miniz-sys/0.1.9/download -> miniz-sys-0.1.9.crate https://crates.io/api/v1/crates/num-traits/0.1.37/download -> num-traits-0.1.37.crate https://crates.io/api/v1/crates/num_cpus/1.4.0/download -> num_cpus-1.4.0.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/rand/0.3.15/download -> rand-0.3.15.crate https://crates.io/api/v1/crates/rayon/0.7.0/download -> rayon-0.7.0.crate https://crates.io/api/v1/crates/rayon-core/1.0.0/download -> rayon-core-1.0.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.17/download -> redox_syscall-0.1.17.crate https://crates.io/api/v1/crates/regex/0.1.80/download -> regex-0.1.80.crate https://crates.io/api/v1/crates/regex-syntax/0.3.9/download -> regex-syntax-0.3.9.crate https://crates.io/api/v1/crates/ring/0.7.5/download -> ring-0.7.5.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/rustc_version/0.1.7/download -> rustc_version-0.1.7.crate https://crates.io/api/v1/crates/rustls/0.5.8/download -> rustls-0.5.8.crate https://crates.io/api/v1/crates/same-file/0.1.3/download -> same-file-0.1.3.crate https://crates.io/api/v1/crates/semver/0.1.20/download -> semver-0.1.20.crate https://crates.io/api/v1/crates/semver/0.6.0/download -> semver-0.6.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.2/download -> serde-1.0.2.crate https://crates.io/api/v1/crates/serde_derive/1.0.2/download -> serde_derive-1.0.2.crate https://crates.io/api/v1/crates/serde_derive_internals/0.15.0/download -> serde_derive_internals-0.15.0.crate https://crates.io/api/v1/crates/serde_yaml/0.7.0/download -> serde_yaml-0.7.0.crate https://crates.io/api/v1/crates/strsim/0.6.0/download -> strsim-0.6.0.crate https://crates.io/api/v1/crates/syn/0.11.11/download -> syn-0.11.11.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/tar/0.4.11/download -> tar-0.4.11.crate https://crates.io/api/v1/crates/term_size/0.3.0/download -> term_size-0.3.0.crate https://crates.io/api/v1/crates/thread-id/2.0.0/download -> thread-id-2.0.0.crate https://crates.io/api/v1/crates/thread_local/0.2.7/download -> thread_local-0.2.7.crate https://crates.io/api/v1/crates/time/0.1.37/download -> time-0.1.37.crate https://crates.io/api/v1/crates/traitobject/0.1.0/download -> traitobject-0.1.0.crate https://crates.io/api/v1/crates/typeable/0.1.2/download -> typeable-0.1.2.crate https://crates.io/api/v1/crates/unicase/1.4.0/download -> unicase-1.4.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.2.5/download -> unicode-bidi-0.2.5.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.4/download -> unicode-normalization-0.1.4.crate https://crates.io/api/v1/crates/unicode-segmentation/1.1.0/download -> unicode-segmentation-1.1.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.4/download -> unicode-width-0.1.4.crate https://crates.io/api/v1/crates/unicode-xid/0.0.4/download -> unicode-xid-0.0.4.crate https://crates.io/api/v1/crates/untrusted/0.3.2/download -> untrusted-0.3.2.crate https://crates.io/api/v1/crates/url/1.4.0/download -> url-1.4.0.crate https://crates.io/api/v1/crates/utf8-ranges/0.1.3/download -> utf8-ranges-0.1.3.crate https://crates.io/api/v1/crates/vec_map/0.7.0/download -> vec_map-0.7.0.crate https://crates.io/api/v1/crates/walkdir/1.0.7/download -> walkdir-1.0.7.crate https://crates.io/api/v1/crates/webpki/0.10.2/download -> webpki-0.10.2.crate https://crates.io/api/v1/crates/webpki-roots/0.7.0/download -> webpki-roots-0.7.0.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/xattr/0.1.11/download -> xattr-0.1.11.crate https://crates.io/api/v1/crates/yaml-rust/0.3.5/download -> yaml-rust-0.3.5.crate
-_eclasses_=cargo 4a14060dec0a7e707d952d502c09ca2e coreos-cargo 9dd7d23f63478f52578e57dcfdb6d5a1 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=7f2fddf9e7efe3405dd4130d6e8089b6
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-17.06 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-17.06
index 981dd32b55..7497e23b95 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-17.06
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-17.06
@@ -3,6 +3,6 @@ DESCRIPTION=Packages to be installed in a torcx image for Docker
EAPI=2
KEYWORDS=amd64 arm64
LICENSE=GPL-2
-RDEPEND==app-emulation/docker-17.06.2 =app-emulation/containerd-0.2.9_p7 =app-emulation/docker-proxy-0.8.0_p20170410-r1 =app-emulation/docker-runc-1.0.0_rc3_p53 =dev-libs/libltdl-2.4.6 =sys-process/tini-0.13.2
+RDEPEND==app-emulation/docker-17.06.2-r1 =app-emulation/containerd-0.2.9_p7 =app-emulation/docker-proxy-0.8.0_p20170410-r1 =app-emulation/docker-runc-1.0.0_rc3_p53 =dev-libs/libltdl-2.4.6 =sys-process/tini-0.13.2
SLOT=0
-_md5_=98e80099bad683f3539afe6b6a4841f4
+_md5_=fd1b11ed47c221ccf1a10ae1abf4a144
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-metadata-0.12.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-metadata-0.13.0
similarity index 96%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-metadata-0.12.0
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-metadata-0.13.0
index 280f573346..23dd506a33 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-metadata-0.12.0
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-metadata-0.13.0
@@ -9,4 +9,4 @@ LICENSE=Apache-2.0
REQUIRED_USE=go_version_go1_7
SLOT=0
_eclasses_=coreos-go 1eab220bf637f29eebeb6ae0f31ef484 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b git-r3 cbafa3261c37c7e3af44bb16a34ea390 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=cb5b487ee19e6b2e28bc850123df83e8
+_md5_=13d82d7f153fde104d6cbd24b7fca141
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-metadata-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-metadata-9999
index 75602f2759..4c13ff5985 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-metadata-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-metadata-9999
@@ -9,4 +9,4 @@ LICENSE=Apache-2.0
REQUIRED_USE=go_version_go1_7
SLOT=0
_eclasses_=coreos-go 1eab220bf637f29eebeb6ae0f31ef484 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b git-r3 cbafa3261c37c7e3af44bb16a34ea390 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=cb5b487ee19e6b2e28bc850123df83e8
+_md5_=13d82d7f153fde104d6cbd24b7fca141
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-oracle-oci-0.1.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-oracle-oci-0.2.0
similarity index 77%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-oracle-oci-0.1.0
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-oracle-oci-0.2.0
index 45cfcab268..9a051a4223 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-oracle-oci-0.1.0
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-oracle-oci-0.2.0
@@ -4,4 +4,4 @@ EAPI=5
KEYWORDS=amd64 arm64 x86
LICENSE=Apache-2.0
SLOT=0
-_md5_=f336b5b32c10dc1686a8c7cf6deee61f
+_md5_=445c4239c10756c3dc70c3303d0be10f
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1
index e1cfc2478e..05fcf0877b 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1
@@ -1,10 +1,10 @@
DEFINED_PHASES=-
-DEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-backup/casync app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/mantle coreos-devel/kola-data dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/seismograph sys-boot/grub sys-boot/shim sys-devel/crossdev sys-firmware/edk2 sys-fs/btrfs-progs sys-fs/cryptsetup sys-fs/multipath-tools >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1
+DEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/mantle coreos-devel/kola-data dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/cargo dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/seismograph sys-boot/grub sys-boot/shim sys-devel/crossdev sys-firmware/edk2 sys-fs/btrfs-progs sys-fs/cryptsetup >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1
DESCRIPTION=Meta ebuild for everything that should be in the SDK.
EAPI=5
HOMEPAGE=http://coreos.com/docs/sdk/
KEYWORDS=amd64
LICENSE=GPL-2
-RDEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-backup/casync app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/mantle coreos-devel/kola-data dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/seismograph sys-boot/grub sys-boot/shim sys-devel/crossdev sys-firmware/edk2 sys-fs/btrfs-progs sys-fs/cryptsetup sys-fs/multipath-tools >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1
+RDEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/mantle coreos-devel/kola-data dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/cargo dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/seismograph sys-boot/grub sys-boot/shim sys-devel/crossdev sys-firmware/edk2 sys-fs/btrfs-progs sys-fs/cryptsetup >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1
SLOT=0
-_md5_=c780de01755cd67fab2c6ffe01924332
+_md5_=124fe36727a81e3f0ae8b28198c2a358
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r31 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r31
deleted file mode 100644
index e1cfc2478e..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r31
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-backup/casync app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/mantle coreos-devel/kola-data dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/seismograph sys-boot/grub sys-boot/shim sys-devel/crossdev sys-firmware/edk2 sys-fs/btrfs-progs sys-fs/cryptsetup sys-fs/multipath-tools >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1
-DESCRIPTION=Meta ebuild for everything that should be in the SDK.
-EAPI=5
-HOMEPAGE=http://coreos.com/docs/sdk/
-KEYWORDS=amd64
-LICENSE=GPL-2
-RDEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-backup/casync app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/mantle coreos-devel/kola-data dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/seismograph sys-boot/grub sys-boot/shim sys-devel/crossdev sys-firmware/edk2 sys-fs/btrfs-progs sys-fs/cryptsetup sys-fs/multipath-tools >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1
-SLOT=0
-_md5_=c780de01755cd67fab2c6ffe01924332
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r34 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r34
new file mode 100644
index 0000000000..05fcf0877b
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r34
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/mantle coreos-devel/kola-data dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/cargo dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/seismograph sys-boot/grub sys-boot/shim sys-devel/crossdev sys-firmware/edk2 sys-fs/btrfs-progs sys-fs/cryptsetup >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1
+DESCRIPTION=Meta ebuild for everything that should be in the SDK.
+EAPI=5
+HOMEPAGE=http://coreos.com/docs/sdk/
+KEYWORDS=amd64
+LICENSE=GPL-2
+RDEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/mantle coreos-devel/kola-data dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/cargo dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/seismograph sys-boot/grub sys-boot/shim sys-devel/crossdev sys-firmware/edk2 sys-fs/btrfs-progs sys-fs/cryptsetup >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1
+SLOT=0
+_md5_=124fe36727a81e3f0ae8b28198c2a358
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/rustlib-1.19.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/rustlib-1.19.0
new file mode 100644
index 0000000000..f153e6aea6
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/rustlib-1.19.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install unpack
+DESCRIPTION=Standard libraries for Rust
+EAPI=6
+HOMEPAGE=http://www.rust-lang.org/
+IUSE=debug
+KEYWORDS=amd64 arm64
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+RDEPEND=!dev-lang/rust
+SLOT=0
+SRC_URI=https://static.rust-lang.org/dist/rustc-1.19.0-src.tar.gz https://crates.io/api/v1/crates/cmake/0.1.24/download -> cmake-0.1.24.crate https://crates.io/api/v1/crates/filetime/0.1.10/download -> filetime-0.1.10.crate https://crates.io/api/v1/crates/gcc/0.3.51/download -> gcc-0.3.51.crate https://crates.io/api/v1/crates/libc/0.2.26/download -> libc-0.2.26.crate
+_eclasses_=cargo 4a14060dec0a7e707d952d502c09ca2e coreos-cargo 2fd9a1c87141382cdd6817395049f2df multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
+_md5_=6b284589d8504b4203cc13960ffef9bf
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-0.17.2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-0.18.0
similarity index 95%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-0.17.2
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-0.18.0
index 2d8068ea94..6f994644d2 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-0.17.2
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-0.18.0
@@ -7,6 +7,6 @@ IUSE=+go_version_go1_7 cros_workon_tree_* profiling
KEYWORDS=amd64 arm64
LICENSE=Apache-2.0
REQUIRED_USE=go_version_go1_7
-SLOT=0/0.17.2
+SLOT=0/0.18.0
_eclasses_=coreos-go 1eab220bf637f29eebeb6ae0f31ef484 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b git-r3 cbafa3261c37c7e3af44bb16a34ea390 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 udev d91cac2c73b94629cad2daea66e0d182
-_md5_=ed9b51d166f7e224112bff4f35add4af
+_md5_=b90893b69be7f6d3562cad048e935fd0
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-9999
index 480a7bec71..6804f1a7da 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-9999
@@ -9,4 +9,4 @@ LICENSE=Apache-2.0
REQUIRED_USE=go_version_go1_7
SLOT=0/9999
_eclasses_=coreos-go 1eab220bf637f29eebeb6ae0f31ef484 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b git-r3 cbafa3261c37c7e3af44bb16a34ea390 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 udev d91cac2c73b94629cad2daea66e0d182
-_md5_=ed9b51d166f7e224112bff4f35add4af
+_md5_=b90893b69be7f6d3562cad048e935fd0
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.13.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.13.1
similarity index 55%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.13.0-r1
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.13.1
index 56434928b5..05b65877eb 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.13.0-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.13.1
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile configure install prepare pretend setup unpack
-DEPEND==sys-kernel/coreos-modules-4.13.0-r1 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less sys-apps/sed sys-apps/shadow sys-apps/systemd[cryptsetup] sys-apps/seismograph sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/xfsprogs >=sys-kernel/coreos-firmware-20160331-r1:= >=sys-kernel/bootengine-0.0.4:= sys-kernel/dracut virtual/udev =sys-kernel/coreos-sources-4.13.0
+DEPEND==sys-kernel/coreos-modules-4.13.1 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less sys-apps/sed sys-apps/shadow sys-apps/systemd[cryptsetup] sys-apps/seismograph sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/xfsprogs >=sys-kernel/coreos-firmware-20160331-r1:= >=sys-kernel/bootengine-0.0.4:= sys-kernel/dracut virtual/udev =sys-kernel/coreos-sources-4.13.1
DESCRIPTION=CoreOS Linux kernel
EAPI=5
HOMEPAGE=http://www.kernel.org
KEYWORDS=amd64 arm64
LICENSE=GPL-2 freedist
-RDEPEND==sys-kernel/coreos-modules-4.13.0-r1
+RDEPEND==sys-kernel/coreos-modules-4.13.1
RESTRICT=binchecks strip
-SLOT=0/4.13.0-r1
+SLOT=0/4.13.1
_eclasses_=coreos-kernel e8feb48b1a123c62c678f86fd8ac3067 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
_md5_=3aeab4688cd614730782ba4883db8f80
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.13.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.13.1
similarity index 93%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.13.0-r1
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.13.1
index 6108cd2e0a..e64a2fab1d 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.13.0-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.13.1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
-DEPEND==sys-kernel/coreos-sources-4.13.0
+DEPEND==sys-kernel/coreos-sources-4.13.1
DESCRIPTION=CoreOS Linux kernel modules
EAPI=5
HOMEPAGE=http://www.kernel.org
@@ -8,6 +8,6 @@ KEYWORDS=amd64 arm64
LICENSE=GPL-2 freedist
RDEPEND=!=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
RESTRICT=binchecks strip
-SLOT=4.13.0
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz
+SLOT=4.13.1
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.13.1.xz mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea kernel-2 1241c87493492a950598df999f91e603 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
_md5_=d4b02ffeb5beac6c5434835d56f89a2e
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults
index aec8bcf5d8..6eb7b5cd05 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults
@@ -35,7 +35,7 @@ USE="${USE} -openmp"
POLICY_TYPES="targeted mcs mls"
# Disable packages or optional features with distribution issues.
-ACCEPT_RESTRICT="* -bindist -mirror"
+ACCEPT_RESTRICT="* -bindist"
USE="${USE} bindist"
# Default licenses that are accepted for ChromiumOS builds.
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.accept_keywords
index 701c9625da..48186d813c 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.accept_keywords
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.accept_keywords
@@ -2,3 +2,7 @@
dev-python/awscli ~amd64
dev-python/s3transfer ~amd64
dev-python/botocore ~amd64
+
+# Accept unstable host Rust compilers
+dev-lang/rust ~amd64
+dev-util/cargo ~amd64