mirror of
https://github.com/flatcar/scripts.git
synced 2025-11-28 14:01:43 +01:00
cleanup(build_image_util): Delete unused code
This commit is contained in:
parent
1c5393b78e
commit
56b550dc21
@ -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"
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
app-text/iso-codes
|
||||
dev-java/icedtea
|
||||
dev-java/icedtea6-bin
|
||||
dev-lang/perl
|
||||
media-sound/pulseaudio
|
||||
x11-libs/libxklavier
|
||||
Loading…
x
Reference in New Issue
Block a user