diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | manpages/en/live-build.7 | 4 | ||||
| -rwxr-xr-x | scripts/build/bootstrap | 1 | ||||
| -rwxr-xr-x | scripts/build/bootstrap_archive-keys | 77 |
4 files changed, 1 insertions, 82 deletions
diff --git a/debian/changelog b/debian/changelog index 93731220d..33ee3eafd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,7 @@ live-build (1:20160105) UNRELEASED; urgency=medium <sjoerd@debian.org> for the initial patch. Closes: #790033 * Manual pages updates by jnqnfe. Closes: #774730 * Drop left-over translation files for removed lb_testroot command. + * Get rid of useless bootstrap_archive-keys script. Closes: #773775 [ Kristian Klausen ] * Include ext{3,4} journal size when calculating image size. Closes: #801712 diff --git a/manpages/en/live-build.7 b/manpages/en/live-build.7 index 49dba85b1..7c6628d79 100644 --- a/manpages/en/live-build.7 +++ b/manpages/en/live-build.7 @@ -82,14 +82,10 @@ The actual work of live\-build is implemented in the low-level commands, called .PP Note that the interface (set of options and the semantics) to these low\-level commands are meant to be a lot more stable than Porcelain level commands. The interface to Porcelain commands on the other hand are subject to change in order to improve the end user experience. .SS Bootstrap stage specific commands -.IP "\fBlb bootstrap_archive\-keys\fR(1)" 4 -installs derivative distribution archive keys into bootstrap directory (currently applies to progress-linux builds only) .IP "\fBlb bootstrap_archives\fR(1)" 4 applies apt archive configuration .IP "\fBlb bootstrap_cache\fR(1)" 4 in save mode, saves to cache a copy of the generated bootstrap directory, and in restore mode, restores from cache a previously generated copy -.IP "\fBlb bootstrap_cdebootstrap\fR(1)" 4 -creates (bootstrap) a basic Debian root filesystem using cdebootstrap(8) .IP "\fBlb bootstrap_debootstrap\fR(1)" 4 creates (bootstrap) a basic Debian root filesystem using debootstrap(8) .SS Chroot stage specific commands 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 |