Sync from SUSE:SLFO:Main kernel-livepatch-tools revision fd2caa11090c08cfa7a6eb03a96bd790

kernel-livepatch-tools.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jul  7 14:36:05 UTC 2025 - Petr Mladek <pmladek@suse.com>
+
+- Version 1.8
+
+-------------------------------------------------------------------
+Mon Jul  7 12:19:16 UTC 2025 - Petr Mladek <pmladek@suse.com>
+
+- Drop different flavors support (bsc#1245949)
+
 -------------------------------------------------------------------
 Wed Jun 25 15:20:40 UTC 2025 - Petr Mladek <pmladek@suse.com>
 

kernel-livepatch-tools.spec

@@ -20,7 +20,7 @@
 
 Name:           kernel-livepatch-tools
 %if 0%{?suse_version} >= 1600
-Version:        1.7
+Version:        1.8
 %else
 Version:        1.2
 %endif

macros.kernel-livepatch

@@ -1,29 +1,32 @@
-# Defines %flavors_to_build and %kernel_source() as a side effect.
-%klp_module_package(n:x) \
+# Defines %flavor and %kernel_source() as a side effect.
+# Also defines %flavors_to_build for backward compatibility.
+#
+# Macro %variant should be defined in the spec file before %klp_module_package
+# is used. The flavor value is guessed from the macro %variant. The value
+# "default" is used as a fallback.
+%klp_module_package(n:) \
 %{expand:%( \
 	subpkg=/usr/lib/rpm/kernel-livepatch-subpackage \
+	variant=%{?variant}%{!?variant:"-default"} \
+	[ -z "$variant" ] && variant="-default" \
+	flavor=${variant#-} \
+	if [ -z "$flavor" ] || [ ! -d "/usr/src/linux-obj/%_target_cpu/$flavor" ]; then \
+	    echo "Error: Kernel flavor '$flavor' derived from '%%variant' not found or empty at /usr/src/linux-obj/%_target_cpu/$flavor." >&2 \
+	    echo "%%%%internal_kmp_error" \
+	    exit 1 \
+	fi \
 	echo "%%define _suse_klp_module_subpackage(n:v:r:f:p:bc) %%{expand:%%(cd %_sourcedir; cat $subpkg; echo %%%%nil)}" \
-	flavors_to_build= \
-	flavors="%*" \
-	for flavor in $(ls /usr/src/linux-obj/%_target_cpu 2>/dev/null); do \
-	    case " $flavors " in \
-	    (*" $flavor "*) \
-		[ -n "%{-x}" ] && continue ;; \
-	    (*) \
-		[ -z "%{-x}" -a -n "$flavors" ] && continue ;; \
-	    esac \
-	    krel=$(make -s -C /usr/src/linux-obj/%_target_cpu/$flavor kernelrelease) \
-	    krpmver_flavor=${krel/.0-rc/.rc} \
-	    krpmver=${krpmver_flavor%%-*} \
-	    kprovide="kernel-$flavor-$krpmver" \
-	    khashprovide=$(rpm -q --whatprovides "$kprovide" --provides | grep "^kernel-$flavor-srchash-") \
-	    if [ -n "$khashprovide" ]; then \
-		kprovide="$khashprovide" \
-	    fi \
-	    flavors_to_build="$flavors_to_build $flavor" \
-	    echo "%%_suse_klp_module_subpackage -n %{-n*}%{!-n:kernel-livepatch} -r %{release} $krel $krpmver_flavor $kprovide" \
-	done \
-	echo "%%global flavors_to_build${flavors_to_build:-%%nil}" \
+	krel=$(make -s -C /usr/src/linux-obj/%_target_cpu/$flavor kernelrelease) \
+	krpmver_flavor=${krel/.0-rc/.rc} \
+	krpmver=${krpmver_flavor%%-*} \
+	kprovide="kernel-$flavor-$krpmver" \
+	khashprovide=$(rpm -q --whatprovides "$kprovide" --provides | grep "^kernel-$flavor-srchash-") \
+	if [ -n "$khashprovide" ]; then \
+	    kprovide="$khashprovide" \
+	fi \
+	echo "%%_suse_klp_module_subpackage -n %{-n*}%{!-n:kernel-livepatch} -r %{release} $krel $krpmver_flavor $kprovide" \
+	echo "%%global flavors_to_build ${flavor}" \
+	echo "%%global flavor ${flavor}"
 	echo "%%{expand:%%(test -z '%flavors_to_build' && echo %%%%internal_kmp_error)}" \
 	echo "%%global kernel_source() /usr/src/linux-obj/%_target_cpu/%%%%{1}" \
 	\