From 5e423d0851f0c42cd2c23274a8207006c69dfb0f Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Thu, 12 Mar 2020 01:38:58 +0000 Subject: fix instances of bad stagefile creation circumstances theres no point in creation of stagefiles being kept within a conditional block of work. if the script completes with success then it should create its stagefile to thus avoid repeating any work that it might have done should it get re-run without being forced. Gbp-Dch: Short --- scripts/build/binary_includes | 6 +++--- scripts/build/binary_loadlin | 7 +++---- scripts/build/binary_package-lists | 6 +++--- scripts/build/chroot_hooks | 6 +++--- scripts/build/chroot_includes | 6 +++--- scripts/build/chroot_preseed | 6 +++--- scripts/build/installer_preseed | 6 +++--- 7 files changed, 21 insertions(+), 22 deletions(-) diff --git a/scripts/build/binary_includes b/scripts/build/binary_includes index 2b97de71e..6e0c79716 100755 --- a/scripts/build/binary_includes +++ b/scripts/build/binary_includes @@ -48,7 +48,7 @@ then find binary -type l | xargs rm -f ;; esac - - # Creating stage file - Create_stagefile .build/binary_includes fi + +# Creating stage file +Create_stagefile .build/binary_includes diff --git a/scripts/build/binary_loadlin b/scripts/build/binary_loadlin index 7bdeb8778..5719c3dad 100755 --- a/scripts/build/binary_loadlin +++ b/scripts/build/binary_loadlin @@ -85,12 +85,11 @@ cat > binary/install/gtk/install.bat << EOF EOF fi - - # Creating stage file - Create_stagefile .build/binary_loadlin ;; - *) Echo_warning "loadlin inclusion is set to true but not compatible with your architecture, ignoring." ;; esac + +# Creating stage file +Create_stagefile .build/binary_loadlin diff --git a/scripts/build/binary_package-lists b/scripts/build/binary_package-lists index 50453cb04..a5c47a2fc 100755 --- a/scripts/build/binary_package-lists +++ b/scripts/build/binary_package-lists @@ -175,7 +175,7 @@ then # Saving cache Save_package_cache chroot - - # Creating stage file - Create_stagefile .build/binary_package-lists fi + +# Creating stage file +Create_stagefile .build/binary_package-lists diff --git a/scripts/build/chroot_hooks b/scripts/build/chroot_hooks index 125b77ec3..eb113bb6a 100755 --- a/scripts/build/chroot_hooks +++ b/scripts/build/chroot_hooks @@ -105,12 +105,12 @@ then # Saving cache Save_package_cache chroot - - # Creating stage file - Create_stagefile .build/chroot_hooks fi # Remove bind mount of build config inside chroot. umount chroot/live-build/config rmdir chroot/live-build/config rmdir chroot/live-build + +# Creating stage file +Create_stagefile .build/chroot_hooks diff --git a/scripts/build/chroot_includes b/scripts/build/chroot_includes index bda5caf93..603d58256 100755 --- a/scripts/build/chroot_includes +++ b/scripts/build/chroot_includes @@ -45,7 +45,7 @@ then Echo_message "Extracting the tarball in the chroot..." Chroot chroot "tar -xvf includes.chroot.tar --no-same-owner --keep-directory-symlink --overwrite" rm chroot/includes.chroot.tar - - # Creating stage file - Create_stagefile .build/includes.chroot fi + +# Creating stage file +Create_stagefile .build/includes.chroot diff --git a/scripts/build/chroot_preseed b/scripts/build/chroot_preseed index 7351ea8b6..e5a5fe3a5 100755 --- a/scripts/build/chroot_preseed +++ b/scripts/build/chroot_preseed @@ -78,7 +78,7 @@ then # Remove dependency Remove_package - - # Creating stage file - Create_stagefile .build/chroot_preseed fi + +# Creating stage file +Create_stagefile .build/chroot_preseed diff --git a/scripts/build/installer_preseed b/scripts/build/installer_preseed index c5802be65..6bef6c46b 100755 --- a/scripts/build/installer_preseed +++ b/scripts/build/installer_preseed @@ -62,7 +62,7 @@ then cat "${_FILE}" >> "${_DIRECTORY}/preseed.cfg" fi done - - # Creating stage file - Create_stagefile .build/installer_preseed fi + +# Creating stage file +Create_stagefile .build/installer_preseed -- cgit v1.2.3