- 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

diff --git a/macros.kernel b/macros.kernel
index 40cb813e12ed928c2f3a73f0350ed417e5b7e24b..8aa96bb4dfe10f290691caa791f79fe704446a06 100644 (file)
--- 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; \

diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index f2c82043837ef3d5e3bdccecbc92c78ee5cd30ea..b6c13d18fbfc98a659bf3d0033658d46a77ff688 100644 (file)
--- 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