Skip to content

add kernel flavor support #1530

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

Open
usebeforefree wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −5
Open

add kernel flavor support #1530

Show file tree
Hide file tree
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
7 changes: 6 additions & 1 deletion kpatch-build/kpatch-build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -999,6 +999,11 @@ if [[ "$ARCHVERSION" =~ - ]]; then
KREL="${KREL%.*}"
fi

FLAVOR=""
if [[ "$ARCHVERSION" =~ \+(.*)$ ]]; then
FLAVOR="-${BASH_REMATCH[1]//_/-}"
fi

[[ "$ARCHVERSION" =~ .el7a. ]] && ALT="-alt"

[[ -z "$TARGETS" ]] && TARGETS="vmlinux modules"
Expand Down Expand Up @@ -1114,7 +1119,7 @@ else
elif [[ "$DISTRO" = photon ]]; then
[[ -z "$CONFIGFILE" ]] && CONFIGFILE="$KERNEL_SRCDIR"/.config
else
[[ -z "$CONFIGFILE" ]] && CONFIGFILE="$KERNEL_SRCDIR/configs/kernel$ALT-$KVER-$ARCH.config"
[[ -z "$CONFIGFILE" ]] && CONFIGFILE="$KERNEL_SRCDIR/configs/kernel$ALT-$KVER-$ARCH$FLAVOR.config"
fi
if [[ ! "$DISTRO" = photon ]]; then
(cd "$KERNEL_SRCDIR" && make mrproper 2>&1 | logger) || die
Expand Down
14 changes: 10 additions & 4 deletions test/integration/lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,30 +42,36 @@ kpatch_rhel_dependencies()
local arch
local rhel_major
local yum_utils_version
local flavor=""
kernel_version=$(uname -r)
arch=$(uname -m)
rhel_major=${VERSION_ID%%.*}

# Detect kernel flavor (e.g., +64k , +rt_64k)
if [[ "$kernel_version" =~ \+(.*)$ ]]; then
flavor="-${BASH_REMATCH[1]//_/-}"
fi

# kpatch-build dependencies
sudo yum install -y \
elfutils \
elfutils-devel \
gcc \
gcc-c++ \
git \
"kernel-devel-${kernel_version%.*}" \
"kernel${flavor}-devel-${kernel_version%.*}" \
rpm-build \
wget \
yum-utils
sudo debuginfo-install -y "kernel-${kernel_version%.*}"
sudo debuginfo-install -y "kernel${flavor}-${kernel_version%.*}"
[[ "$arch" == "ppc64le" ]] && sudo yum install -y gcc-plugin-devel

# kernel dependencies
yum_utils_version=$(rpm -q --queryformat="%{version}" yum-utils)
if [[ "${yum_utils_version}" = "$(echo -e "${yum_utils_version}\\n4.0.12" | sort -rV | head -n1)" ]]; then
sudo yum-builddep -y --skip-unavailable "kernel-${kernel_version%.*}"
sudo yum-builddep -y --skip-unavailable "kernel${flavor}-${kernel_version%.*}"
else
sudo yum-builddep -y "kernel-${kernel_version%.*}"
sudo yum-builddep -y "kernel${flavor}-${kernel_version%.*}"
fi
[[ "$arch" == "x86_64" ]] && sudo yum install -y pesign

Expand Down