Skip to content

kpatch-build: fix Fedora 42+ kernel source directory nesting #1496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
oshoval wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −1
Draft

kpatch-build: fix Fedora 42+ kernel source directory nesting #1496

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion kpatch-build/kpatch-build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1082,7 +1082,28 @@ else
elif [[ "$DISTRO" = photon ]]; then
mv "$RPMTOPDIR"/BUILD/linux-"$KVER" "$KERNEL_SRCDIR" 2>&1 | logger || die
else
mv "$RPMTOPDIR"/BUILD/kernel-*/linux-* "$KERNEL_SRCDIR" 2>&1 | logger || die
# Fedora 42+ nests the source one level deeper:
# BUILD/kernel-X.Y.Z-build/kernel-X.Y/linux-X.Y.Z-NN.fcNN.ARCH/
# Check the traditional flat layout first; if not found, search deeper.
shopt -s nullglob
LINUX_DIRS=( "$RPMTOPDIR"/BUILD/kernel-*/linux-* )
shopt -u nullglob
if [[ ${#LINUX_DIRS[@]} -eq 1 ]]; then
mv "${LINUX_DIRS[0]}" "$KERNEL_SRCDIR" 2>&1 | logger || die
elif [[ ${#LINUX_DIRS[@]} -gt 1 ]]; then
die "Multiple linux-* directories found in BUILD: ${LINUX_DIRS[*]}"
else
LINUX_SRC=$(find "$RPMTOPDIR/BUILD" -maxdepth 3 -type d -name "linux-*" \
! -path "*/configs/*")
MATCH_COUNT=$(echo "$LINUX_SRC" | grep -c . || true)
if [[ "$MATCH_COUNT" -eq 1 ]]; then
mv "$LINUX_SRC" "$KERNEL_SRCDIR" 2>&1 | logger || die
elif [[ "$MATCH_COUNT" -gt 1 ]]; then
die "Multiple linux source directories under $RPMTOPDIR/BUILD: $LINUX_SRC"
else
die "Could not find linux source directory under $RPMTOPDIR/BUILD"
fi
fi
fi

rm -rf "$RPMTOPDIR"
Expand Down