From 56b550dc210a09f32f20e699399213347594000f Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Thu, 27 Mar 2014 19:41:01 -0700
Subject: [PATCH] cleanup(build_image_util): Delete unused code

---
 build_image                       |  4 ----
 build_library/build_image_util.sh | 25 -------------------------
 build_library/chromeos_blacklist  |  6 ------
 3 files changed, 35 deletions(-)
 delete mode 100644 build_library/chromeos_blacklist

diff --git a/build_image b/build_image
index 014e65b2b1..39ed8446b5 100755
--- a/build_image
+++ b/build_image
@@ -103,10 +103,6 @@ done
 
 eclean-$BOARD -d packages
 
-if [[ ${skip_blacklist_check} -ne 1 ]]; then
-  check_blacklist
-fi
-
 # Check that the build root is sane.
 if [[ ${skip_test_build_root} -ne 1 ]]; then
   info "Checking build root"
diff --git a/build_library/build_image_util.sh b/build_library/build_image_util.sh
index a6aa70ad38..286434da11 100755
--- a/build_library/build_image_util.sh
+++ b/build_library/build_image_util.sh
@@ -28,31 +28,6 @@ set_build_symlinks() {
     done
 }
 
-check_blacklist() {
-  info "Verifying that the base image does not contain a blacklisted package."
-  info "Generating list of packages for ${BASE_PACKAGE}."
-  local package_blacklist_file="${BUILD_LIBRARY_DIR}/chromeos_blacklist"
-  if [ ! -e "${package_blacklist_file}" ]; then
-    warn "Missing blacklist file."
-    return
-  fi
-  local blacklisted_packages=$(${SCRIPTS_DIR}/get_package_list \
-      --board="${BOARD}" "${BASE_PACKAGE}" \
-      | grep -x -f "${package_blacklist_file}")
-  if [ -n "${blacklisted_packages}" ]; then
-    die "Blacklisted packages found: ${blacklisted_packages}."
-  fi
-  info "No blacklisted packages found."
-}
-
-make_salt() {
-  # It is not important that the salt be cryptographically strong; it just needs
-  # to be different for each release. The purpose of the salt is just to ensure
-  # that if someone collides a block in one release, they can't reuse it in
-  # future releases.
-  xxd -l 32 -p -c 32 /dev/urandom
-}
-
 cleanup_mounts() {
   echo "Cleaning up mounts"
   "${BUILD_LIBRARY_DIR}/disk_util" umount "$1" || true
diff --git a/build_library/chromeos_blacklist b/build_library/chromeos_blacklist
deleted file mode 100644
index 9aa6a5769a..0000000000
--- a/build_library/chromeos_blacklist
+++ /dev/null
@@ -1,6 +0,0 @@
-app-text/iso-codes
-dev-java/icedtea
-dev-java/icedtea6-bin
-dev-lang/perl
-media-sound/pulseaudio
-x11-libs/libxklavier