commit a28439cf723cf30f4d5cf6e857865285b4699932
author Alex Klein <saklein@chromium.org> Mon Jan 14 14:48:30 2019 -0700
committer chrome-bot <chrome-bot@chromium.org> Wed Jan 16 12:29:01 2019 -0800
tree bb38464ba5c0e3142ce8b7c6cc263f505c9e6b07
parent b26b12f3d15abea2ba46df701d594c5d89eae087

setup_board & make_chroot: make.conf.user content

Shift the responsibility of filling out the default make.conf.user
content from setup_board to make_chroot. make.conf.user is a chroot
file, its creation is out of place in setup_board.

BUG=chromium:893748
TEST=precq

Change-Id: Iaa6ea07af23d03dc2862bb0a6902d62434789a98
Reviewed-on: https://chromium-review.googlesource.com/1410046
Commit-Ready: Alex Klein <saklein@chromium.org>
Tested-by: Alex Klein <saklein@chromium.org>
Reviewed-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 0239273..8df2ffb 100755
--- a/sdk_lib/make_chroot.sh
+++ b/sdk_lib/make_chroot.sh
@@ -240,7 +240,19 @@
      "${FLAGS_chroot}/etc/portage/make.profile"
 
    # Create make.conf.user .
-   touch "${FLAGS_chroot}"/etc/make.conf.user
+   cat <<EOF > "${FLAGS_chroot}"/etc/make.conf.user
+# This file is useful for doing global (chroot and all board) changes.
+# Tweak emerge settings, ebuild env, etc...
+#
+# Make sure to append variables unless you really want to clobber all
+# existing settings.  e.g. You most likely want:
+#   FEATURES="${FEATURES} ..."
+#   USE="${USE} foo"
+# and *not*:
+#   USE="foo"
+#
+# This also is a good place to setup ACCEPT_LICENSE.
+EOF
    chmod 0644 "${FLAGS_chroot}"/etc/make.conf.user
 
    # Create directories referred to by our conf files.

setup_board

diff --git a/setup_board b/setup_board
index 4bbbd9e..d068cdd 100755
--- a/setup_board
+++ b/setup_board
@@ -133,23 +133,6 @@
   FLAGS_regen_configs=${FLAGS_FALSE}
 fi
 
-# Setup the user specific 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.
-# Tweak emerge settings, ebuild env, etc...
-#
-# Make sure to append variables unless you really want to clobber all
-# existing settings.  e.g. You most likely want:
-#   FEATURES="${FEATURES} ..."
-#   USE="${USE} foo"
-# and *not*:
-#   USE="foo"
-#
-# This also is a good place to setup ACCEPT_LICENSE.
-EOF
-fi
-
 # Setup the make.confs. We use the following:
 #    make.conf             <- Overall target make.conf [arm, x86, etc. version]
 #    make.conf.board_setup <- Declares CHOST, ROOT, etc.