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/binary_rootfs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'scripts/build/binary_rootfs') diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs index 806cf8613..99c962362 100755 --- a/scripts/build/binary_rootfs +++ b/scripts/build/binary_rootfs @@ -24,10 +24,11 @@ Init_config_data "${@}" Echo_message "Begin building root filesystem image..." # Requiring stage file -Require_stagefile .build/config .build/bootstrap .build/binary_chroot +Require_stagefile config bootstrap binary_chroot # Checking stage file -Check_stagefile .build/binary_rootfs +STAGE_FILE="binary_rootfs" +Check_stagefile "${STAGE_FILE}" # Acquire lock file Acquire_lockfile @@ -65,7 +66,7 @@ then cp -a cache/binary_rootfs/filesystem.* binary/"${INITFS}" # Creating stage file - Create_stagefile .build/binary_rootfs + Create_stagefile "${STAGE_FILE}" exit 0 fi @@ -447,4 +448,4 @@ then fi # Creating stage file -Create_stagefile .build/binary_rootfs +Create_stagefile "${STAGE_FILE}" -- cgit v1.2.3