From df686e732bbcb49151d9d42a6e9adfed212d0bee Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 22 Jan 2014 17:05:05 -0800 Subject: [PATCH] fix(coreos-base/gmerge): Don't create /etc/make.profile This conflicts with /etc/portage/make.profile in the chroot, generating lots of warnings. This was always a weird hack anyway. Instead lets start configuring portage properly in dev images, this will be handled in the build scripts. --- ...{gmerge-0.0.1-r572.ebuild => gmerge-0.0.1-r573.ebuild} | 0 .../coreos-overlay/coreos-base/gmerge/gmerge-0.0.1.ebuild | 8 -------- .../coreos-overlay/coreos-base/gmerge/gmerge-9999.ebuild | 8 -------- 3 files changed, 16 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/{gmerge-0.0.1-r572.ebuild => gmerge-0.0.1-r573.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r572.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r573.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r572.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r573.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 08ad8788c6..e08178b371 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 @@ -24,15 +24,7 @@ RDEPEND="app-shells/bash sys-apps/portage" DEPEND="${RDEPEND}" -CHROMEOS_PROFILE="/usr/local/portage/coreos/profiles/coreos/targets/generic" - src_install() { into /usr dobin gmerge stateful_update crdev - - # Setup package.provided so that gmerge will know what packages to ignore. - # - $CHROMEOS_PROFILE/package.provided contains packages that we don't - # want to install to the device. - insinto /etc/make.profile/package.provided - 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 cdc4078614..0d68602da7 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 @@ -23,16 +23,8 @@ RDEPEND="app-shells/bash sys-apps/portage" DEPEND="${RDEPEND}" -CHROMEOS_PROFILE="/usr/local/portage/coreos/profiles/coreos/targets/generic" - src_install() { # Install tools from platform/dev into /usr/local/bin into /usr dobin gmerge stateful_update crdev - - # Setup package.provided so that gmerge will know what packages to ignore. - # - $CHROMEOS_PROFILE/package.provided contains packages that we don't - # want to install to the device. - insinto /etc/make.profile/package.provided - newins "${CHROMEOS_PROFILE}"/package.provided coreos }