Merge pull request #1463 from KosukeH-he/add_almalinux

joe-lawrence · web-flow · commit a559787edee2 · 2025-07-08T15:54:34.000-04:00
Added support for AlmaLinux
diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build
@@ -80,6 +80,7 @@ declare -rA SUPPORTED_RPM_DISTROS=(
 	["ol"]="Oracle"
 	["photon"]="Photon OS"
 	["rhel"]="RHEL"
+	["almalinux"]="AlmaLinux"
 	["amzn"]="Amazon Linux")
 
 
@@ -1399,7 +1400,7 @@ for i in $FILES; do
 	# In RHEL 7 based kernels, copy_user_64.o misuses the .fixup section,
 	# which confuses create-diff-object.  It's fine to skip it, it's an
 	# assembly file anyway.
-	[[ "$DISTRO" = rhel ]] || [[ "$DISTRO" = centos ]] || [[ "$DISTRO" = ol ]] && \
+	[[ "$DISTRO" = rhel ]] || [[ "$DISTRO" = centos ]] || [[ "$DISTRO" = almalinux ]] || [[ "$DISTRO" = ol ]] && \
 		[[ "$i" = arch/x86/lib/copy_user_64.o ]] && continue
 
 	[[ "$i" = usr/initramfs_data.o ]] && continue
diff --git a/test/integration/almalinux-9.5 b/test/integration/almalinux-9.5
@@ -0,0 +1 @@
+rhel-9.5
diff --git a/test/integration/almalinux-9.6 b/test/integration/almalinux-9.6
@@ -0,0 +1 @@
+rhel-9.6
diff --git a/test/integration/lib.sh b/test/integration/lib.sh
@@ -79,6 +79,11 @@ kpatch_rhel_dependencies()
 	fi
 }
 
+kpatch_almalinux_dependencies()
+{
+	kpatch_rhel_dependencies
+}
+
 kpatch_centos_dependencies()
 {
 	kpatch_rhel_dependencies

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,11 @@ kpatch_rhel_dependencies()`
`79`	`79`	`fi`
`80`	`80`	`}`
`81`	`81`
	`82`	`+kpatch_almalinux_dependencies()`
	`83`	`+{`
	`84`	`+ kpatch_rhel_dependencies`
	`85`	`+}`
	`86`	`+`
`82`	`87`	`kpatch_centos_dependencies()`
`83`	`88`	`{`
`84`	`89`	`kpatch_rhel_dependencies`