commit 53f79bb850290c690dcde76ea1adfc3ee45fbf18
author Mike Frysinger <vapier@chromium.org> Sat Apr 05 22:27:52 2014 -0400
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Mon Apr 13 05:17:00 2015 +0000
tree 3bda741129edf378da2d99cda5bdd147f23634e5
parent 473d96db25575b5f5a6bb2b2481fd289f957efb5

make_chroot: clean up random catalyst file

This isn't used by things directly; clean it up.

BUG=chromium:360346
TEST=`cbuildbot chromiumos-sdk` works

Change-Id: Ide5bb9790638f0b0361c4cdc1b91e17c5e283983
Reviewed-on: https://chromium-review.googlesource.com/265350
Trybot-Ready: Mike Frysinger <vapier@chromium.org>
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 4807dbe..2817d6c 100755
--- a/sdk_lib/make_chroot.sh
+++ b/sdk_lib/make_chroot.sh
@@ -203,7 +203,7 @@
    # and a pointer to pre-built packages.
    # TODO: This should really be part of a profile in the portage.
    info "Setting up /etc/make.*..."
-   rm -f "${FLAGS_chroot}"/etc/{,portage/}make.{conf,profile}
+   rm -f "${FLAGS_chroot}"/etc/{,portage/}make.{conf,profile}{,.catalyst}
    mkdir -p "${FLAGS_chroot}/etc/portage"
    ln -sf "${CHROOT_CONFIG}/make.conf.amd64-host" \
      "${FLAGS_chroot}/etc/make.conf"