mirror of
https://github.com/keylase/nvidia-patch.git
synced 2024-11-21 21:17:20 +00:00
linux: autopatch: Find bytecode and update patch.sh
Have a two-script workflow where one focuses on finding the bytecode in the driver files, and the other focuses on updating patch.sh using the newly found bytecode or a previously existing one. Signed-off-by: Jai Luthra <me@jailuthra.in>
This commit is contained in:
parent
ba525be7f5
commit
4d06da0f3a
3
.gitignore
vendored
3
.gitignore
vendored
@ -160,3 +160,6 @@ cython_debug/
|
|||||||
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
||||||
.idea/
|
.idea/
|
||||||
|
|
||||||
|
# Temp folder
|
||||||
|
tools/autopatch/temp
|
||||||
|
win/tools/autopatch/temp
|
||||||
|
@ -1,30 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
(( $# == 2 )) || {
|
|
||||||
>&2 echo "Usage: $0 <patch-file.sh> <new-version>"
|
|
||||||
exit 2
|
|
||||||
}
|
|
||||||
|
|
||||||
patch_file=$1
|
|
||||||
new_version=$2
|
|
||||||
|
|
||||||
if [[ ! -e $patch_file ]]; then
|
|
||||||
>&2 echo "Patch file $patch_file not found"
|
|
||||||
exit 2
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Find the latest patch line
|
|
||||||
latest=$(grep -n "\s.*\[\".*\"\]='.*/g\?'" $patch_file | tail -1)
|
|
||||||
|
|
||||||
# Find the line number to insert at
|
|
||||||
line=$(cut -d : -f 1 <<<"$latest")
|
|
||||||
line=$((line + 1))
|
|
||||||
|
|
||||||
# Use the same bytecode, and escape it
|
|
||||||
bytecode=$(cut -d = -f 2 <<<"$latest")
|
|
||||||
bytecode=$(printf '%s\n' "$bytecode" | sed -e 's/[]\/$*.^[]/\\&/g');
|
|
||||||
|
|
||||||
# Insert bytecode
|
|
||||||
sed -i "${line} i \ \ \ \ [\"${new_version}\"]=${bytecode}" $patch_file
|
|
45
tools/autopatch/find_bytecode.sh
Executable file
45
tools/autopatch/find_bytecode.sh
Executable file
@ -0,0 +1,45 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
(( $# == 2 )) || {
|
||||||
|
>&2 echo "Usage: $0 <version> <URL>"
|
||||||
|
exit 2
|
||||||
|
}
|
||||||
|
|
||||||
|
MATCH_STR=feff85c04189c4
|
||||||
|
driver_version=$1
|
||||||
|
driver_url=$2
|
||||||
|
driver_file=NVIDIA-Linux-x86_64-$driver_version.run
|
||||||
|
|
||||||
|
download_driver() {
|
||||||
|
wget -c $driver_url -O $driver_file 1>&2
|
||||||
|
chmod +x $driver_file
|
||||||
|
}
|
||||||
|
|
||||||
|
extract_driver() {
|
||||||
|
if [[ ! -e ${driver_file%".run"} ]]; then
|
||||||
|
./$driver_file -x
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
search_bytecode() {
|
||||||
|
nvenc_file=${driver_file%".run"}/libnvidia-encode.so.$driver_version
|
||||||
|
bytecode=$(xxd -c0 -ps $nvenc_file | grep -oP ".{0,6}$MATCH_STR")
|
||||||
|
echo $bytecode
|
||||||
|
}
|
||||||
|
|
||||||
|
get_patch_str() {
|
||||||
|
bytecode=$1
|
||||||
|
fixed=${bytecode:0:10}29${bytecode:(-8):8}
|
||||||
|
bytecode=$(echo "$bytecode" | sed 's/../\\x&/g')
|
||||||
|
fixed=$(echo "$fixed" | sed 's/../\\x&/g')
|
||||||
|
echo "[\"$driver_version\"]='s/$bytecode/$fixed/g'"
|
||||||
|
}
|
||||||
|
|
||||||
|
mkdir -p temp
|
||||||
|
cd temp
|
||||||
|
download_driver
|
||||||
|
extract_driver
|
||||||
|
get_patch_str $(search_bytecode)
|
||||||
|
cd ..
|
87
tools/autopatch/update_patch.sh
Executable file
87
tools/autopatch/update_patch.sh
Executable file
@ -0,0 +1,87 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
print_usage() { printf '
|
||||||
|
SYNOPSIS
|
||||||
|
update_patch.sh -f PATCH_FILE [-v VERSION [-o OLD_VERSION] | -b PATCHSTR | -h]
|
||||||
|
|
||||||
|
DESCRIPTION
|
||||||
|
Update the patch for Nvidia NVENC or NVFBC drivers for a new version
|
||||||
|
|
||||||
|
-f PATCH_FILE The file (patch.sh/patch-fbc.sh) that should be updated
|
||||||
|
-v VERSION Driver version (by default copies latest existing patch)
|
||||||
|
-o OLD_VERSION Copy patch string from this older driver version
|
||||||
|
-b PATCHSTR Append PATCHSTR to the patch_list
|
||||||
|
-h Print help
|
||||||
|
'
|
||||||
|
}
|
||||||
|
|
||||||
|
opmode="copy"
|
||||||
|
|
||||||
|
while getopts 'hf:v:o:b:' flag; do
|
||||||
|
case "${flag}" in
|
||||||
|
f) patch_file="$OPTARG" ;;
|
||||||
|
v) new_version="$OPTARG" ;;
|
||||||
|
o) old_version="$OPTARG" ;;
|
||||||
|
b) opmode="new" ; patch_string="$OPTARG" ;;
|
||||||
|
h) opmode="help" ;;
|
||||||
|
*) echo "Incorrect option specified in command line" ; exit 2 ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
|
||||||
|
get_last_line() {
|
||||||
|
if [[ -v old_version ]]; then
|
||||||
|
# Find old patch line
|
||||||
|
last=$(grep -n "\s.*\[\"$old_version\"\]='.*/g\?'" $patch_file | tail -1)
|
||||||
|
else
|
||||||
|
# Find the latest patch line
|
||||||
|
last=$(grep -n "\s.*\[\".*\"\]='.*/g\?'" $patch_file | tail -1)
|
||||||
|
fi
|
||||||
|
echo $last
|
||||||
|
}
|
||||||
|
|
||||||
|
get_last_line_number() {
|
||||||
|
last=$1
|
||||||
|
|
||||||
|
# Find the line number to insert at
|
||||||
|
line=$(cut -d : -f 1 <<<"$last")
|
||||||
|
line=$((line + 1))
|
||||||
|
|
||||||
|
echo $line
|
||||||
|
}
|
||||||
|
|
||||||
|
copy_patch() {
|
||||||
|
last=$(get_last_line)
|
||||||
|
line=$(get_last_line_number $last)
|
||||||
|
|
||||||
|
# Use the same bytecode, and escape it
|
||||||
|
bytecode=$(cut -d = -f 2 <<<"$last")
|
||||||
|
bytecode=$(printf '%s\n' "$bytecode" | sed -e 's/[]\/$*.^[]/\\&/g');
|
||||||
|
|
||||||
|
# Insert bytecode
|
||||||
|
sed -i "${line} i \ \ \ \ [\"${new_version}\"]=${bytecode}" $patch_file
|
||||||
|
|
||||||
|
echo "Successfully inserted bytecode for $new_version"
|
||||||
|
}
|
||||||
|
|
||||||
|
apply_new_patch() {
|
||||||
|
line=$(get_last_line_number $(get_last_line))
|
||||||
|
|
||||||
|
# Escape the patch string
|
||||||
|
bytecode=$(printf '%s\n' "$patch_string" | sed -e 's/[]\/$*.^[]/\\&/g');
|
||||||
|
|
||||||
|
# Insert it at the end
|
||||||
|
sed -i "${line} i \ \ \ \ ${bytecode}" $patch_file
|
||||||
|
|
||||||
|
echo "Successfully inserted $patch_string"
|
||||||
|
}
|
||||||
|
|
||||||
|
case "${opmode}" in
|
||||||
|
help) print_usage ; exit 2 ;;
|
||||||
|
copy) copy_patch ;;
|
||||||
|
new) apply_new_patch ;;
|
||||||
|
*) echo "Incorrect combination of flags. Use option -h to get help."
|
||||||
|
exit 2 ;;
|
||||||
|
esac
|
Loading…
Reference in New Issue
Block a user