From 8418179ff426e602297111d089b5951469166f52 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Sun, 5 Jan 2014 16:55:28 -0800
Subject: [PATCH] fix(build_library): Add amd64-usr board and disk layouts.

The basic infrastructure to support this is now in place. Add a new
board that uses the experimental coreos/amd64/usr profile /usr based
disk layouts. This is just enough to successfully build images, they
aren't bootable yet.
---
 build_library/legacy_disk_layout.json | 44 +++++++++++++++++++++++++++
 build_library/toolchain_util.sh       |  2 ++
 2 files changed, 46 insertions(+)

diff --git a/build_library/legacy_disk_layout.json b/build_library/legacy_disk_layout.json
index 31248796dd..8b514f39b2 100644
--- a/build_library/legacy_disk_layout.json
+++ b/build_library/legacy_disk_layout.json
@@ -74,6 +74,20 @@
         }
       }
     },
+    "base-usr":{
+      "3":{
+        "label":"USR-A",
+        "mount":"/usr"
+      },
+      "4":{
+        "label":"USR-B"
+      },
+      "9":{
+        "label":"ROOT",
+        "mount":"/",
+        "binds":{}
+      }
+    },
     "vm":{
       "9":{
         "label":"STATE",
@@ -81,12 +95,42 @@
         "blocks":"6291456"
       }
     },
+    "vm-usr":{
+      "3":{
+        "label":"USR-A",
+        "mount":"/usr"
+      },
+      "4":{
+        "label":"USR-B"
+      },
+      "9":{
+        "label":"ROOT",
+        "mount":"/",
+        "binds":{},
+        "blocks":"6291456"
+      }
+    },
     "vagrant":{
       "9":{
         "label":"STATE",
         "type":"data",
         "blocks":"33587200"
       }
+    },
+    "vagrant-usr":{
+      "3":{
+        "label":"USR-A",
+        "mount":"/usr"
+      },
+      "4":{
+        "label":"USR-B"
+      },
+      "9":{
+        "label":"ROOT",
+        "mount":"/",
+        "binds":{},
+        "blocks":"33587200"
+      }
     }
   }
 }
diff --git a/build_library/toolchain_util.sh b/build_library/toolchain_util.sh
index 0132d63e69..e841f33057 100644
--- a/build_library/toolchain_util.sh
+++ b/build_library/toolchain_util.sh
@@ -22,6 +22,8 @@ CROSS_PROFILES["x86_64-cros-linux-gnu"]="coreos:coreos/amd64/generic"
 declare -A BOARD_CHOSTS BOARD_PROFILES
 BOARD_CHOSTS["amd64-generic"]="x86_64-cros-linux-gnu"
 BOARD_PROFILES["amd64-generic"]="coreos:coreos/amd64/generic"
+BOARD_CHOSTS["amd64-usr"]="x86_64-cros-linux-gnu"
+BOARD_PROFILES["amd64-usr"]="coreos:coreos/amd64/usr"
 BOARD_NAMES=( "${!BOARD_CHOSTS[@]}" )
 
 # Declare the above globals as read-only to avoid accidental conflicts.