From be72d56a5021dbb36593873f0156902bde97aee4 Mon Sep 17 00:00:00 2001
From: Brandon Philips <brandon@ifup.co>
Date: Fri, 26 Jul 2013 10:19:49 -0700
Subject: [PATCH] fix(*): move dev_image to overlays

put the dev_image in overlays/usr/local
---
 build_library/base_image_util.sh | 8 ++++----
 common.sh                        | 2 +-
 mount_gpt_image.sh               | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build_library/base_image_util.sh b/build_library/base_image_util.sh
index aeb5f66f05..574aa51670 100755
--- a/build_library/base_image_util.sh
+++ b/build_library/base_image_util.sh
@@ -5,7 +5,7 @@
 . "${SRC_ROOT}/platform/dev/toolchain_utils.sh" || exit 1
 
 # Overlays are parts of the disk that live on the stateful partition
-ROOT_OVERLAYS=(var opt srv home)
+ROOT_OVERLAYS=(var opt srv home usr/local)
 
 cleanup_mounts() {
   local prev_ret=$?
@@ -151,11 +151,11 @@ create_base_image() {
     sudo mount --bind "${stateful_fs_dir}/overlays/$i" "${root_fs_dir}/$i"
   done
 
-  sudo mkdir -p "${stateful_fs_dir}/images/dev"
+  sudo mkdir -p "${stateful_fs_dir}/overlays/usr/local"
 
   # Create symlinks so that /usr/local/usr based directories are symlinked to
   # /usr/local/ directories e.g. /usr/local/usr/bin -> /usr/local/bin, etc.
-  setup_symlinks_on_root "${stateful_fs_dir}/images/dev" \
+  setup_symlinks_on_root "${stateful_fs_dir}/overlays/usr/local" \
     "${stateful_fs_dir}/overlays/var" \
     "${stateful_fs_dir}"
 
@@ -165,7 +165,7 @@ create_base_image() {
 
   # Setup the dev image for developer tools
   sudo mkdir -p "${root_fs_dir}/usr/local"
-  sudo mount --bind "${stateful_fs_dir}/images/dev" "${root_fs_dir}/usr/local"
+  sudo mount --bind "${stateful_fs_dir}/overlays/usr/local" "${root_fs_dir}/usr/local"
 
   sudo mkdir -p "${root_fs_dir}/dev"
 
diff --git a/common.sh b/common.sh
index 7a5d987e79..9fb6cb1499 100644
--- a/common.sh
+++ b/common.sh
@@ -735,7 +735,7 @@ setup_symlinks_on_root() {
   # Give args better names.
   local dev_image_target=$1
   local var_target=$2
-  local dev_image_root="$3/images/dev"
+  local dev_image_root="$3/overlays/usr/local"
 
   # If our var target is actually the standard var, we are cleaning up the
   # symlinks (could also check for /usr/local for the dev_image_target).
diff --git a/mount_gpt_image.sh b/mount_gpt_image.sh
index dc1b7b2715..3e1817714a 100755
--- a/mount_gpt_image.sh
+++ b/mount_gpt_image.sh
@@ -181,12 +181,12 @@ mount_image() {
   # Mount directories and setup symlinks.
   sudo mount --bind "${FLAGS_stateful_mountpt}/overlays/var" \
     "${FLAGS_rootfs_mountpt}/var"
-  sudo mount --bind "${FLAGS_stateful_mountpt}/images/dev" \
+  sudo mount --bind "${FLAGS_stateful_mountpt}/overlays/usr/local" \
     "${FLAGS_rootfs_mountpt}/usr/local"
   # Setup symlinks in /usr/local so you can emerge packages into /usr/local.
 
   if [ ${FLAGS_read_only} -eq ${FLAGS_FALSE} ]; then
-    setup_symlinks_on_root "${FLAGS_stateful_mountpt}/images/dev" \
+    setup_symlinks_on_root "${FLAGS_stateful_mountpt}/overlays/usr/local" \
       "${FLAGS_stateful_mountpt}/overlays/var" "${FLAGS_stateful_mountpt}"
   fi
   info "Image specified by ${FLAGS_from} mounted at"\