From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Mon, 8 Jul 2019 09:36:59 +0000 (+0200)
Subject: - 1.743; treat only *.o and *.ko files as kernel modules. Avoids trying to strip... 
X-Git-Tag: auto/th/rpm-build-macros-1.743-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=cbfd796555ab151dbbeb3a3d07dc7bc54f9790cc;p=packages%2Frpm-build-macros.git

- 1.743; treat only *.o and *.ko files as kernel modules. Avoids trying to strip files like modules.builtin.modinfo.
---

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 4116ba2..d2f5d28 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define		rpm_macros_rev	1.742
+%define		rpm_macros_rev	1.743
 %define		find_lang_rev	1.40
 Summary:	PLD Linux RPM build macros
 Summary(pl.UTF-8):	Makra do budowania pakietów RPM dla Linuksa PLD
diff --git a/rpm.macros b/rpm.macros
index 01c8a39..cbfa117 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -621,7 +621,7 @@ Provides: %{1} = %{?epoch:%{epoch}:}%{?version:%{version}}%{?release:-%{release}
 %{!?debug:set +x;} \
 if [ -d "$RPM_BUILD_ROOT" ]; then \
 	if [ -d $RPM_BUILD_ROOT/lib/modules ]; then \
-		modulelist=$(find $RPM_BUILD_ROOT/lib/modules -name '*o' -type f -print); \
+		modulelist=$(find $RPM_BUILD_ROOT/lib/modules \( -name '*.o' -o -name '*.ko' \) -type f -print); \
 		if [ "$modulelist" ]; then \
 			modulecount=$(echo "$modulelist" | wc -l); \
 			printf "Stripping %d kernel modules..." $modulecount; \