From f1a91f343ef9c852eccf02eba7b2b6f06bfedb73 Mon Sep 17 00:00:00 2001
From: Michael Marineau <mike@marineau.org>
Date: Fri, 31 May 2013 10:31:44 -0400
Subject: [PATCH 1/2] fix(coreos-base/coreos-base): mawk provides awk on target
 images

Link awk to mawk and block gawk for target builds to avoid conflicts.
---
 .../{coreos-base-0-r54.ebuild => coreos-base-0-r55.ebuild}     | 0
 .../coreos-base/coreos-base/coreos-base-0.ebuild               | 3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/{coreos-base-0-r54.ebuild => coreos-base-0-r55.ebuild} (100%)

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r54.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r55.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r54.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r55.ebuild
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 346cb1dac1..0fd3e13803 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
@@ -25,6 +25,7 @@ DEPEND="sys-apps/baselayout
 	!<net-misc/openssh-5.2_p1-r8
 	!cros_host? (
 		sys-libs/timezone-data
+		!sys-apps/gawk
 	)"
 RDEPEND="${DEPEND}"
 
@@ -126,7 +127,7 @@ src_install() {
 		dosym /var/lib/timezone/localtime /etc/localtime || die
 
 		# We use mawk in the target boards, not gawk.
-		#dosym mawk /usr/bin/awk || die
+		dosym mawk /usr/bin/awk || die
 
 		# We want dash as our main shell.
 		#dosym dash /bin/sh

From 269b39d4fee10d5658b28b86d2e28401892acc41 Mon Sep 17 00:00:00 2001
From: Michael Marineau <mike@marineau.org>
Date: Fri, 31 May 2013 11:03:41 -0400
Subject: [PATCH 2/2] fix(coreos-base/coreos): Add gzip and less to base image.

Basic tools others expect! Other tools missed them dearly.
---
 .../{coreos-0.0.1-r193.ebuild => coreos-0.0.1-r194.ebuild}    | 0
 .../coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild     | 4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/{coreos-0.0.1-r193.ebuild => coreos-0.0.1-r194.ebuild} (100%)

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r193.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r194.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r193.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r194.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
index fba8321195..e36a8c0bb3 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
@@ -114,6 +114,7 @@ RDEPEND="${RDEPEND}
 	sys-apps/kexec-tools
 	app-admin/sudo
 	app-admin/rsyslog
+	app-arch/gzip
 	app-arch/sharutils
 	app-arch/tar
 	bootchart? (
@@ -134,11 +135,12 @@ RDEPEND="${RDEPEND}
 	net-misc/dhcpcd
 	net-firewall/iptables
 	net-misc/tlsdate
+	net-misc/wget
 	sys-apps/bootcache
 	sys-apps/coreutils
 	sys-apps/dbus
 	sys-apps/grep
-	net-misc/wget
+	sys-apps/less
 	sys-apps/mawk
 	sys-apps/net-tools
 	sys-apps/pv