From 07cb281d6a96d155d662160ad6222f69a4cd84f2 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Sat, 19 Jul 2014 17:25:56 -0700
Subject: [PATCH] build_image: install the complete system package set in dev
 images

dev images, now with fancy tools like `make`!
---
 build_library/dev_image_util.sh | 2 +-
 build_packages                  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build_library/dev_image_util.sh b/build_library/dev_image_util.sh
index 47f8506695..e552b71641 100755
--- a/build_library/dev_image_util.sh
+++ b/build_library/dev_image_util.sh
@@ -72,7 +72,7 @@ create_dev_image() {
   start_image "${image_name}" "${disk_layout}" "${root_fs_dir}" "${update_group}"
 
   set_image_profile dev
-  emerge_to_image "${root_fs_dir}" coreos-base/coreos-dev
+  emerge_to_image "${root_fs_dir}" @system coreos-base/coreos-dev
   write_packages "${root_fs_dir}" "${BUILD_DIR}/${image_packages}"
 
   # Setup portage for emerge and gmerge
diff --git a/build_packages b/build_packages
index 728c500c64..42b19d1ceb 100755
--- a/build_packages
+++ b/build_packages
@@ -212,7 +212,8 @@ break_dep_loop sys-apps/util-linux udev
 break_dep_loop sys-apps/systemd cryptsetup
 
 info "Merging board packages now"
-sudo -E "${EMERGE_CMD[@]}" "${EMERGE_FLAGS[@]}" coreos-devel/board-packages
+sudo -E "${EMERGE_CMD[@]}" "${EMERGE_FLAGS[@]}" \
+    @system coreos-devel/board-packages
 
 info "Checking build root"
 test_image_content "${BOARD_ROOT}"