RepoMirrors/kpatch
1
0
Fork 0
mirror of https://github.com/dynup/kpatch synced 2025-01-06 13:09:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

kpatch-build: make clean_cache() wipe out ~/.kpatch completely

Browse Source 
When wiping out the ~/.kpatch cache before replacing it with a new
kernel source, there's no need to keep anything around.  Just wipe it
all out and start over.

Also, when building with the -s option, it doesn't need to touch
~/.kpatch/version or ~/.kpatch/src, so it can just skip the cleaning.
That keeps the previous cache around for the next incantation of
kpatch-build without '-s'.
This commit is contained in:
Josh Poimboeuf 2017-03-03 10:32:24 -06:00
parent 2e99d6b7a4
commit e1a2e4e6ad
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kpatch-build/kpatch-build
View File

@ -90,8 +90,8 @@ cleanup() {
} }
clean_cache() { clean_cache() {
[[ -z $USERSRCDIR ]] && rm -rf "$SRCDIR" rm -rf "$CACHEDIR"
rm -rf "$VERSIONFILE" mkdir -p "$TEMPDIR" || die "Couldn't create $TEMPDIR"
} }
check_pipe_status() { check_pipe_status() {
@ -376,8 +376,6 @@ fi
if [[ -n "$USERSRCDIR" ]]; then if [[ -n "$USERSRCDIR" ]]; then
echo "Using source directory at $USERSRCDIR" echo "Using source directory at $USERSRCDIR"
clean_cache
# save vmlinux before it gets removed with mrproper # save vmlinux before it gets removed with mrproper
[[ "$VMLINUX" -ef "$SRCDIR"/vmlinux ]] && cp -f "$VMLINUX" $TEMPDIR/vmlinux && VMLINUX=$TEMPDIR/vmlinux [[ "$VMLINUX" -ef "$SRCDIR"/vmlinux ]] && cp -f "$VMLINUX" $TEMPDIR/vmlinux && VMLINUX=$TEMPDIR/vmlinux
@ -390,6 +388,8 @@ else
echo "Fedora/Red Hat distribution detected" echo "Fedora/Red Hat distribution detected"
rpm -q --quiet rpmdevtools || die "rpmdevtools not installed" rpm -q --quiet rpmdevtools || die "rpmdevtools not installed"
clean_cache
echo "Downloading kernel source for $ARCHVERSION" echo "Downloading kernel source for $ARCHVERSION"
if [[ -z "$SRCRPM" ]]; then if [[ -z "$SRCRPM" ]]; then
if [[ $DISTRO = fedora ]]; then if [[ $DISTRO = fedora ]]; then
@ -403,8 +403,6 @@ else
echo "Unpacking kernel source" echo "Unpacking kernel source"
clean_cache
rpm -D "_topdir $RPMTOPDIR" -ivh "$SRCRPM" >> "$LOGFILE" 2>&1 || die rpm -D "_topdir $RPMTOPDIR" -ivh "$SRCRPM" >> "$LOGFILE" 2>&1 || die
rpmbuild -D "_topdir $RPMTOPDIR" -bp "--target=$(uname -m)" "$RPMTOPDIR"/SPECS/kernel.spec >> "$LOGFILE" 2>&1 || rpmbuild -D "_topdir $RPMTOPDIR" -bp "--target=$(uname -m)" "$RPMTOPDIR"/SPECS/kernel.spec >> "$LOGFILE" 2>&1 ||
die "rpmbuild -bp failed. you may need to run 'yum-builddep kernel' first." die "rpmbuild -bp failed. you may need to run 'yum-builddep kernel' first."
@ -447,6 +445,8 @@ else
pkgver="${KVER}_$(dpkg-query -W -f='${Version}' linux-image-$ARCHVERSION)" pkgver="${KVER}_$(dpkg-query -W -f='${Version}' linux-image-$ARCHVERSION)"
pkgname="linux-source-${pkgver}_all" pkgname="linux-source-${pkgver}_all"
clean_cache
cd $TEMPDIR cd $TEMPDIR
echo "Downloading the kernel source for $ARCHVERSION" echo "Downloading the kernel source for $ARCHVERSION"
# Download source deb pkg # Download source deb pkg
@ -456,7 +456,6 @@ else
dpkg -x ${pkgname}.deb $TEMPDIR >> "$LOGFILE" || die "dpkg: Could not extract ${pkgname}.deb" dpkg -x ${pkgname}.deb $TEMPDIR >> "$LOGFILE" || die "dpkg: Could not extract ${pkgname}.deb"
# extract and move to SRCDIR # extract and move to SRCDIR
tar $taroptions usr/src/linux-source-$KVER.tar.${extension} >> "$LOGFILE" || die "tar: Failed to extract kernel source package" tar $taroptions usr/src/linux-source-$KVER.tar.${extension} >> "$LOGFILE" || die "tar: Failed to extract kernel source package"
clean_cache
mv linux-source-$KVER "$SRCDIR" || die mv linux-source-$KVER "$SRCDIR" || die
cp "/boot/config-${ARCHVERSION}" "$SRCDIR/.config" || die cp "/boot/config-${ARCHVERSION}" "$SRCDIR/.config" || die
if [[ "$ARCHVERSION" == *-* ]]; then if [[ "$ARCHVERSION" == *-* ]]; then