From 5ca6c35dcd61c1bfa0edfa5af96438795498647a Mon Sep 17 00:00:00 2001 From: Alex Polvi Date: Wed, 15 Jan 2014 20:37:42 -0800 Subject: [PATCH 1/2] usr(gmerge): use regular /etc/ instead of /usr/local --- .../{gmerge-0.0.1-r570.ebuild => gmerge-0.0.1-r571.ebuild} | 0 .../coreos-overlay/coreos-base/gmerge/gmerge-0.0.1.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/{gmerge-0.0.1-r570.ebuild => gmerge-0.0.1-r571.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r570.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r571.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r570.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r571.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 5f97df7c40..a3c9822829 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 @@ -33,6 +33,6 @@ src_install() { # 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 /usr/local/etc/make.profile/package.provided + insinto /etc/make.profile/package.provided newins "${CHROMEOS_PROFILE}"/package.provided coreos } From 868b5ba1eac76eb2f4851397a59c70fe81219c08 Mon Sep 17 00:00:00 2001 From: Alex Polvi Date: Wed, 15 Jan 2014 20:44:03 -0800 Subject: [PATCH 2/2] fix 9999 ebuild --- .../coreos-overlay/coreos-base/gmerge/gmerge-9999.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 1ea9d7d09a..cdc4078614 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 @@ -27,12 +27,12 @@ CHROMEOS_PROFILE="/usr/local/portage/coreos/profiles/coreos/targets/generic" src_install() { # Install tools from platform/dev into /usr/local/bin - into /usr/local + 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 /usr/local/etc/make.profile/package.provided + insinto /etc/make.profile/package.provided newins "${CHROMEOS_PROFILE}"/package.provided coreos }