diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/include-coreos-auth b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/include-coreos-auth index cc7be37a5b..23073d803d 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/include-coreos-auth +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/include-coreos-auth @@ -1 +1 @@ -auth include chromeos-auth +auth include coreos-auth diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild index 21b0a33ac9..db5972c870 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild @@ -154,7 +154,7 @@ RDEPEND="${RDEPEND} # Host dependencies that are needed for delta_generator. RDEPEND="${RDEPEND} - chromeos-base/update_engine + coreos-base/update_engine " # Host dependencies to run unit tests within the chroot diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host index fdf7b81239..d6f9bf5c62 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host +++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host @@ -11,7 +11,7 @@ FEATURES="allow-missing-manifests buildpkg clean-logs -collision-protect # Since our portage comes from version control, we redirect distfiles DISTDIR="/var/lib/portage/distfiles" -PORTDIR="/usr/local/portage/stable" +PORTDIR="/usr/portage/" # We initialize PORTDIR_OVERLAY here to clobber any redefinitions elsewhere. # This has to be the first overlay so crossdev finds the correct gcc and @@ -42,8 +42,7 @@ PORTAGE_BINHOST="$PREFLIGHT_BINHOST $FULL_BINHOST" # expat needed for XML parsing in GDB, but enable globally as overhead is tiny. USE="${USE} -cups hardened cros_host multilib pic pie -introspection expat" -GENTOO_MIRRORS="https://commondatastorage.googleapis.com/chromeos-localmirror" -GENTOO_MIRRORS="$GENTOO_MIRRORS https://commondatastorage.googleapis.com/chromeos-mirror/gentoo" +GENTOO_MIRRORS="http://gentoo.osuosl.org/" # Remove all .la files for non-plugin libraries. # Remove Gentoo init files since we use upstart. diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target index 63e3875ee3..4fc05584b6 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target +++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target @@ -58,9 +58,8 @@ PORTAGE_BINPKG_TAR_OPTS="--checkpoint=1000" # Since our portage comes from version control, we redirect distfiles. DISTDIR="/var/lib/portage/distfiles-target" -# Our chromium mirror should be more stable since we won't discard packages. -GENTOO_MIRRORS="https://commondatastorage.googleapis.com/chromeos-localmirror" -GENTOO_MIRRORS="$GENTOO_MIRRORS https://commondatastorage.googleapis.com/chromeos-mirror/gentoo" +# TODO: Our mirror should be more stable since we won't discard packages. +GENTOO_MIRRORS="http://gentoo.osuosl.org/" # Username and home directory of the shared user. SHARED_USER_NAME="chronos" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/package.use index 86860e508d..345b0da719 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/package.use @@ -11,7 +11,7 @@ app-arch/pbzip2 static app-arch/pigz static sys-libs/zlib static-libs -chromeos-base/update_engine delta_generator +coreos-base/update_engine delta_generator dev-embedded/openocd ftdi net-misc/openssh kerberos sys-apps/flashrom dediprog ft2232_spi serprog diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/categories b/sdk_container/src/third_party/coreos-overlay/profiles/categories index 2a6cbf388a..d730b20cd7 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/categories +++ b/sdk_container/src/third_party/coreos-overlay/profiles/categories @@ -23,7 +23,7 @@ app-shells app-text app-vim app-xemacs -chromeos-base +coreos-base dev-ada dev-cpp dev-db diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.keywords b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.keywords index f958d00aab..ad9dbf2eca 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.keywords @@ -113,13 +113,4 @@ =x11-proto/xf86dgaproto-2.1 amd64 arm x86 =x11-proto/xf86vidmodeproto-2.3 amd64 arm x86 -# TODO: Remove when we have a proper chrome package. -=www-client/chromium-bin-4.0.222.4_p28661 amd64 arm x86 - -# If a newer version of chrome causes flaky failure, you can add -# something like below, which assumes 15.0.859.0_rc-r1 was the -# last non-flaky version. -# This pins Chrome to the version below by marking more recent versions as unstable. -#>chromeos-base/chromeos-chrome-22.0.1229.1_rc-r1 -amd64 -arm -x86 ~amd64 ~arm ~x86 - =dev-embedded/openocd-0.4.0 amd64 x86 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.mask b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.mask index 9e653c1810..a6964c8b56 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.mask @@ -36,10 +36,6 @@ # Custom patches >=sys-boot/syslinux-3.84 -# chromeos-chrome-14.0.787.0_rc-1 causes test failures, so block it. -# TODO(davidjames): Remove this once the bug is fixed. -=chromeos-base/chromeos-chrome-14.0.787.0_rc-r1 - # This is unloved by mesa, and should never be pulled into the targets. # It is actually for clang and ASAN that we want to have edge versions. =sys-devel/llvm-3.2_pre* diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.use index acb94c3ca2..eb355fec2f 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.use @@ -21,8 +21,7 @@ dev-python/pyudev pygobject dev-util/dialog -unicode minimal dev-util/perf -doc -demangle -tui -ncurses -perl -python dev-util/perf-next -doc -demangle -tui -ncurses -perl -python -chromeos-base/chromeos-chrome build_tests -chromeos-base/vboot_reference minimal +coreos-base/vboot_reference minimal media-gfx/imagemagick png media-libs/freeimage png media-libs/libdvdread -css