From b865810273a395befd09ee2d817aeaa9de1548ef Mon Sep 17 00:00:00 2001 From: Alex Polvi Date: Wed, 15 Jan 2014 19:13:38 -0800 Subject: [PATCH 1/2] usr(gmerge): install to /usr --- .../{gmerge-0.0.1-r569.ebuild => gmerge-0.0.1-r570.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-r569.ebuild => gmerge-0.0.1-r570.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r569.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r570.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r569.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r570.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 aeb54e81a2..6a61464592 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 @@ -28,7 +28,7 @@ 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. From bdbc05517ab5f2e28fe4e373a9e56dc9e712aed9 Mon Sep 17 00:00:00 2001 From: Alex Polvi Date: Wed, 15 Jan 2014 19:26:22 -0800 Subject: [PATCH 2/2] remove docs --- .../coreos-overlay/coreos-base/gmerge/gmerge-0.0.1.ebuild | 1 - 1 file changed, 1 deletion(-) 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 6a61464592..5f97df7c40 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 @@ -27,7 +27,6 @@ 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