commit 36beaaad36f63a1a7d803299019fee0e0904d337
author Mike Frysinger <vapier@chromium.org> Thu Sep 25 15:52:27 2014 -0400
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Sep 26 03:23:47 2014 +0000
tree aff66effc6bb2954bde5aac030ba1b399e35a4a2
parent 067b35497c91d01407cf1c9a06f97ed228fc187e

make_chroot: seed crossdev overlay with a simple layout.conf

This is just enough to silence the warnings that newer portage generates.
They're harmless, but can be confusing (especially since they are shown
many times).  When we eventually run crossdev, it'll regen this file with
its own updated version.

BUG=chromium:415246
TEST=`cbuildbot chromiumos-sdk` passes

Change-Id: Id7f4c348ec8182e6a4ce0fb1612b6efd11dc8f46
Reviewed-on: https://chromium-review.googlesource.com/219755
Reviewed-by: Bertrand Simonnet <bsimonnet@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

sdk_lib/make_chroot.sh

diff --git a/sdk_lib/make_chroot.sh b/sdk_lib/make_chroot.sh
index e1c9988..2d160b9 100755
--- a/sdk_lib/make_chroot.sh
+++ b/sdk_lib/make_chroot.sh
@@ -166,7 +166,17 @@
    info "Running init_setup()..."
    mkdir -p -m 755 "${FLAGS_chroot}/usr" \
      "${FLAGS_chroot}${OVERLAYS_ROOT}" \
-     "${FLAGS_chroot}"/"${CROSSDEV_OVERLAY}"
+     "${FLAGS_chroot}"/"${CROSSDEV_OVERLAY}/metadata"
+   # Newer portage complains about bare overlays.  Create the file that crossdev
+   # will also create later on.
+   cat <<EOF > "${FLAGS_chroot}/${CROSSDEV_OVERLAY}/metadata/layout.conf"
+# Autogenerated and managed by crossdev
+# Delete the above line if you want to manage this file yourself
+masters = portage-stable chromiumos
+repo-name = crossdev
+use-manifests = true
+thin-manifests = true
+EOF
    ln -sf "${CHROOT_TRUNK_DIR}/src/third_party/eclass-overlay" \
      "${FLAGS_chroot}"/"${ECLASS_OVERLAY}"
    ln -sf "${CHROOT_TRUNK_DIR}/src/third_party/chromiumos-overlay" \