Merge pull request #827 from vincentbernat/fix/ubuntu-kernel-retry

kpatch-build: fix Ubuntu kernel detection on successive retries
This commit is contained in:
Joe Lawrence 2018-04-12 14:11:38 -04:00 committed by GitHub
commit c5e4b51982
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -602,7 +602,6 @@ else
# url may be changed for a different mirror
url="http://archive.ubuntu.com/ubuntu/pool/main/l"
sublevel="SUBLEVEL = 0"
UBUNTU_KERNEL=1
elif [[ "$DISTRO" = debian ]]; then
@ -820,7 +819,7 @@ fi
echo "Building patch module: $MODNAME.ko"
if [[ ! -z "$UBUNTU_KERNEL" ]]; then
if [[ -z "$USERSRCDIR" ]] && [[ "$DISTRO" = ubuntu ]]; then
# UBUNTU: add UTS_UBUNTU_RELEASE_ABI to utsrelease.h after regenerating it
UBUNTU_ABI="${ARCHVERSION#*-}"
UBUNTU_ABI="${UBUNTU_ABI%-*}"