summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorRaphaël Hertzog <hertzog@debian.org>2016-11-28 21:36:54 +0100
committerRaphaël Hertzog <hertzog@debian.org>2016-11-28 21:36:57 +0100
commitd8ca2041ad455aab3ecdcdc1083820b500e78e76 (patch)
tree09ea64b25b00fb9a7c434455e22064b048c42db6 /scripts
parent63af37b9c51294d6a176dcd726176047790a7589 (diff)
downloadvyos-live-build-d8ca2041ad455aab3ecdcdc1083820b500e78e76.tar.gz
vyos-live-build-d8ca2041ad455aab3ecdcdc1083820b500e78e76.zip
Get rid of useless bootstrap_archive-keys script
Closes: #773775
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build/bootstrap1
-rwxr-xr-xscripts/build/bootstrap_archive-keys77
2 files changed, 0 insertions, 78 deletions
diff --git a/scripts/build/bootstrap b/scripts/build/bootstrap
index 486f99cc3..53800ebc1 100755
--- a/scripts/build/bootstrap
+++ b/scripts/build/bootstrap
@@ -37,7 +37,6 @@ Setup_cleanup
# Bootstrapping system
lb bootstrap_cache restore ${@}
lb bootstrap_debootstrap ${@}
-lb bootstrap_archive-keys ${@}
lb bootstrap_cache save ${@}
# Configuring chroot
diff --git a/scripts/build/bootstrap_archive-keys b/scripts/build/bootstrap_archive-keys
deleted file mode 100755
index 48d080434..000000000
--- a/scripts/build/bootstrap_archive-keys
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2015 Daniel Baumann <mail@daniel-baumann.ch>
-##
-## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
-
-set -e
-
-# Including common functions
-[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'bootstrap non-Debian archive-signing-keys')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-# TODO: allow verification against user-specified keyring
-# For now, we'll only validate against debian-keyring
-
-# TODO2: use chrooted validation rather than host system based one
-
-case "${LB_MODE}" in
- progress-linux)
- case "${LB_DISTRIBUTION}" in
- artax*)
- _KEYS="artax artax-backports"
- ;;
-
- baureo*)
- _KEYS="baureo baureo-backports"
- ;;
-
- cairon*)
- _KEYS="cairon cairon-backports"
- ;;
- esac
-
- _URL="${LB_MIRROR_CHROOT}/project/pgp"
- ;;
-esac
-
-for _KEY in ${_KEYS}
-do
- Echo_message "Fetching archive-key ${_KEY}..."
-
- wget -q "${_URL}/archive-key-${_KEY}.asc" -O chroot/key.asc
- wget -q "${_URL}/archive-key-${_KEY}.asc.sig" -O chroot/key.asc.sig
-
- if [ -e /usr/bin/gpgv ] && [ -e /usr/share/keyrings/debian-keyring.gpg ]
- then
- Echo_message "Verifying archive-key ${_KEY} against debian-keyring..."
-
- /usr/bin/gpgv --quiet --keyring /usr/share/keyrings/debian-keyring.gpg chroot/key.asc.sig chroot/key.asc > /dev/null 2>&1 || { Echo_error "archive-key ${_KEY} has invalid signature."; return 1;}
- else
- Echo_warning "Skipping archive-key ${_KEY} verification, either gpgv or debian-keyring not available on host system..."
- fi
-
- Echo_message "Importing archive-key ${_KEY}..."
-
- Chroot chroot "apt-key add key.asc"
- rm -f chroot/key.asc chroot/key.asc.sig
-done
-
-Chroot chroot "apt-get update"
-
-# Creating stage file
-Create_stagefile .build/bootstrap_archive-keys