qiurui
/
armbian-build
mirror of https://github.com/armbian/build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

armbian-next: `drivers-harness`: make sure cached patch is valid; write it first to tmp file; redirect inside subshell 

- otherwise if format-patch failed, it would still create the (invalid) file which would be used next time
This commit is contained in:
Ricardo Pardini 2023-01-05 15:15:18 +01:00
parent 92a4296a62
commit 61d4691e09
No known key found for this signature in database
GPG Key ID: 3D38CA12A66C5D02
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/functions/compilation/patch/drivers-harness.sh
View File

@ -32,8 +32,14 @@ function kernel_drivers_create_patches() {
# If the target file exists, we can skip the patch creation.
if [[ -f "${cache_target_file}" ]]; then
display_alert "Using cached drivers patch file for ${LINUXFAMILY}-${KERNEL_MAJOR_MINOR}" "${cache_key}" "cachehit"
return
# Make sure the file is larger than 512 bytes. Old versions of this code left small/empty files on failure.
if [[ $(stat -c%s "${cache_target_file}") -gt 512 ]]; then
display_alert "Using cached drivers patch file for ${LINUXFAMILY}-${KERNEL_MAJOR_MINOR}" "${cache_key}" "cachehit"
return
else
display_alert "Removing invalid/small cached drivers patch file for ${LINUXFAMILY}-${KERNEL_MAJOR_MINOR}" "${cache_key}" "warn"
run_host_command_logged rm -fv "${cache_target_file}"
fi
fi
display_alert "Creating patches for kernel drivers" "version: '${KERNEL_MAJOR_MINOR}' family: '${LINUXFAMILY}'" "info"
@ -121,6 +127,7 @@ function export_changes_as_patch_via_git_format_patch() {
# git: commit the changes
declare -a commit_params=(
"--quiet" # otherwise too much output
-m "drivers for ${LINUXFAMILY} version ${KERNEL_MAJOR_MINOR}"
--author="${MAINTAINER} <${MAINTAINERMAIL}>"
)
@ -141,5 +148,11 @@ function export_changes_as_patch_via_git_format_patch() {
'--stat-graph-width=10' # shorten the diffgraph graph part, it's too long
"--zero-commit" # Output an all-zero hash in each patch’s From header instead of the hash of the commit.
)
run_host_command_logged env -i "${common_envs[@]@Q}" git format-patch "${formatpatch_params[@]@Q}" > "${target_patch_file}"
declare target_patch_file_tmp="${target_patch_file}.tmp"
# The redirect ">" is escaped here, so it's run inside the subshell, not in the current shell.
run_host_command_logged env -i "${common_envs[@]@Q}" git format-patch "${formatpatch_params[@]@Q}" ">" "${target_patch_file_tmp}"
# move the tmp to final, if it worked.
run_host_command_logged mv -v "${target_patch_file_tmp}" "${target_patch_file}"
}