RepoMirrors/kpatch
1
0
Fork 0
mirror of https://github.com/dynup/kpatch synced 2025-04-18 04:55:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #542 from jpoimboe/kpatch-build-cleanups

Browse Source 
fix a couple of minor kpatch-build issues
This commit is contained in:
Seth Jennings 2015-11-03 14:09:40 -06:00
commit b2eeb59b8a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kpatch-build/kpatch-build
View File

@ -41,10 +41,10 @@ CPUS="$(getconf _NPROCESSORS_ONLN)"
CACHEDIR="${CACHEDIR:-$HOME/.kpatch}"
SRCDIR="$CACHEDIR/src"
OBJDIR="$CACHEDIR/obj"
TMPSRCDIR="$CACHEDIR/tempsrc"
TMPSRCDIR="$CACHEDIR/tmphome"
VERSIONFILE="$CACHEDIR/version"
TEMPDIR="$CACHEDIR/tmp"
LOGFILE="$TEMPDIR/build.log"
LOGFILE="$CACHEDIR/build.log"
APPLIEDPATCHFILE="kpatch.patch"
DEBUG=0
SKIPGCCCHECK=0
@ -82,6 +82,7 @@ cleanup() {
[[ -e $TEMPDIR/.config ]] && cp -f $TEMPDIR/.config $USERSRCDIR
fi
[[ "$DEBUG" -eq 0 ]] && rm -rf "$TEMPDIR"
rm -rf "$TMPSRCDIR"
unset KCFLAGS
}
@ -275,6 +276,7 @@ done
# ensure cachedir and tempdir are setup properly and cleaned
mkdir -p "$TEMPDIR" || die "Couldn't create $TEMPDIR"
rm -rf "$TEMPDIR"/*
rm -f "$LOGFILE"
trap cleanup EXIT INT TERM
@ -385,6 +387,8 @@ else
RPM_BUILD_DIR=$(rpm --eval %{_builddir})
mv "$RPM_BUILD_DIR"/kernel-*/linux-"${ARCHVERSION%.*}"*"${ARCHVERSION##*.}" "$SRCDIR" >> "$LOGFILE" 2>&1 || die
rm -rf "$TMPSRCDIR"
)
cp "$SRCDIR/.config" "$OBJDIR" || die