commit 247655c04bb9563bd8ebae045ef097ea8e573e56 Author: Jan Rękorajski <[email protected]> Date: Fri Apr 12 23:10:58 2013 +0200
- 1.659, install kernel modules as non-exec to avoid various
post-scripts trying to work on them
rpm-build-macros.spec | 2 +-
rpm.macros | 22 +++++++++++-----------
2 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index ac8d27a..881a645 100644
--- 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 7b005d6..93f5872 100644
--- 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/247655c04bb9563bd8ebae045ef097ea8e573e56
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
