commit 411b2424ddc516d249fa8472f5c2f294e8e95388
author Mike Frysinger <vapier@chromium.org> Wed Jun 04 11:49:17 2014 -0400
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Mon Nov 03 18:24:18 2014 +0000
tree dd791bc5b59c5d1112fa391787ad0e775d2b43c4
parent 2cc1a72998172319c64424e98a463745cce73ea8

make_chroot: use the new sdk profile

Now that we have a dedicated SDK profile, use it.

BUG=chromium:429271
TEST=`cbuildbot chromiumos-sdk` passes
CQ-DEPEND=CL:226851

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

chroot_version_hooks.d/102_update_sdk_profile

diff --git a/chroot_version_hooks.d/102_update_sdk_profile b/chroot_version_hooks.d/102_update_sdk_profile
new file mode 100644
index 0000000..b2dd8f7
--- /dev/null
+++ b/chroot_version_hooks.d/102_update_sdk_profile
@@ -0,0 +1,9 @@
+# Copyright 2014 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.
+
+# Make sure the sdk profile points to the new location.
+
+exec sudo ln -sfT \
+  /usr/local/portage/chromiumos/profiles/default/linux/amd64/10.0/sdk \
+  /etc/make.profile

sdk_lib/make_chroot.sh

diff --git a/sdk_lib/make_chroot.sh b/sdk_lib/make_chroot.sh
index de9d53c..64e8f4f 100755
--- a/sdk_lib/make_chroot.sh
+++ b/sdk_lib/make_chroot.sh
@@ -213,7 +213,7 @@
    mkdir -p "${FLAGS_chroot}/etc/portage"
    ln -sf "${CHROOT_CONFIG}/make.conf.amd64-host" \
      "${FLAGS_chroot}/etc/make.conf"
-   ln -sf "${CHROOT_OVERLAY}/profiles/default/linux/amd64/10.0" \
+   ln -sf "${CHROOT_OVERLAY}/profiles/default/linux/amd64/10.0/sdk" \
      "${FLAGS_chroot}/etc/make.profile"
 
    # Create make.conf.user .