RepoMirrors/kpatch
1
0
Fork 0
mirror of https://github.com/dynup/kpatch synced 2025-05-01 07:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

support CONFIG_MODVERSIONS=y

Browse Source 
When CONFIG_MODVERSIONS is enabled, loading of the patch module fails
with "no symbol version for kpatch_register".  When building the patch
module, we need to point it to the core module's Module.symvers file.

This also works when CONFIG_MODVERSIONS is disabled, since
Module.symvers is created regardless.
This commit is contained in:
Josh Poimboeuf 2014-03-27 15:56:37 -07:00
parent 1af7536dbb
commit 3b489e7d29
2 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kmod/Makefile
View File

@ -6,6 +6,7 @@ all: clean
install: install:
$(INSTALL) -d $(MODULESDIR)/$(shell uname -r)/kpatch $(INSTALL) -d $(MODULESDIR)/$(shell uname -r)/kpatch
$(INSTALL) -m 644 core/kpatch.ko $(MODULESDIR)/$(shell uname -r)/kpatch $(INSTALL) -m 644 core/kpatch.ko $(MODULESDIR)/$(shell uname -r)/kpatch
$(INSTALL) -m 644 core/Module.symvers $(MODULESDIR)/$(shell uname -r)/kpatch
$(INSTALL) -d $(DATADIR)/patch $(INSTALL) -d $(DATADIR)/patch
$(INSTALL) -m 644 patch/* $(DATADIR)/patch $(INSTALL) -m 644 patch/* $(DATADIR)/patch

33
kpatch-build/kpatch-build
View File

@ -68,26 +68,20 @@ cleanup() {
fi fi
} }
find_data_dir() { find_dirs() {
# git repo if [[ -e "$SCRIPTDIR/create-diff-object" ]]; then
DATADIR="$(readlink -f $SCRIPTDIR/../kmod)"
[[ -e "$DATADIR" ]] && return
# installation path
DATADIR="$(readlink -f $SCRIPTDIR/../share/kpatch)"
[[ -e "$DATADIR" ]] && return
return 1
}
find_tools_dir() {
# git repo # git repo
TOOLSDIR="$SCRIPTDIR" TOOLSDIR="$SCRIPTDIR"
[[ -e "$TOOLSDIR/create-diff-object" ]] && return DATADIR="$(readlink -f $SCRIPTDIR/../kmod)"
SYMVERSFILE="$DATADIR/core/Module.symvers"
return
elif [[ -e "$SCRIPTDIR/../libexec/kpatch/create-diff-object" ]]; then
# installation path # installation path
TOOLSDIR="$(readlink -f $SCRIPTDIR/../libexec/kpatch)" TOOLSDIR="$(readlink -f $SCRIPTDIR/../libexec/kpatch)"
[[ -e "$TOOLSDIR/create-diff-object" ]] && return DATADIR="$(readlink -f $SCRIPTDIR/../share/kpatch)"
SYMVERSFILE="$(readlink -f $SCRIPTDIR/../lib/modules/$(uname -r)/kpatch/Module.symvers)"
return
fi
return 1 return 1
} }
@ -137,8 +131,9 @@ TEMPDIR="$(mktemp -d)" || die "mktemp failed"
trap cleanup EXIT INT TERM trap cleanup EXIT INT TERM
find_data_dir || (echo "can't find data dir" >&2 && die) find_dirs || die "can't find supporting tools"
find_tools_dir || (echo "can't find tools dir" >&2 && die)
[[ -e "$SYMVERSFILE" ]] || die "can't find core module Module.symvers"
if [[ -d "$SRCDIR" ]] || [[ -n "$USERSRCDIR" ]]; then if [[ -d "$SRCDIR" ]] || [[ -n "$USERSRCDIR" ]]; then
if [[ -n "$USERSRCDIR" ]]; then if [[ -n "$USERSRCDIR" ]]; then
@ -244,7 +239,7 @@ cd "$TEMPDIR/output"
ld -r -o ../patch/output.o $FILES >> "$LOGFILE" 2>&1 || die ld -r -o ../patch/output.o $FILES >> "$LOGFILE" 2>&1 || die
cd "$TEMPDIR/patch" cd "$TEMPDIR/patch"
"$TOOLSDIR"/add-patches-section output.o ../vmlinux >> "$LOGFILE" 2>&1 || die "$TOOLSDIR"/add-patches-section output.o ../vmlinux >> "$LOGFILE" 2>&1 || die
KPATCH_BUILD="$SRCDIR" KPATCH_NAME="$PATCHNAME" make "O=$OBJDIR" >> "$LOGFILE" 2>&1 || die KPATCH_BUILD="$SRCDIR" KPATCH_NAME="$PATCHNAME" KBUILD_EXTRA_SYMBOLS="$SYMVERSFILE" make "O=$OBJDIR" >> "$LOGFILE" 2>&1 || die
$STRIPCMD "kpatch-$PATCHNAME.ko" >> "$LOGFILE" 2>&1 || die $STRIPCMD "kpatch-$PATCHNAME.ko" >> "$LOGFILE" 2>&1 || die
"$TOOLSDIR"/link-vmlinux-syms "kpatch-$PATCHNAME.ko" ../vmlinux >> "$LOGFILE" 2>&1 || die "$TOOLSDIR"/link-vmlinux-syms "kpatch-$PATCHNAME.ko" ../vmlinux >> "$LOGFILE" 2>&1 || die