From: Joe Lawrence <joe.lawrence@xxxxxxxxxx>
kernel.spec.template: update (s390x) expoline.o path
Upstream commit c4e789572557 ("s390/nospec: build expoline.o for
modules_prepare target") moved expoline.o to its own subdirectory:
arch/s390/lib/expoline/expoline.o
Fixes: 7ac4e5638734 ("kernel.spec.template: Ship arch/s390/lib/expoline.o in kernel-devel")
Signed-off-by: Joe Lawrence <joe.lawrence@xxxxxxxxxx>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -1892,10 +1892,10 @@ BuildKernel() {
rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/spdxcheck.py
%ifarch s390x
- # CONFIG_EXPOLINE_EXTERN=y produces arch/s390/lib/expoline.o
+ # CONFIG_EXPOLINE_EXTERN=y produces arch/s390/lib/expoline/expoline.o
# which is needed during external module build.
- if [ -f arch/s390/lib/expoline.o ]; then
- cp -a --parents arch/s390/lib/expoline.o $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
+ if [ -f arch/s390/lib/expoline/expoline.o ]; then
+ cp -a --parents arch/s390/lib/expoline/expoline.o $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
fi
%endif
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1912
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure
