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

Merge pull request #13 from spartacus06/fixes 

Fixes
This commit is contained in:
Josh Poimboeuf 2014-02-17 16:02:57 -06:00
parent 84a513e7c4 062355a186
commit 09a963cfd9
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
kpatch-build/kpatch-build
View File

@ -30,6 +30,7 @@ KSRCDIR="$HOME/.kpatch/$ARCHVERSION"
KSRCDIR_DIR="$(dirname $KSRCDIR)" KSRCDIR_DIR="$(dirname $KSRCDIR)"
KSRCDIR_CACHE="$KSRCDIR.tgz" KSRCDIR_CACHE="$KSRCDIR.tgz"
TEMPDIR= TEMPDIR=
STRIPCMD="strip -d --keep-file-symbols"
cleanup() { cleanup() {
rm -Rf "$KSRCDIR" "$LOGFILE" "$TEMPDIR" > /dev/null 2>/dev/null rm -Rf "$KSRCDIR" "$LOGFILE" "$TEMPDIR" > /dev/null 2>/dev/null
@ -127,8 +128,9 @@ mkdir "$TEMPDIR/patched"
for i in "$(cat $TEMPDIR/changed_objs)"; do for i in "$(cat $TEMPDIR/changed_objs)"; do
rm -f "$i" rm -f "$i"
KCFLAGS="-ffunction-sections -fdata-sections" make "$i" >> "$LOGFILE" 2>&1 || die KCFLAGS="-ffunction-sections -fdata-sections" make "$i" >> "$LOGFILE" 2>&1 || die
strip -d "$i" >> "$LOGFILE" 2>&1 || die "$STRIPCMD" "$i" >> "$LOGFILE" 2>&1 || die
cp -f "$i" "$TEMPDIR/patched/" || die mkdir -p "$TEMPDIR/patched/$(dirname $i)"
cp -f "$i" "$TEMPDIR/patched/$i" || die
done done
patch -R -p1 < "$PATCHFILE" >> "$LOGFILE" 2>&1 patch -R -p1 < "$PATCHFILE" >> "$LOGFILE" 2>&1
@ -136,16 +138,19 @@ mkdir "$TEMPDIR/orig"
for i in "$(cat $TEMPDIR/changed_objs)"; do for i in "$(cat $TEMPDIR/changed_objs)"; do
rm -f "$i" rm -f "$i"
KCFLAGS="-ffunction-sections -fdata-sections" make "$i" >> "$LOGFILE" 2>&1 || die KCFLAGS="-ffunction-sections -fdata-sections" make "$i" >> "$LOGFILE" 2>&1 || die
strip -d "$i" >> "$LOGFILE" 2>&1 || die "$STRIPCMD" -d "$i" >> "$LOGFILE" 2>&1 || die
cp -f "$i" "$TEMPDIR/orig/" || die mkdir -p "$TEMPDIR/orig/$(dirname $i)"
cp -f "$i" "$TEMPDIR/orig/$i" || die
done done
echo "Extracting new and modified ELF sections" echo "Extracting new and modified ELF sections"
cd "$TEMPDIR/orig"
FILES="$(find * -type f)"
cd "$TEMPDIR" cd "$TEMPDIR"
mkdir output mkdir output
for i in orig/*; do for i in $FILES; do
FILE="$(basename $i)" mkdir -p "output/$(dirname $i)"
"$TOOLSDIR"/create-diff-object "orig/$FILE" "patched/$FILE" "output/$FILE" >> "$LOGFILE" 2>&1 || die "$TOOLSDIR"/create-diff-object "orig/$i" "patched/$i" "output/$i" >> "$LOGFILE" 2>&1 || die
done done
echo "Building core module: kpatch.ko" echo "Building core module: kpatch.ko"
@ -154,11 +159,12 @@ KPATCH_BUILD="$KSRCDIR" make >> "$LOGFILE" 2>&1 || die
cd .. cd ..
echo "Building patch module: kpatch-$PATCHNAME.ko" echo "Building patch module: kpatch-$PATCHNAME.ko"
cd patch cd "$TEMPDIR/output"
ld -r -o output.o ../output/* >> "$LOGFILE" 2>&1 || die ld -r -o ../patch/output.o $FILES >> "$LOGFILE" 2>&1 || die
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_BASEDIR="$TEMPDIR/core" KPATCH_BUILD="$KSRCDIR" KPATCH_NAME="$PATCHNAME" make >> "$LOGFILE" 2>&1 || die KPATCH_BASEDIR="$TEMPDIR/core" KPATCH_BUILD="$KSRCDIR" KPATCH_NAME="$PATCHNAME" make >> "$LOGFILE" 2>&1 || die
strip -d "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
cp -f "$TEMPDIR/patch/kpatch-$PATCHNAME.ko" "$TEMPDIR/core/kpatch.ko" "$BASE" || die cp -f "$TEMPDIR/patch/kpatch-$PATCHNAME.ko" "$TEMPDIR/core/kpatch.ko" "$BASE" || die