[packages/rpm-build-macros] - 1.743; treat only *.o and *.ko files as kernel modules. Avoids trying to strip files like modules.
arekm
arekm at pld-linux.org
Mon Jul 8 11:37:09 CEST 2019
commit cbfd796555ab151dbbeb3a3d07dc7bc54f9790cc
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Mon Jul 8 11:36:59 2019 +0200
- 1.743; treat only *.o and *.ko files as kernel modules. Avoids trying to strip files like modules.builtin.modinfo.
rpm-build-macros.spec | 2 +-
rpm.macros | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
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; \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/cbfd796555ab151dbbeb3a3d07dc7bc54f9790cc
More information about the pld-cvs-commit
mailing list