From 04d9ee0211e7cf2d5f637941ff6579b4f5462da6 Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Thu, 12 Mar 2020 01:21:39 +0000 Subject: 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 --- scripts/build/chroot_includes | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'scripts/build/chroot_includes') diff --git a/scripts/build/chroot_includes b/scripts/build/chroot_includes index b023d970e..1508138e4 100755 --- a/scripts/build/chroot_includes +++ b/scripts/build/chroot_includes @@ -24,10 +24,11 @@ Init_config_data "${@}" Echo_message "Begin copying chroot includes..." # Requiring stage file -Require_stagefile .build/config .build/bootstrap +Require_stagefile config bootstrap # Checking stage file -Check_stagefile .build/includes.chroot +STAGE_FILE="includes.chroot" +Check_stagefile "${STAGE_FILE}" # Acquire lock file Acquire_lockfile @@ -45,4 +46,4 @@ then fi # Creating stage file -Create_stagefile .build/includes.chroot +Create_stagefile "${STAGE_FILE}" -- cgit v1.2.3