From 9b00ea5495fd1c94e9998e26ced518475d1ee89c Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Thu, 4 Feb 2016 11:50:30 -0800
Subject: [PATCH] *: disable reinstalling rebuilt binaries with --usepkgonly

When --usepkgonly is mixed with the right update flags it will
re-install any binary packages that have a newer build. Since the full
set of SDK and board packages are rebuilt quite often this leads to
excessive reinstalling.
---
 build_packages | 2 +-
 setup_board    | 4 ++--
 update_chroot  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build_packages b/build_packages
index 39f8b8a914..518f97fc84 100755
--- a/build_packages
+++ b/build_packages
@@ -143,7 +143,7 @@ if [[ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" ]]; then
   # so as to avoid unnecessary differences between source
   # and binary builds except for --usepkgonly for speed.
   if [[ "${FLAGS_usepkgonly}" -eq "${FLAGS_TRUE}" ]]; then
-    EMERGE_FLAGS+=( --usepkgonly )
+    EMERGE_FLAGS+=( --usepkgonly --rebuilt-binaries n )
   else
     EMERGE_FLAGS+=( --usepkg --with-bdeps y )
 
diff --git a/setup_board b/setup_board
index fef5ec20a5..b104d9d8c0 100755
--- a/setup_board
+++ b/setup_board
@@ -301,12 +301,12 @@ if [[ ${FLAGS_regen_configs} -eq ${FLAGS_FALSE} ]]; then
         "${FLAGS_getbinpkg}" -eq "${FLAGS_TRUE}" ]]
   then
     if [[ "${FLAGS_usepkgonly}" -eq "${FLAGS_TRUE}" ]]; then
-      EMERGE_FLAGS+=" --usepkgonly"
+      EMERGE_FLAGS+=" --usepkgonly --rebuilt-binaries n"
     else
       EMERGE_FLAGS+=" --usepkg"
     fi
     EMERGE_FLAGS+=" --getbinpkg"
-    EMERGE_TOOLCHAIN_FLAGS+=" --usepkgonly --getbinpkg"
+    EMERGE_TOOLCHAIN_FLAGS+=" --usepkgonly --getbinpkg --rebuilt-binaries n"
   else
     # When binary packages are disabled we need to make sure the cross
     # sysroot includes any build dependencies for the toolchain.
diff --git a/update_chroot b/update_chroot
index d0a9b35af2..6490bf1ede 100755
--- a/update_chroot
+++ b/update_chroot
@@ -181,7 +181,7 @@ REBUILD_FLAGS=""
 if [ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" ]; then
   EMERGE_FLAGS="${EMERGE_FLAGS} --usepkg"
   if [[ "${FLAGS_usepkgonly}" -eq "${FLAGS_TRUE}" ]]; then
-    EMERGE_FLAGS+=" --usepkgonly"
+    EMERGE_FLAGS+=" --usepkgonly --rebuilt-binaries n"
   fi
   if [ "${FLAGS_getbinpkg}" -eq "${FLAGS_TRUE}" ]; then
     EMERGE_FLAGS="${EMERGE_FLAGS} --getbinpkg"