From 202a916821bab00cd7f03b4ca4bc914192a686c0 Mon Sep 17 00:00:00 2001
From: Michal Kubecek <mkubecek@suse.cz>
Date: Mar 09 2023 15:32:30 +0000
Subject: Merge branch 'packaging' into master


---

diff --git a/rpm/group-source-files.pl b/rpm/group-source-files.pl
index 768ecff..89fa8e8 100755
--- a/rpm/group-source-files.pl
+++ b/rpm/group-source-files.pl
@@ -66,7 +66,7 @@ sub calc_dirs
 		do {
 			$path =~ s{/[^/]+$}{};
 			$dirs{$path} = 1;
-		} while ($path ne $base);
+		} while ($path ne $base and $path ne "");
 		# This loop also makes sure that $base itself is included.
 	}
 
diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in
index d4731f2..c9b3600 100644
--- a/rpm/kernel-binary.spec.in
+++ b/rpm/kernel-binary.spec.in
@@ -670,6 +670,10 @@ export BRP_PESIGN_FILES
 %if "%{compress_modules}" != "none"
 export BRP_PESIGN_COMPRESS_MODULE=%{compress_modules}
 %endif
+# Do not sign vanilla kernels released in official projects
+%if %build_vanilla && ! %vanilla_only
+BRP_PESIGN_FILES=""
+%endif
 
 if test -x /usr/lib/rpm/pesign/gen-hmac; then
 	$_ -r %buildroot /boot/%image-%kernelrelease-%build_flavor
diff --git a/rpm/kernel-module-subpackage b/rpm/kernel-module-subpackage
index 6645965..3a3d18c 100644
--- a/rpm/kernel-module-subpackage
+++ b/rpm/kernel-module-subpackage
@@ -82,23 +82,28 @@ END		{ exit(! good) }
 ' $spec
 )
 %pre -n %{-n*}-kmp-%1
-%{-b:KMP_NEEDS_MKINITRD=1} /usr/lib/module-init-tools/kernel-scriptlets/kmp-pre --name "%{-n*}-kmp-%1" \
+%{-b:KMP_NEEDS_MKINITRD=1; export KMP_NEEDS_MKINITRD}
+/usr/lib/module-init-tools/kernel-scriptlets/kmp-pre --name "%{-n*}-kmp-%1" \
   --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \
   --flavor "%1" --usrmerged "0%{?usrmerged}" "$@"
 %post -n %{-n*}-kmp-%1
-%{-b:KMP_NEEDS_MKINITRD=1} /usr/lib/module-init-tools/kernel-scriptlets/kmp-post --name "%{-n*}-kmp-%1" \
+%{-b:KMP_NEEDS_MKINITRD=1; export KMP_NEEDS_MKINITRD}
+/usr/lib/module-init-tools/kernel-scriptlets/kmp-post --name "%{-n*}-kmp-%1" \
   --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \
   --flavor "%1" --usrmerged "0%{?usrmerged}" "$@"
 %preun -n %{-n*}-kmp-%1
-%{-b:KMP_NEEDS_MKINITRD=1} %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/kmp-preun --name "%{-n*}-kmp-%1" \
+%{-b:KMP_NEEDS_MKINITRD=1; export KMP_NEEDS_MKINITRD}
+%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/kmp-preun --name "%{-n*}-kmp-%1" \
   --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \
   --flavor "%1" --usrmerged "0%{?usrmerged}" "$@"
 %postun -n %{-n*}-kmp-%1
-%{-b:KMP_NEEDS_MKINITRD=1} %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/kmp-postun --name "%{-n*}-kmp-%1" \
+%{-b:KMP_NEEDS_MKINITRD=1; export KMP_NEEDS_MKINITRD}
+%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/kmp-postun --name "%{-n*}-kmp-%1" \
   --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \
   --flavor "%1" --usrmerged "0%{?usrmerged}" "$@"
 %posttrans -n %{-n*}-kmp-%1
-%{-b:KMP_NEEDS_MKINITRD=1} /usr/lib/module-init-tools/kernel-scriptlets/kmp-posttrans --name "%{-n*}-kmp-%1" \
+%{-b:KMP_NEEDS_MKINITRD=1; export KMP_NEEDS_MKINITRD}
+/usr/lib/module-init-tools/kernel-scriptlets/kmp-posttrans --name "%{-n*}-kmp-%1" \
   --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \
   --flavor "%1" --usrmerged "0%{?usrmerged}" "$@"
 %files -n %{-n*}-kmp-%1