From 38a5aed0dcdf71f43cecfadc6e34c659408b6a00 Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Sun, 5 Apr 2020 17:29:31 +0100 Subject: chroot_prep: expand coverage it now covers: - `lb chroot_apt install-binary` - `lb chroot_archives {chroot|binary|source} {install|remove}` by expanding usage from: `lb chroot_prep {install|remove} HELPERS [ARGS]` to: `lb chroot_prep {install|remove} HELPERS [MODE[ MODE..]] [ARGS]` where `[MODE[ MODE..]]` is an optional set of one or more of: - archives-chroot, which specifies to use 'chroot' as the first param to the chroot_archives script - archives-binary, which specifies to use 'binary' - archives-source, which specifies to use 'source' - apt-install-binary, which specified to pass 'install-binary' instead of 'install' to chroot_apt thus _all_ chroot prep scripts can be run through this helper now! note, in the case of the binary stage, 'archives' is deliberately not added to CHROOT_PREP_OTHER, this is not a mistake! Gbp-Dch: Short --- scripts/build/source | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'scripts/build/source') diff --git a/scripts/build/source b/scripts/build/source index 9fe0dc8e0..bd113fc07 100755 --- a/scripts/build/source +++ b/scripts/build/source @@ -32,11 +32,10 @@ fi # Setting up cleanup function Setup_clean_exit -CHROOT_PREP="hosts resolv hostname" +CHROOT_PREP="hosts resolv hostname archives" # Configuring chroot (enabling networking) -lb chroot_prep install "${CHROOT_PREP}" "${@}" -lb chroot_archives source install "${@}" +lb chroot_prep install "${CHROOT_PREP}" mode-archives-source "${@}" # Preparing images lb source_live "${@}" @@ -51,7 +50,6 @@ lb source_tar "${@}" lb source_hdd "${@}" # Deconfiguring chroot -lb chroot_archives source remove "${@}" -lb chroot_prep remove "${CHROOT_PREP}" "${@}" +lb chroot_prep remove "${CHROOT_PREP}" mode-archives-source "${@}" Echo_message "Source stage completed" -- cgit v1.2.3