From 98d9fdb925ce7a42dae0756b88652fdafd52dfb7 Mon Sep 17 00:00:00 2001
From: Alex Polvi <alex@polvi.net>
Date: Tue, 21 Jan 2014 13:01:09 -0800
Subject: [PATCH 1/2] usr(build-artifacts): remove some things that portage
 automatically creates

---
 build_library/prod_image_util.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/build_library/prod_image_util.sh b/build_library/prod_image_util.sh
index 50e6a80354..8b5da2126f 100755
--- a/build_library/prod_image_util.sh
+++ b/build_library/prod_image_util.sh
@@ -33,6 +33,16 @@ setup_prod_image() {
   sudo chown root:root "$key_location/update-payload-key.pub.pem"
   sudo chmod 644 "$key_location/update-payload-key.pub.pem"
 
+  # clean-ups of things we do not need
+  sudo rm ${root_fs_dir}/etc/csh.env
+  sudo rm ${root_fs_dir}/etc/gentoo-release
+  sudo rm -rf ${root_fs_dir}/var/db/pkg
+  sudo rm ${root_fs_dir}/var/db/Makefile
+  # clear them out explicitly, so this fails if something else gets dropped
+  # into xinetd.d
+  sudo rm ${root_fs_dir}/etc/xinetd.d/rsyncd
+  sudo rm -r ${root_fs_dir}/etc/xinetd.d
+
   cleanup_mounts "${root_fs_dir}"
   trap - EXIT
 

From 3647ecb1cc764f0ebccad061679e3e520f2a89fc Mon Sep 17 00:00:00 2001
From: Alex Polvi <alex@polvi.net>
Date: Tue, 21 Jan 2014 16:43:16 -0800
Subject: [PATCH 2/2] use rmdir

---
 build_library/prod_image_util.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_library/prod_image_util.sh b/build_library/prod_image_util.sh
index 8b5da2126f..5534f2ed1d 100755
--- a/build_library/prod_image_util.sh
+++ b/build_library/prod_image_util.sh
@@ -41,7 +41,7 @@ setup_prod_image() {
   # clear them out explicitly, so this fails if something else gets dropped
   # into xinetd.d
   sudo rm ${root_fs_dir}/etc/xinetd.d/rsyncd
-  sudo rm -r ${root_fs_dir}/etc/xinetd.d
+  sudo rmdir ${root_fs_dir}/etc/xinetd.d
 
   cleanup_mounts "${root_fs_dir}"
   trap - EXIT