manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Lyndon Brown 2020-03-12 01:38:58 +00:00 committed by Raphaël Hertzog
parent 3e3e8c2c64
commit 5e423d0851
7 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/build/binary_includes
View File

@ -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

7
scripts/build/binary_loadlin
View File

@ -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

6
scripts/build/binary_package-lists
View File

@ -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

6
scripts/build/chroot_hooks
View File

@ -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

6
scripts/build/chroot_includes
View File

@ -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

6
scripts/build/chroot_preseed
View File

@ -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

6
scripts/build/installer_preseed
View File

@ -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