commit fbae7a04aa0160ac18410752db37337ff1667a59
author Mike Frysinger <vapier@chromium.org> Sat Feb 23 18:47:57 2019 -0500
committer chrome-bot <chrome-bot@chromium.org> Sun Mar 03 02:57:48 2019 -0800
tree cd1a46a0e6177aa0a3c37a933828975e7844e8c4
parent 2a3c64eb61a2fad7f034259bf1d785548ff05a92

dev-install: drop custom make.conf file

Now that portage is able to load the settings it needs without this
config file (since /usr/share/portage is in the base image), drop it
from the install.

BUG=chromium:935142
TEST=dev_install still works
CQ-DEPEND=CL:1495194, CL:1497670

Change-Id: I801bae85d9363404020fa8449a90c60732d4d1dd
Reviewed-on: https://chromium-review.googlesource.com/1497667
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Amin Hassani <ahassani@chromium.org>

dev-install/dev_install

diff --git a/dev-install/dev_install b/dev-install/dev_install
index a78dbdf..cda89d8 100755
--- a/dev-install/dev_install
+++ b/dev-install/dev_install
@@ -137,7 +137,6 @@
 configure_emerge() {
   # Copy emerge configuration to /usr/local.
   mkdir -p -m 0755 "${P_CONFIG_DEVELOPER}"
-  cp "${P_CONFIG_CROS}/make.profile/make.conf" "${P_CONFIG_DEVELOPER}"
   # The source files might be symlinks, and we'll probably clobber/update things
   # ourselves locally, so dereference all the symlinks for our local copy.
   cp -rfL "${P_CONFIG_CROS}/make.profile" "${P_CONFIG_DEVELOPER}/make.profile"
@@ -158,7 +157,7 @@
   mkdir -p -m 0755 "${RPMDIR}"
   mkdir -p -m 0755 "${PORTAGE_TMPDIR}"
   mkdir -p -m 0755 "${BUILD_PREFIX}"
-  echo "PORTAGE_BINHOST=${BINHOST}" >> "${P_CONFIG_DEVELOPER}/make.conf"
+  echo "PORTAGE_BINHOST=${BINHOST}" > "${P_CONFIG_DEVELOPER}/make.conf"
 
   # Add LD_LIBRARY_PATH within ebuild.sh.
   # TODO(arkaitzr): find out a cleaner way to do this.

dev-install/make.conf

diff --git a/dev-install/make.conf b/dev-install/make.conf
deleted file mode 100644
index e3e3a57..0000000
--- a/dev-install/make.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Get the default configuration.
-source /usr/local/share/portage/config/make.globals
-
-# Include overrides for using /usr/local.
-source /usr/local/etc/portage/make.profile/make.defaults
-