Skip to content
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.

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

Support Anolis OS in a more elegant way #1368

Merged
merged 2 commits into from
Jan 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
53 changes: 40 additions & 13 deletions kpatch-build/kpatch-build
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,21 @@ LLD="${CROSS_COMPILE:-}ld.lld"
READELF="${CROSS_COMPILE:-}readelf"
OBJCOPY="${CROSS_COMPILE:-}objcopy"


declare -rA SUPPORTED_DEB_DISTROS=(
["debian"]="Debian OS"
["ubuntu"]="Ubuntu OS")

declare -rA SUPPORTED_RPM_DISTROS=(
["anolis"]="Anolis OS"
["centos"]="CentOS"
["fedora"]="Fedora"
["openEuler"]="OpenEuler"
["ol"]="Oracle"
["photon"]="Photon OS"
["rhel"]="RHEL")


warn() {
echo "ERROR: $1" >&2
}
Expand Down Expand Up @@ -649,6 +664,25 @@ module_name_string() {
echo "${1//[^a-zA-Z0-9_-]/-}" | cut -c 1-55
}

is_supported_deb_distro(){
[[ -n "${SUPPORTED_DEB_DISTROS[$1]:-}" ]]
}

is_supported_rpm_distro(){
[[ -n "${SUPPORTED_RPM_DISTROS[$1]:-}" ]]
}

print_supported_distro(){
if is_supported_deb_distro "$DISTRO"; then
echo "${SUPPORTED_DEB_DISTROS[$DISTRO]} distribution detected"
elif is_supported_rpm_distro "$DISTRO"; then
echo "${SUPPORTED_RPM_DISTROS[$DISTRO]} distribution detected"
else
echo "$DISTRO is not supported"
fi
}


usage() {
echo "usage: $(basename "$0") [options] <patch1 ... patchN>" >&2
echo " patchN Input patchfile(s)" >&2
Expand Down Expand Up @@ -865,16 +899,14 @@ fi

[[ -z "$TARGETS" ]] && TARGETS="vmlinux modules"

if [[ "$DISTRO" = fedora ]] || [[ "$DISTRO" = rhel ]] || [[ "$DISTRO" = ol ]] ||
[[ "$DISTRO" = centos ]] || [[ "$DISTRO" = openEuler ]] ||
[[ "$DISTRO" = photon ]]; then
if is_supported_rpm_distro "$DISTRO"; then

[[ -z "$VMLINUX" ]] && VMLINUX="/usr/lib/debug/lib/modules/$ARCHVERSION/vmlinux"
[[ -e "$VMLINUX" ]] || die "kernel-debuginfo-$ARCHVERSION not installed"

export PATH="/usr/lib64/ccache:$PATH"

elif [[ "$DISTRO" = ubuntu ]] || [[ "$DISTRO" = debian ]]; then
elif is_supported_deb_distro "$DISTRO"; then
[[ -z "$VMLINUX" ]] && VMLINUX="/usr/lib/debug/boot/vmlinux-$ARCHVERSION"

if [[ "$DISTRO" = ubuntu ]]; then
Expand Down Expand Up @@ -906,14 +938,9 @@ elif [[ -e "$KERNEL_SRCDIR"/.config ]] && [[ -e "$VERSIONFILE" ]] && [[ "$(cat "
echo "Using cache at $KERNEL_SRCDIR"

else
if [[ "$DISTRO" = fedora ]] || [[ "$DISTRO" = rhel ]] || [[ "$DISTRO" = ol ]] || [[ "$DISTRO" = centos ]] || [[ "$DISTRO" = openEuler ]] || [[ "$DISTRO" = photon ]]; then
if is_supported_rpm_distro "$DISTRO"; then

[[ "$DISTRO" = fedora ]] && echo "Fedora distribution detected"
[[ "$DISTRO" = rhel ]] && echo "RHEL distribution detected"
[[ "$DISTRO" = ol ]] && echo "Oracle Linux distribution detected"
[[ "$DISTRO" = centos ]] && echo "CentOS distribution detected"
[[ "$DISTRO" = openEuler ]] && echo "OpenEuler distribution detected"
[[ "$DISTRO" = photon ]] && echo "Photon OS distribution detected"
print_supported_distro "$DISTRO"

clean_cache

Expand Down Expand Up @@ -1009,9 +1036,9 @@ else

(cd "$KERNEL_SRCDIR" && make mrproper 2>&1 | logger) || die

elif [[ "$DISTRO" = ubuntu ]] || [[ "$DISTRO" = debian ]]; then
elif is_supported_deb_distro "$DISTRO"; then

echo "Debian/Ubuntu distribution detected"
print_supported_distro "$DISTRO"

if [[ "$DISTRO" = ubuntu ]]; then

Expand Down
12 changes: 12 additions & 0 deletions test/integration/lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,18 @@ kpatch_photon_dependencies()
fi
}

kpatch_anolis_dependencies()
{
local kernel_version
local arch
kernel_version=$(uname -r)
arch=$(uname -m)
sudo yum install -y make gcc patch bison flex openssl-devel dwarves \
rpm-build dnf-plugins-core python3-devel openssl-devel ncurses-devel elfutils-libelf-devel
sudo yum install -y "kernel-debuginfo-${kernel_version%.*}"\
"kernel-devel-${kernel_version%.*}"
}

kpatch_dependencies()
{
# shellcheck disable=SC1091
Expand Down