commit e9b400745e9d1265a34ff714c75781a806cb870f
author Mike Frysinger <vapier@chromium.org> Tue May 19 05:07:04 2015 -0400
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Fri May 29 00:18:10 2015 +0000
tree 7fd800484be8a18c5939e2d14484335ef0320caf
parent dbf84c376e2e561dcfc9bb85564e791c824832b0

sdk: switch /etc/make.profile to /etc/portage/make.profile

Since /etc/make.profile is deprecated, update the sdk to the new path.

BUG=brillo:1098
TEST=precq passes  # verifies existing sdk updates
TEST=`cbuildbot chromiumos-sdk` passes

Change-Id: Ifea24b8fb21c02bbe09a2408c5d893176c71e335
Reviewed-on: https://chromium-review.googlesource.com/272054
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

sdk_lib/make_chroot.sh

diff --git a/sdk_lib/make_chroot.sh b/sdk_lib/make_chroot.sh
index 7d763db..5c1f07c 100755
--- a/sdk_lib/make_chroot.sh
+++ b/sdk_lib/make_chroot.sh
@@ -232,7 +232,7 @@
    ln -sf "${CHROOT_CONFIG}/make.conf.amd64-host" \
      "${FLAGS_chroot}/etc/make.conf"
    ln -sf "${CHROOT_OVERLAY}/profiles/default/linux/amd64/10.0/sdk" \
-     "${FLAGS_chroot}/etc/make.profile"
+     "${FLAGS_chroot}/etc/portage/make.profile"
 
    # Create make.conf.user .
    touch "${FLAGS_chroot}"/etc/make.conf.user
@@ -280,7 +280,7 @@
    # 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/make.conf /etc/portage/make.profile \
      /usr/local/portage/chromiumos/profiles/default/linux/amd64/10.0
 
    target="${FLAGS_chroot}/etc/profile.d"