diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-12 01:21:39 +0000 |
|---|---|---|
| committer | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-17 18:57:02 +0000 |
| commit | 04d9ee0211e7cf2d5f637941ff6579b4f5462da6 (patch) | |
| tree | 17d1ccea5c085c5afd62361d2fe97a14c951cb9b /scripts/build/binary | |
| parent | bea349c82237ee165baaf1f7e8043a26e0c14417 (diff) | |
| download | vyos-live-build-04d9ee0211e7cf2d5f637941ff6579b4f5462da6.tar.gz vyos-live-build-04d9ee0211e7cf2d5f637941ff6579b4f5462da6.zip | |
stagefiles: simplify & robustify
- avoid all need to pass ".build/" path in stage file names into the
functions
- add a helper to remove a stage file (required to complete the above
properly)
- avoid duplicating filenames within scripts which makes them prone to
mistakes (some instances of which I've actually encountered and had
to fix)
Gbp-Dch: Short
Diffstat (limited to 'scripts/build/binary')
| -rwxr-xr-x | scripts/build/binary | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/build/binary b/scripts/build/binary index 07863073e..e1d28a241 100755 --- a/scripts/build/binary +++ b/scripts/build/binary @@ -86,7 +86,8 @@ lb binary_zsync ${@} if [ "${LB_BUILD_WITH_CHROOT}" = "true" ] then # Deconfiguring chroot - rm -f .build/chroot_archives + Remove_stagefile chroot_archives + lb chroot_apt remove ${@} lb chroot_hostname remove ${@} lb chroot_resolv remove ${@} |