From 0c62fba05bc72d86cb532b794644e1db58567d47 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Wed, 17 Sep 2014 15:03:52 -0700
Subject: [PATCH] profiles: Move PROD_INSTALL_MASK list into prod profile

The variable PROD_INSTALL_MASK is no longer used, we switch to the prod
portage profile instead these days.
---
 .../coreos/targets/generic/make.defaults      | 26 ------------------
 .../coreos/targets/generic/prod/make.defaults | 27 ++++++++++++++++---
 2 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults
index 8bc15422b2..67ab2d9c9e 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults
@@ -23,29 +23,3 @@ INSTALL_MASK="${INSTALL_MASK}
 INSTALL_MASK="${INSTALL_MASK}
   /etc/sudoers
 "
-
-# Restrictive mask for production images.
-# TODO(marineam): Perhaps later move this to a generic/production profile.
-PROD_INSTALL_MASK="${INSTALL_MASK}
-  *.a *.la *.h *.hpp
-  /etc/sandbox.d
-  /usr/include
-  /usr/lib/debug
-  /usr/lib*/pkgconfig
-  /usr/share/aclocal*
-  /usr/share/awk
-  /usr/share/gdb
-  /usr/share/gettext
-  /usr/share/gobject-introspection-1.0
-  /usr/share/pkgconfig
-  /usr/share/readline
-  /usr/src
-"
-
-# Exclude nmap from prod image, we just want ncat/nping in there
-# Also remove ncat's second ca-bundle.crt, just use the system's
-PROD_INSTALL_MASK="${PROD_INSTALL_MASK}
-  /usr/bin/nmap
-  /usr/share/ncat
-  /usr/share/nmap
-"
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/prod/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/prod/make.defaults
index e37423ee7f..c74c0b1227 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/prod/make.defaults
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/prod/make.defaults
@@ -1,6 +1,27 @@
 # Copyright (c) 2014 The CoreOS Authors. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
-# default to the full PROD_INSTALL_MASK
-# TODO: after transitioning that list will just be defined here.
-INSTALL_MASK="${PROD_INSTALL_MASK}"
+# Restrictive mask for production images.
+INSTALL_MASK="${INSTALL_MASK}
+  *.a *.la *.h *.hpp
+  /etc/sandbox.d
+  /usr/include
+  /usr/lib/debug
+  /usr/lib*/pkgconfig
+  /usr/share/aclocal*
+  /usr/share/awk
+  /usr/share/gdb
+  /usr/share/gettext
+  /usr/share/gobject-introspection-1.0
+  /usr/share/pkgconfig
+  /usr/share/readline
+  /usr/src
+"
+
+# Exclude nmap from prod image, we just want ncat/nping in there
+# Also remove ncat's second ca-bundle.crt, just use the system's
+INSTALL_MASK="${INSTALL_MASK}
+  /usr/bin/nmap
+  /usr/share/ncat
+  /usr/share/nmap
+"