From 9a973e4113f038351d23bd0b96850d062dd260f8 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Tue, 10 Jun 2014 11:37:49 -0700
Subject: [PATCH] fix(setup_board): Migrate packages in existing board roots.

---
 setup_board | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/setup_board b/setup_board
index 65fff0ec93..bf35fdf28f 100755
--- a/setup_board
+++ b/setup_board
@@ -214,6 +214,23 @@ else
   FLAGS_regen_configs=${FLAGS_FALSE}
 fi
 
+# Migrate board roots that were created before the package location
+# was standardized to /var/lib/portage/pkgs, build_image will fail if we
+# simply forget about the old location and start writing to the new.
+# Keep /packages as a compatibility symlink until everyone is updated.
+if [[ ! -L "${BOARD_ROOT}/packages" ]]; then
+  if [[ ! -d "${BOARD_ROOT}/var/lib/portage/pkgs" ]]; then
+    if [[ -d "${BOARD_ROOT}/packages" ]]; then
+      warn "Moving board package directory to ${BOARD_ROOT}/var/lib/portage/pkgs"
+      sudo mkdir -p "${BOARD_ROOT}/var/lib/portage"
+      sudo mv "${BOARD_ROOT}/packages" "${BOARD_ROOT}/var/lib/portage/pkgs"
+    fi
+  else
+    sudo mkdir -p "${BOARD_ROOT}/var/lib/portage/pkgs"
+  fi
+  sudo ln -sfT "var/lib/portage/pkgs" "${BOARD_ROOT}/packages"
+fi
+
 info "Configuring portage in ${BOARD_ROOT}"
 cmds=(
   "mkdir -p '${BOARD_ROOT}' '${BOARD_PROFILE}'"