From 43c26c6cc90c3665d7c986aa32c85eec5c27c06d Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 5 Dec 2013 23:07:15 -0800 Subject: [PATCH] fix(coreos-base/gmerge): Remove reference to old package.provided file A case of binary packages masking breakage, didn't notice this broke because I didn't happen to trigger a build of gmerge during my testing. This package.provided file contained the hackily installed toolchain which is now handled via a normal emerge instead. --- .../{gmerge-0.0.1-r568.ebuild => gmerge-0.0.1-r569.ebuild} | 0 .../coreos-overlay/coreos-base/gmerge/gmerge-0.0.1.ebuild | 5 ----- .../coreos-overlay/coreos-base/gmerge/gmerge-9999.ebuild | 5 ----- 3 files changed, 10 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/{gmerge-0.0.1-r568.ebuild => gmerge-0.0.1-r569.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r568.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r569.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r568.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r569.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1.ebuild index 44da19bd1e..aeb54e81a2 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1.ebuild @@ -32,13 +32,8 @@ src_install() { dobin gmerge stateful_update crdev # Setup package.provided so that gmerge will know what packages to ignore. - # - $ROOT/etc/portage/profile/package.provided contains compiler tools and - # and is setup by setup_board. We know that that file will be present in - # $ROOT because the initial compile of packages takes place in - # /build/$BOARD. # - $CHROMEOS_PROFILE/package.provided contains packages that we don't # want to install to the device. insinto /usr/local/etc/make.profile/package.provided - newins "${SYSROOT}"/etc/portage/profile/package.provided compiler newins "${CHROMEOS_PROFILE}"/package.provided coreos } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-9999.ebuild index d07503c72a..1ea9d7d09a 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-9999.ebuild @@ -31,13 +31,8 @@ src_install() { dobin gmerge stateful_update crdev # Setup package.provided so that gmerge will know what packages to ignore. - # - $ROOT/etc/portage/profile/package.provided contains compiler tools and - # and is setup by setup_board. We know that that file will be present in - # $ROOT because the initial compile of packages takes place in - # /build/$BOARD. # - $CHROMEOS_PROFILE/package.provided contains packages that we don't # want to install to the device. insinto /usr/local/etc/make.profile/package.provided - newins "${SYSROOT}"/etc/portage/profile/package.provided compiler newins "${CHROMEOS_PROFILE}"/package.provided coreos }