From 37a7bb4932f9988dba74a63db938099b9ce7fe60 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Thu, 22 Aug 2013 18:18:36 -0400
Subject: [PATCH] fix(coreos-base/coreos-base): Remove old ChromeOS files.

The udev rules are required on our system and refer to non-existent
groups causing udev to spew a bit of useless noise on boot.

The profile.d scripts don't do anything at all.
---
 .../coreos-base/coreos-base-0.ebuild          | 21 -------------------
 .../coreos-base/coreos-base/files/cursor.sh   |  7 -------
 .../coreos-base/files/include-coreos-auth     |  1 -
 .../files/udev-rules/55-serial.rules          |  9 --------
 .../coreos-base/files/udev-rules/99-i2c.rules |  5 -----
 .../files/udev-rules/99-usb-printer.rules     |  8 -------
 .../coreos-base/files/xauthority.sh           |  1 -
 7 files changed, 52 deletions(-)
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/cursor.sh
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/include-coreos-auth
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/udev-rules/55-serial.rules
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/udev-rules/99-i2c.rules
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/udev-rules/99-usb-printer.rules
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/xauthority.sh

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild
index f3b886d870..26bf57ff90 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild
@@ -15,7 +15,6 @@ IUSE="cros_host"
 # We need to make sure timezone-data is merged before us.
 # See pkg_setup below as well as http://crosbug.com/27413
 # and friends.
-# TODO: !app-misc/editor-wrapper
 DEPEND="sys-apps/baselayout
 	!<sys-libs/timezone-data-2011d
 	!<=app-admin/sudo-1.8.2
@@ -98,20 +97,12 @@ src_install() {
 	insinto /etc
 	#doins "${FILESDIR}"/sysctl.conf || die
 
-	insinto /etc/profile.d
-	doins "${FILESDIR}"/xauthority.sh || die
-
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/udev-rules/*.rules || die
-
 	# target-specific fun
 	if ! use cros_host ; then
 		# Add a /srv directory for mounting into later
 		dodir /srv
 		keepdir /srv
 
-		dodir /bin /usr/bin
-
 		# Make mount work in the way systemd prescribes
 		dosym /proc/mounts /etc/mtab
 
@@ -138,18 +129,6 @@ src_install() {
 
 		# We use mawk in the target boards, not gawk.
 		dosym mawk /usr/bin/awk || die
-
-		# We want dash as our main shell.
-		#dosym dash /bin/sh
-
-		# Avoid the wrapper and just link to the only editor we have.
-		#dodir /usr/libexec
-		#dosym /usr/bin/vim /usr/libexec/editor || die
-		#dosym /bin/more /usr/libexec/pager || die
-
-		# Custom login shell snippets.
-		insinto /etc/profile.d
-		doins "${FILESDIR}"/cursor.sh
 	fi
 
 	# Add a sudo file for the core use
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/cursor.sh b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/cursor.sh
deleted file mode 100644
index 357f9293ae..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/cursor.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-# We disable vt cursors by default on the kernel command line
-# (so that it doesn't flash when doing boot splash and such).
-#
-# Re-enable it when launching a login shell.  This should only
-# happen when logging in via vt or crosh or ssh and those are
-# all fine.  Login shells shouldn't get launched normally.
-setterm -cursor on
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/include-coreos-auth b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/include-coreos-auth
deleted file mode 100644
index 23073d803d..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/include-coreos-auth
+++ /dev/null
@@ -1 +0,0 @@
-auth include coreos-auth
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/udev-rules/55-serial.rules b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/udev-rules/55-serial.rules
deleted file mode 100644
index ceb492c4b7..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/udev-rules/55-serial.rules
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-KERNEL=="tty[A-Z]*[0-9]", GROUP="serial"
-# Don't allow access to serial interfaces on Gobi modems.
-KERNEL=="tty[A-Z]*[0-9]", ID_USB_DRIVER=="qcserial", GROUP="root"
-# Don't allow access to serial interfaces on Novatel modems.
-KERNEL=="tty[A-Z]*[0-9]", ID_USB_DRIVER=="option", GROUP="root"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/udev-rules/99-i2c.rules b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/udev-rules/99-i2c.rules
deleted file mode 100644
index d094e0fa71..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/udev-rules/99-i2c.rules
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-KERNEL=="i2c-[0-9]", GROUP="i2c"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/udev-rules/99-usb-printer.rules b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/udev-rules/99-usb-printer.rules
deleted file mode 100644
index 7895571938..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/udev-rules/99-usb-printer.rules
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-ACTION=="add", SUBSYSTEM=="usb", ATTR{bInterfaceClass}=="07", ATTRS{idProduct}=="*", \
-    PROGRAM="/usr/bin/dbus-send --system --type=method_call --dest=org.chromium.LibCrosService \
-        /org/chromium/LibCrosService org.chromium.LibCrosServiceInterface.PrinterAdded \
-        string:$attr{idVendor} string:$attr{idProduct}"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/xauthority.sh b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/xauthority.sh
deleted file mode 100644
index 21774859d7..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/xauthority.sh
+++ /dev/null
@@ -1 +0,0 @@
-export XAUTHORITY="/home/chronos/.Xauthority"