RepoMirrors
/
kpatch
mirror of https://github.com/dynup/kpatch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1317 from jpoimboe/fix-make-check 

kpatch-build: fix "make check"
This commit is contained in:
Josh Poimboeuf 2022-12-01 10:46:33 -06:00 committed by GitHub
parent 95f87659c9 042cde03b3
commit 063a0801d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kpatch-build/kpatch-build
View File

@ -452,12 +452,12 @@ relpath() {
return return
fi fi
while [[ "${filedir#$common/}" = "$filedir" ]]; do while [[ "${filedir#"$common"/}" = "$filedir" ]]; do
common="$(dirname "$common")" common="$(dirname "$common")"
result="../$result" result="../$result"
done done
result="${result}${filedir#$common/}" result="${result}${filedir#"$common"/}"
echo "${result}/$(basename "$file")" echo "${result}/$(basename "$file")"
} }

2
kpatch-build/kpatch-cc
View File

@ -23,7 +23,7 @@ if [[ "$TOOLCHAINCMD" =~ ^(.*-)?gcc$ || "$TOOLCHAINCMD" =~ ^(.*-)?clang$ ]] ; th
[[ "$obj" = */.tmp_mc_*.o ]] && break; [[ "$obj" = */.tmp_mc_*.o ]] && break;
[[ "$obj" = */.tmp_*.o ]] && obj="${obj/.tmp_/}" [[ "$obj" = */.tmp_*.o ]] && obj="${obj/.tmp_/}"
relobj=${obj##$KPATCH_GCC_SRCDIR/} relobj=${obj##"$KPATCH_GCC_SRCDIR"/}
case "$relobj" in case "$relobj" in
*.mod.o|\ *.mod.o|\
*built-in.o|\ *built-in.o|\