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/chroot | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'scripts/build/chroot') diff --git a/scripts/build/chroot b/scripts/build/chroot index f6ac8901f..497911800 100755 --- a/scripts/build/chroot +++ b/scripts/build/chroot @@ -31,8 +31,7 @@ Setup_clean_exit lb chroot_cache restore "${@}" # Configuring chroot -lb chroot_prep install all "${@}" -lb chroot_archives chroot install "${@}" +lb chroot_prep install all mode-archives-chroot "${@}" # Customizing chroot lb chroot_linux-image "${@}" @@ -56,8 +55,7 @@ lb chroot_interactive "${@}" Chroot chroot "dpkg-query -W" > chroot.packages.live # Deconfiguring chroot -lb chroot_archives chroot remove "${@}" -lb chroot_prep remove all "${@}" +lb chroot_prep remove all mode-archives-chroot "${@}" # Saving live OS chroot to cache lb chroot_cache save "${@}" -- cgit v1.2.3