commit 0bf12798a31cc3ffbf3e0c7a74b82137481c859b
author Mike Frysinger <vapier@chromium.org> Sat Mar 22 01:46:42 2014 -0400
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Mon Mar 24 18:41:38 2014 +0000
tree 02d6d113c91c76fb3eef434f175fde1611095336
parent c97f45411ee4bb6421f07e1019f1f6b9bd5e9e53

switch from hard-host-depends to virtual/target-sdk

This is mechanical -- virtual/target-sdk depends on hard-host-depends,
so there shouldn't be any real difference in the build.

BUG=chromium:329920
TEST=`cbuildbot chromiumos-sdk`
CQ-DEPEND=CL:191014

Change-Id: I981a81ac9b5dacf4328efa912545b402b72ae4bb
Reviewed-on: https://chromium-review.googlesource.com/191143
Reviewed-by: Gaurav Shah <gauravsh@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>

fwcontrol

diff --git a/fwcontrol b/fwcontrol
index c7d1346..744ce44 100755
--- a/fwcontrol
+++ b/fwcontrol
@@ -217,7 +217,7 @@
   local FW_UPDATE_TOOL="$FW_UPDATE_TOOL_CYPRESS"
   # If the firmware upate tool does not exist in the host yet, we need to
   # unmerge the package, and then run update_chroot to get the firmware
-  # update tool installed through the hard-host-depends package.
+  # update tool installed through the virtual/target-sdk package.
   if [ ! -f $FW_UPDATE_TOOL ]; then
     echo $CYPRESS_TOOLS does not exist.
     echo We will unmerge $CYPRESS_TOOLS and then run update_chroot.

setup_board

diff --git a/setup_board b/setup_board
index eda2ba7..d5f80d8 100755
--- a/setup_board
+++ b/setup_board
@@ -506,7 +506,7 @@
   if [[ $FLAGS_fast -eq $FLAGS_TRUE ]]; then
     EMERGE_CMD="${GCLIENT_ROOT}/chromite/bin/parallel_emerge"
   fi
-  PACKAGES="system hard-host-depends world"
+  PACKAGES="system virtual/target-sdk world"
 
   # First, rebuild all packages from scratch. This is needed to make sure
   # we rebuild all chroot packages.

update_chroot

diff --git a/update_chroot b/update_chroot
index 19577fb..6704a8d 100755
--- a/update_chroot
+++ b/update_chroot
@@ -78,7 +78,7 @@
   EMERGE_FLAGS+=" --jobs=${FLAGS_jobs}"
 fi
 
-# Perform an update of hard-host-depends and world in the chroot.
+# Perform an update of all the sdk packages in the chroot.
 EMERGE_CMD="emerge"
 CHROMITE_BIN="${GCLIENT_ROOT}/chromite/bin"
 if [ "${FLAGS_fast}" -eq "${FLAGS_TRUE}" ]; then
@@ -107,8 +107,7 @@
 
 # Second pass, update everything else.
 EMERGE_FLAGS+=" --deep"
-sudo -E ${EMERGE_CMD} ${EMERGE_FLAGS} \
-    chromeos-base/hard-host-depends world
+sudo -E ${EMERGE_CMD} ${EMERGE_FLAGS} virtual/target-sdk world
 
 # Automatically discard all CONFIG_PROTECT'ed files. Those that are
 # protected should not be overwritten until the variable is changed.