maint(profiles): Merge usr profile back into generic target.

coreos/amd64/usr remains as an alias to coreos/amd64/generic for now.

sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/usr/parent

@@ -1,4 +1 @@
-..
-portage-stable:arch/amd64/no-multilib
-portage-stable:features/64bit-native
-:coreos/targets/usr
+:coreos/amd64/generic

sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/usr/use.force

@@ -1,2 +0,0 @@
-# We don't do multilib.
--multilib

sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults

@@ -1,7 +1,7 @@
 # Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
-USE="cros-debug acpi usb pam"
+USE="cros-debug acpi usb symlink-usr -pam"
 USE="${USE} -cros_host -expat -pic -pie -cairo -X"
 USE="${USE} -acl -cracklib -gpm -ipv6 -openmp -python -sha512"
 USE="${USE} -fortran -abiword -perl -cups -poppler-data -nls"
@@ -49,6 +49,3 @@ PROD_INSTALL_MASK="${PROD_INSTALL_MASK}
 PROD_INSTALL_MASK="${PROD_INSTALL_MASK}
   /etc/sudoers
 "
-
-# No suffix for 'generic' (use base, not base-usr)
-COREOS_DISK_LAYOUT_SUFFIX=""

sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/usr/make.defaults

@@ -1,12 +0,0 @@
-# Copyright (c) 2014 The CoreOS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-# Enable tweaks to install everything under /usr
-USE="symlink-usr"
-
-# Currently we have no particular need for pam and it is the biggest
-# thing we have left in /etc. Disable for now, we can revisit later.
-USE="${USE} -pam"
-
-# Append -usr to disk layout names (use base-usr, not base)
-COREOS_DISK_LAYOUT_SUFFIX="-usr"

sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/usr/parent

@@ -1 +0,0 @@
-:coreos/targets/generic