Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2655)

Unified Diff: build_image

Issue 4005002: Add ability to blacklist packages from chromeos-base/chromeos. (Closed) Base URL: http://git.chromium.org/git/crosutils.git
Patch Set: Remove extra lines. Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chromeos_blacklist » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build_image
diff --git a/build_image b/build_image
index 0865243b0a8cb8e668f0d1082afcccc7d8fd9f3c..d61b98e7fbb88e804dcc58c1bb2a0c6360afa778 100755
--- a/build_image
+++ b/build_image
@@ -97,6 +97,25 @@ if [ -z "${FLAGS_board}" ] ; then
exit 1
fi
+check_blacklist() {
+ info "Verifying that the base image does not contain a blacklisted package."
+ info "Generating list of packages for chromeos-base/chromeos."
+ local package_blacklist_file="${SCRIPTS_DIR}/chromeos_blacklist"
+ if [ ! -e "${package_blacklist_file}" ]; then
+ warn "Missing blacklist file."
+ return
+ fi
+ local blacklisted_packages=$(${SCRIPTS_DIR}/get_package_list \
+ --board="${FLAGS_board}" chromeos-base/chromeos \
+ | grep -x -f "${package_blacklist_file}")
+ if [ -n "${blacklisted_packages}" ]; then
+ die "Blacklisted packages found: ${blacklisted_packages}."
+ fi
+ info "No blacklisted packages found."
+}
+
+check_blacklist
+
# Verify user didn't specify incompatible flags for dev install shim
if [ "${FLAGS_factory_install}" -eq "${FLAGS_TRUE}" ] &&
[ "${FLAGS_dev_install}" -eq "${FLAGS_TRUE}" ] ; then
« no previous file with comments | « no previous file | chromeos_blacklist » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698