RepoMirrors/kpatch
1
0
Fork 0
mirror of https://github.com/dynup/kpatch synced 2025-04-01 22:48:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix shellcheck warnings

Browse Source 
Signed-off-by: Mihails Strasuns <mstrasun@amazon.com>
This commit is contained in:
Mihails Strasuns 2024-06-14 13:27:47 +00:00
parent fbcd40744a
commit 063c8cea03
3 changed files with 4 additions and 5 deletions
kpatch-build
kpatch-build
kpatch
kpatch
test/integration
lib.sh

6
kpatch-build/kpatch-build
View File

@ -1424,7 +1424,7 @@ for i in $FILES; do
# create-diff-object orig.o patched.o parent-name parent-symtab
# Module.symvers patch-mod-name output.o
"$TOOLSDIR"/create-diff-object $CDO_FLAGS "orig/$i" "patched/$i" "$KOBJFILE_NAME" \
"$TOOLSDIR"/create-diff-object "${CDO_FLAGS[@]}" "orig/$i" "patched/$i" "$KOBJFILE_NAME" \
"$SYMTAB" "$SYMVERS_FILE" "${MODNAME//-/_}" \
"output/$i" 2>&1 | logger 1
check_pipe_status create-diff-object
@ -1494,7 +1494,7 @@ cd "$TEMPDIR/patch" || die
# We no longer need kpatch-cc
for ((idx=0; idx<${#MAKEVARS[@]}; idx++)); do
MAKEVARS[$idx]=${MAKEVARS[$idx]/${KPATCH_CC_PREFIX}/}
MAKEVARS[idx]=${MAKEVARS[idx]/${KPATCH_CC_PREFIX}/}
done
export KPATCH_BUILD="$KERNEL_SRCDIR" KPATCH_NAME="$MODNAME" \
@ -1510,7 +1510,7 @@ if [[ "$USE_KLP" -eq 1 ]]; then
extra_flags="--no-klp-arch-sections"
fi
cp -f "$TEMPDIR/patch/$MODNAME.ko" "$TEMPDIR/patch/tmp.ko" || die
"$TOOLSDIR"/create-klp-module $extra_flags "$TEMPDIR/patch/tmp.ko" "$TEMPDIR/patch/$MODNAME.ko" 2>&1 | logger 1
"$TOOLSDIR"/create-klp-module "${extra_flags[@]}" "$TEMPDIR/patch/tmp.ko" "$TEMPDIR/patch/$MODNAME.ko" 2>&1 | logger 1
check_pipe_status create-klp-module
[[ "$rc" -ne 0 ]] && die "create-klp-module: exited with return code: $rc"
fi

1
kpatch/kpatch
View File

@ -355,7 +355,6 @@ load_module () {
i=$((i+1))
if [[ $i -eq $MAX_LOAD_ATTEMPTS ]]; then
die "failed to load module $module"
break
else
warn "retrying..."
sleep $RETRY_INTERVAL

2
test/integration/lib.sh
View File

@ -116,7 +116,7 @@ kpatch_photon_dependencies()
if [[ -z "$flavor" ]]; then
tdnf install -y linux-debuginfo
else
tdnf install -y linux-$flavor-debuginfo
tdnf install -y "linux-$flavor-debuginfo"
fi
}