From 152a0696bd6e2d3caf83df766e5263742edb40f1 Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Mar 07 2023 13:42:58 +0000
Subject: kernel-module-subpackage: Fix expansion with -b parameter (bsc#1208179).


When -b is specified the script is prefixed with KMP_NEEDS_MKINITRD=1
which sets the variable for a simple command.

However, the script is no longer a simple command. Export the variable
instead.

Signen-off-by: Michal Suchanek <msuchanek@suse.de>

---

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