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

syslinux: fix errors re-running under `--force` 

robustification is required to not just `--force` but recovery from failure
or user cancellation.

Gbp-Dch: Short
This commit is contained in:
Lyndon Brown 2020-04-04 09:15:35 +01:00
parent 82f0acb091
commit 9d5665c627
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/build/binary_syslinux
View File

@ -101,10 +101,16 @@ Restore_package_cache binary
# Installing depends # Installing depends
Install_package Install_package
# Ensure fresh
rm -rf ${_TARGET}
mkdir -p ${_TARGET}
# Copying files # Copying files
case "${LB_BUILD_WITH_CHROOT}" in case "${LB_BUILD_WITH_CHROOT}" in
true) true)
mkdir -p ${_TARGET} # Ensure fresh
rm -rf chroot/root/${_BOOTLOADER}
rm -rf chroot/root/${_BOOTLOADER}.tmp
mkdir -p chroot/root/${_BOOTLOADER} mkdir -p chroot/root/${_BOOTLOADER}
# Copy in two steps since the theme can have absolute symlinks and would therefore not be dereferenced correctly # Copy in two steps since the theme can have absolute symlinks and would therefore not be dereferenced correctly
@ -122,8 +128,6 @@ case "${LB_BUILD_WITH_CHROOT}" in
;; ;;
false) false)
mkdir -p ${_TARGET}
cp -aL ${_SOURCE_COMMON}/* ${_TARGET} > /dev/null 2>&1 || true cp -aL ${_SOURCE_COMMON}/* ${_TARGET} > /dev/null 2>&1 || true
cp -aLf ${_SOURCE}/* ${_TARGET} > /dev/null 2>&1 || true cp -aLf ${_SOURCE}/* ${_TARGET} > /dev/null 2>&1 || true
if [ -e "${_SOURCE_USER_COMMON}" ]; then if [ -e "${_SOURCE_USER_COMMON}" ]; then
@ -155,8 +159,8 @@ then
# Rename kernel files # Rename kernel files
# If multiple initrd images are being generated (by DKMS packages, etc), # If multiple initrd images are being generated (by DKMS packages, etc),
# we likely only want the latest version. # we likely only want the latest version.
ln $(ls -r1 --sort=version binary/${_INITRAMFS}/vmlinuz-* | head -n 1) binary/${_INITRAMFS}/vmlinuz ln -f $(ls -r1 --sort=version binary/${_INITRAMFS}/vmlinuz-* | head -n 1) binary/${_INITRAMFS}/vmlinuz
ln $(ls -r1 --sort=version binary/${_INITRAMFS}/initrd.img-* | head -n 1) binary/${_INITRAMFS}/initrd.img ln -f $(ls -r1 --sort=version binary/${_INITRAMFS}/initrd.img-* | head -n 1) binary/${_INITRAMFS}/initrd.img
sed -e "s|@FLAVOUR@|${LB_LINUX_FLAVOURS}|g" \ sed -e "s|@FLAVOUR@|${LB_LINUX_FLAVOURS}|g" \
-e "s|@LINUX@|/${_INITRAMFS}/vmlinuz|g" \ -e "s|@LINUX@|/${_INITRAMFS}/vmlinuz|g" \
@ -176,8 +180,8 @@ then
# Rename kernel files # Rename kernel files
# If multiple initrd images are being generated (by DKMS packages, etc), # If multiple initrd images are being generated (by DKMS packages, etc),
# we likely only want the latest version. # we likely only want the latest version.
ln $(ls -r1 --sort=version binary/${_INITRAMFS}/vmlinuz-*-${_FLAVOUR} | head -n 1) binary/${_INITRAMFS}/vmlinuz${_NUMBER} ln -f $(ls -r1 --sort=version binary/${_INITRAMFS}/vmlinuz-*-${_FLAVOUR} | head -n 1) binary/${_INITRAMFS}/vmlinuz${_NUMBER}
ln $(ls -r1 --sort=version binary/${_INITRAMFS}/initrd.img-*-${_FLAVOUR} | head -n 1) binary/${_INITRAMFS}/initrd${_NUMBER}.img ln -f $(ls -r1 --sort=version binary/${_INITRAMFS}/initrd.img-*-${_FLAVOUR} | head -n 1) binary/${_INITRAMFS}/initrd${_NUMBER}.img
if [ "${_NUMBER}" -gt 1 ] if [ "${_NUMBER}" -gt 1 ]
then then