From 9580ea408622d7a27d4c6ff76f92bd61059e1ed3 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Thu, 4 Sep 2014 15:06:28 -0700
Subject: [PATCH] build_image_util: fix generation of packages.txt

The passing ROOT= as an environment variable to board wrapper scripts
doesn't work, the script unconditionally overrides it. This means so far
our packages.txt files have listed the contents of /build/amd64-usr
instead of the image. Fix this by calling equery directly instead.
---
 build_library/build_image_util.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/build_library/build_image_util.sh b/build_library/build_image_util.sh
index be145d4e87..b909e1204e 100755
--- a/build_library/build_image_util.sh
+++ b/build_library/build_image_util.sh
@@ -147,9 +147,8 @@ write_contents() {
 write_packages() {
     local profile="${BUILD_DIR}/configroot/etc/portage/profile"    
     info "Writing ${2##*/}"
-    ROOT="$1" equery-$BOARD --no-color \
-        list '*' --format '$cpv::$repo' \
-        > "$2"
+    ROOT="$1" PORTAGE_CONFIGROOT="${BUILD_DIR}"/configroot \
+        equery --no-color list '*' --format '$cpv::$repo' > "$2"
     if [[ -f "${profile}/package.provided" ]]; then
         cat "${profile}/package.provided" >> "$2"
     fi