commit a1d2700ad805147c7fd99985e5cced6a713cea8b
Author: Jan Rękorajski <[email protected]>
Date: Sun Aug 14 17:40:26 2022 +0200
- use more strict glob *.ko for compressing kernel modules, ver 2.019
'*o' picks up random other files ending with 'o', ex.
modules.builtin.modinfo
macros.kernel | 4 ++--
rpm-pld-macros.spec | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index f2c8204..b6c13d1 100644
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -1,4 +1,4 @@
-%define rpm_macros_rev 2.018
+%define rpm_macros_rev 2.019
%define find_lang_rev 1.40
# split into individual X_prov_ver if there is a reason to desync
%define prov_ver 4.15
diff --git a/macros.kernel b/macros.kernel
index 40cb813..8aa96bb 100644
--- a/macros.kernel
+++ b/macros.kernel
@@ -112,12 +112,12 @@ done)
if [ -d $RPM_BUILD_ROOT/lib/modules ]; then \
tool=$(%{kmod_compress_cmd} --version | head -n1); \
case "$tool" in gzip*) ext=gz;; xz*) ext=xz;; esac; \
- q=$(find $RPM_BUILD_ROOT/lib/modules -name '*o' -type f
-print); \
+ q=$(find $RPM_BUILD_ROOT/lib/modules -name '*.ko' -type f
-print); \
if [ "$q" ]; then \
printf "Compress %d kernel modules..." $(echo "$q" | wc
-l); \
echo "$q" | xargs -r %{kmod_compress_cmd}; \
echo "DONE"; \
- find $RPM_BUILD_ROOT/lib/modules -name '*o' -type l
-printf "%p %l\n" | \
+ find $RPM_BUILD_ROOT/lib/modules -name '*.ko' -type l
-printf "%p %l\n" | \
while read a b; do ln -sf $b.$ext $a.$ext; rm -f $a;
done; \
fi; \
fi; \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-pld-macros.git/commitdiff/a1d2700ad805147c7fd99985e5cced6a713cea8b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
