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

better patch file cleanup

Browse Source 
If the patch file fails to apply, it "corrupts" the cache by leaving the
old applied-patch file around.  Fix that by always cleaning up after
ourselves.
This commit is contained in:
Josh Poimboeuf 2014-03-13 11:53:44 -05:00
parent 3acf30c0c8
commit a611185dce
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
kpatch-build/kpatch-build
View File

@ -60,6 +60,14 @@ die() {
exit 1
}
cleanup() {
rm -rf "$TEMPDIR"
if [[ -e "$SRCDIR/$APPLIEDPATCHFILE" ]]; then
patch -p1 -R -d "$SRCDIR" < "$SRCDIR/$APPLIEDPATCHFILE" &> /dev/null
rm -f "$SRCDIR/$APPLIEDPATCHFILE"
fi
}
find_data_dir() {
# git repo
DATADIR="$(readlink -f $SCRIPTDIR/../kmod)"
@ -122,11 +130,11 @@ fi
TEMPDIR="$(mktemp -d)" || die "mktemp failed"
trap cleanup EXIT INT TERM
find_data_dir || (echo "can't find data dir" >&2 && die)
find_tools_dir || (echo "can't find tools dir" >&2 && die)
trap "rm -rf $TEMPDIR" EXIT INT TERM
if [[ -d "$SRCDIR" ]] || [[ -n "$USERSRCDIR" ]]; then
if [[ -n "$USERSRCDIR" ]]; then
SRCDIR="$CACHEDIR/src"
@ -144,12 +152,6 @@ if [[ -d "$SRCDIR" ]] || [[ -n "$USERSRCDIR" ]]; then
else
echo "Using cache at $SRCDIR"
fi
cd "$SRCDIR" || die
if [[ -f "$APPLIEDPATCHFILE" ]]; then
patch -R -p1 < "$APPLIEDPATCHFILE" >> "$LOGFILE" 2>&1 || die "the kpatch cache is corrupted. \"rm -rf $CACHEDIR\" and try again"
rm -f "$APPLIEDPATCHFILE"
fi
else
rpm -q --quiet rpmdevtools || die "rpmdevtools not installed"
rpm -q --quiet yum-utils || die "yum-utils not installed"
@ -166,12 +168,12 @@ else
mkdir -p "$OBJDIR"
mv "$HOME"/rpmbuild/BUILD/kernel-*/linux-"$ARCHVERSION" "$SRCDIR" >> "$LOGFILE" 2>&1 || die
cd "$SRCDIR"
cp .config "$OBJDIR" || die
cp "$SRCDIR/.config" "$OBJDIR" || die
echo "$LOCALVERSION" > "$SRCDIR/localversion" || die
fi
echo "Building original kernel"
cd "$SRCDIR" || die
make mrproper >> "$LOGFILE" 2>&1 || die
make "-j$CPUS" vmlinux "O=$OBJDIR" >> "$LOGFILE" 2>&1 || die