From 6a362d27f99d81e09de69043fc4d2dff6e794578 Mon Sep 17 00:00:00 2001
From: Brandon Philips <brandon@ifup.co>
Date: Tue, 5 Feb 2013 18:43:10 -0800
Subject: [PATCH] fix(make_chroot): use the new places for make.conf

make.conf should live in /etc/portage these days

Change-Id: I55372ae3ee6a4ae7abf6873c08c1fcef46d7cd53
---
 sdk_lib/make_chroot.sh    | 10 +++++-----
 sdk_lib/make_conf_util.sh |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sdk_lib/make_chroot.sh b/sdk_lib/make_chroot.sh
index a52a8e4f4e..3a9b1b16aa 100755
--- a/sdk_lib/make_chroot.sh
+++ b/sdk_lib/make_chroot.sh
@@ -198,13 +198,13 @@ init_setup () {
    # TODO: This should really be part of a profile in the portage.
    info "Setting up /etc/make.*..."
    ln -sf "${CHROOT_CONFIG}/make.conf.amd64-host" \
-     "${FLAGS_chroot}/etc/make.conf"
+     "${FLAGS_chroot}/etc/portage/make.conf"
    ln -sf "${CHROOT_OVERLAY}/profiles/default/linux/amd64/10.0" \
-     "${FLAGS_chroot}/etc/make.profile"
+     "${FLAGS_chroot}/etc/portage/make.profile"
 
    # Create make.conf.user .
-   touch "${FLAGS_chroot}"/etc/make.conf.user
-   chmod 0644 "${FLAGS_chroot}"/etc/make.conf.user
+   touch "${FLAGS_chroot}"/etc/portage/make.conf.user
+   chmod 0644 "${FLAGS_chroot}"/etc/portage/make.conf.user
 
    # Create directories referred to by our conf files.
    mkdir -p -m 775 "${FLAGS_chroot}/var/lib/portage/pkgs" \
@@ -254,7 +254,7 @@ EOF
    # don't exist, then either bind mounts have failed, an invocation
    # from above is broke, or some assumption about the stage3 is no longer
    # true.
-   early_enter_chroot ls -l /etc/make.{conf,profile} \
+   early_enter_chroot ls -l /etc/portage/make.{conf,profile} \
      /usr/local/portage/coreos/profiles/default/linux/amd64/10.0
 
    target="${FLAGS_chroot}/etc/profile.d"
diff --git a/sdk_lib/make_conf_util.sh b/sdk_lib/make_conf_util.sh
index b4ce74c62a..44b4ee3707 100644
--- a/sdk_lib/make_conf_util.sh
+++ b/sdk_lib/make_conf_util.sh
@@ -81,7 +81,7 @@ EOF
 #      inside the chroot.
 _create_host_setup() {
   local fetchtype="$1"
-  local host_setup="$2/etc/make.conf.host_setup"
+  local host_setup="$2/etc/portage/make.conf.host_setup"
   ( echo "# Automatically generated.  EDIT THIS AND BE SORRY."
     echo
     _make_conf_fetchcommand "$fetchtype"