summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLyndon Brown <jnqnfe@gmail.com>2020-03-12 01:30:11 +0000
committerRaphaƫl Hertzog <hertzog@debian.org>2020-03-13 14:42:34 +0000
commit3e3e8c2c64a36699f90fd52d5167b636590473b7 (patch)
tree611feb3595b09dc60ae49ac1a9b5dc086917deb1
parent67930f3e6e2ca1312d8e047e20ba8bb783e636bd (diff)
downloadvyos-live-build-3e3e8c2c64a36699f90fd52d5167b636590473b7.tar.gz
vyos-live-build-3e3e8c2c64a36699f90fd52d5167b636590473b7.zip
fix instances of broken stagefile handling
mismatches in filenames between check and create Gbp-Dch: Short
-rwxr-xr-xscripts/build/binary_grub-legacy2
-rwxr-xr-xscripts/build/binary_includes2
-rwxr-xr-xscripts/build/bootstrap_archives2
-rwxr-xr-xscripts/build/chroot_selinuxfs2
4 files changed, 4 insertions, 4 deletions
diff --git a/scripts/build/binary_grub-legacy b/scripts/build/binary_grub-legacy
index 264b647b4..f5c050e3b 100755
--- a/scripts/build/binary_grub-legacy
+++ b/scripts/build/binary_grub-legacy
@@ -265,4 +265,4 @@ Save_package_cache binary
Remove_package
# Creating stage file
-Create_stagefile .build/binary_grub
+Create_stagefile .build/binary_grub-legacy
diff --git a/scripts/build/binary_includes b/scripts/build/binary_includes
index 81b0a7ebc..2b97de71e 100755
--- a/scripts/build/binary_includes
+++ b/scripts/build/binary_includes
@@ -27,7 +27,7 @@ Echo_message "Begin copying binary includes..."
Require_stagefile .build/config .build/bootstrap
# Checking stage file
-Check_stagefile .build/includes.binary
+Check_stagefile .build/binary_includes
# Checking lock file
Check_lockfile .lock
diff --git a/scripts/build/bootstrap_archives b/scripts/build/bootstrap_archives
index 372470191..f49fd9ede 100755
--- a/scripts/build/bootstrap_archives
+++ b/scripts/build/bootstrap_archives
@@ -34,7 +34,7 @@ Require_stagefile .build/config .build/bootstrap
Echo_message "Configuring file /etc/apt/sources.list"
# Checking stage file
-Check_stagefile .build/chroot_archives
+Check_stagefile .build/bootstrap_archives
# Checking lock file
Check_lockfile .lock
diff --git a/scripts/build/chroot_selinuxfs b/scripts/build/chroot_selinuxfs
index ffd2204aa..7c847dfee 100755
--- a/scripts/build/chroot_selinuxfs
+++ b/scripts/build/chroot_selinuxfs
@@ -66,7 +66,7 @@ case "${1}" in
fi
# Removing stage file
- rm -f .build/chroot_selinux
+ rm -f .build/chroot_selinuxfs
;;
*)