- 1.659, install kernel modules as non-exec to avoid various

  post-scripts trying to work on them

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index ac8d27a3a4d0a68f0d82d2eac030cc0c790a843e..881a64587ddf251a3584a59cf43167a053c4a5ad 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define                rpm_macros_rev  1.658
+%define                rpm_macros_rev  1.659
 %define                find_lang_rev   1.36
 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 7b005d6f325f47f4bea40486609ba1f6dd86d3a4..93f58726e3088773fc6389bf05a0976a721c2890 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -1815,18 +1815,18 @@ fi                                                                                      \
 %define ModprobeD $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/%{_kernel_ver} \
                                                                                                                                        \
 __install_kernel_modules() {                                                                           \
-%{!?debug:set +x;} \
+%{!?debug:set +x;}                                                                                                     \
                                                                                                                                        \
 for MODULE in {%{-m*},}; do                                                                                    \
        [ -n "${MODULE}" ] || continue                                                                  \
-       MNAME=${MODULE##*/}                                                                                     \
-       install -D ${MODULE}.ko %{KernelD}/%{-d*}/${MNAME}%{-s:-%{-s*}}.ko      \
-       %{?-s:install -d %{ModprobeD}                                                   \
+       MNAME=${MODULE##*/}                                                                                             \
+       install -m 644 -D ${MODULE}.ko %{KernelD}/%{-d*}/${MNAME}%{-s:-%{-s*}}.ko       \
+       %{?-s:install -d %{ModprobeD}                                                                   \
                echo "alias ${MNAME} ${MNAME}-%{-s*}" >> %{ModprobeD}/%{-n*}.conf}      \
 done                                                                                                                           \
 }                                                                                                                                      \
 __install_kernel_modules_old() {                                                                       \
-%{!?debug:set +x;} \
+%{!?debug:set +x;}                                                                                                     \
 local cfgs='%{?with_dist_kernel:%{?with_smp: smp}%{?with_up: up}}%{!?with_dist_kernel: nondist}' \
                                                                                                                                        \
 for MODULE in {%{-m*},}; do                                                                                    \
@@ -1834,7 +1834,7 @@ for MODULE in {%{-m*},}; do                                                                                       \
        for cfg in ${cfgs:-dist}; do                                    \
                [ "$cfg" = smp ] && suf=smp || suf=                                                     \
                MNAME=${MODULE##*/}                                                                                     \
-               install -D ${MODULE}-$cfg.ko                                                            \\\
+               install -m 644 -D ${MODULE}-$cfg.ko                                                     \\\
                        %{KernelD}$suf/%{-d*}/${MNAME}%{-s:-%{-s*}}.ko                  \
                %{?-s:install -d %{ModprobeD}$suf                                                       \
                        echo "alias ${MNAME} ${MNAME}-%{-s*}"                                   \\\
@@ -1842,11 +1842,11 @@ for MODULE in {%{-m*},}; do                                                                                     \
        done                                                                                                                    \
 done                                                                                                                           \
 }                                                                                                                                      \
-if [ -r "%{_kernelsrcdir}/.config" ]; then     \
-       __install_kernel_modules                                \
-else                                                                           \
-       __install_kernel_modules_old                    \
-fi                                                                                     \
+if [ -r "%{_kernelsrcdir}/.config" ]; then                                                     \
+       __install_kernel_modules                                                                                \
+else                                                                                                                           \
+       __install_kernel_modules_old                                                                    \
+fi                                                                                                                                     \
 %{nil}
 
 # patchset macros