From 1e7ce955083bffdc84e1729e0d8bfa3db876bf5d Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Fri, 6 Dec 2013 14:41:46 -0800
Subject: [PATCH] fix(setup_board): Depend on --usepkg and --getbinpkg as a
 pair.

Instead of gating only on --usepkg depend on both flags as a pair. This
keeps setup_board's behavior a little closer to build_packages. The
buildbot is using --nogetbinpkg to avoid pulling in existing packages
built by the SDK but setup_board is causing some to be pulled in anyway.
---
 setup_board | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup_board b/setup_board
index 5c6e5dad38..b68517bafd 100755
--- a/setup_board
+++ b/setup_board
@@ -258,7 +258,9 @@ if [[ ${FLAGS_regen_configs} -eq ${FLAGS_FALSE} ]]; then
     EMERGE_FLAGS+=" --jobs=${FLAGS_jobs}"
   fi
 
-  if [[ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" ]]; then
+  if [[ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}"  && \
+        "${FLAGS_getbinpkg}" -eq "${FLAGS_TRUE}" ]]
+  then
     EMERGE_FLAGS+=" --usepkgonly --getbinpkg"
   else
     # When binary packages are disabled we need to make sure the cross