commit 7b0f763357f2c433a19ce3b9051b31232530e1b9
author Mike Frysinger <vapier@chromium.org> Tue May 27 14:55:30 2014 -0400
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed May 28 04:54:59 2014 +0000
tree adcd7cdcfe5d0f9a7453b4031abd11a8bda2dd24
parent 5faf1bd093991315fc4fe0fd3ed12a05df972d3d

setup_board: stop symlinking make.globals

This file no longer exists, nor used, so no need to symlink it.

BUG=chromium:377914
TEST=`cbuildbot {x86,amd64,arm}-generic-full` pass

Change-Id: I8ed9eaf258ac2646e71e8e06e4bffc00587e43ce
Reviewed-on: https://chromium-review.googlesource.com/201497
Reviewed-by: David James <davidjames@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

chroot_version_hooks.d/93_clean_make.globals

diff --git a/chroot_version_hooks.d/93_clean_make.globals b/chroot_version_hooks.d/93_clean_make.globals
new file mode 100644
index 0000000..bba579b
--- /dev/null
+++ b/chroot_version_hooks.d/93_clean_make.globals
@@ -0,0 +1,7 @@
+# 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.
+
+# The /etc/make.globals file is no longer used, so delete old symlinks to it.
+
+exec sudo rm -f /etc/make.globals /build/*/etc/make.globals

setup_board

diff --git a/setup_board b/setup_board
index d5f80d8..c0fc446 100755
--- a/setup_board
+++ b/setup_board
@@ -460,7 +460,7 @@
     install_toolchain
   fi
 fi
-# Setup make.globals and the profile.
+# Setup the profile.
 if [[ ! -s /etc/make.conf.user ]]; then
   sudo_clobber /etc/make.conf.user <<\EOF
 # This file is useful for doing global (chroot and all board) changes.
@@ -477,7 +477,6 @@
 EOF
 fi
 cmds=(
-  "ln -sf /etc/make.globals '${BOARD_ROOT}/etc/make.globals'"
   "ln -sf /etc/make.conf.user '${BOARD_ROOT}/etc/make.conf.user'"
   "mkdir -p '${BOARD_ROOT}/etc/portage/hooks'"
 )