Author: pluto Date: Thu Jan 25 08:09:20 2007 GMT Module: SOURCES Tag: HEAD ---- Log message: - fix smp only build.
---- Files affected:
SOURCES:
rpm.macros (1.366 -> 1.367)
---- Diffs:
================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.366 SOURCES/rpm.macros:1.367
--- SOURCES/rpm.macros:1.366 Thu Jan 11 13:32:42 2007
+++ SOURCES/rpm.macros Thu Jan 25 09:09:14 2007
@@ -1210,7 +1210,7 @@
L="<"; [[ '%{*}' != *$L$L* ]] || PATCH_SH="set -x -e;$(cat)" \
set -e -x
\
\
-for cfg in %{?with_dist_kernel:%{?with_smp:smp}
up}%{!?with_dist_kernel:nondist}; do \
+for cfg in %{?with_dist_kernel:%{?with_smp:smp}
%{?with_up:up}}%{!?with_dist_kernel:nondist}; do \
[ -r "%{_kernelsrcdir}/config-$cfg" ] || exit 1
\
\
rm -rf o
\
@@ -1287,14 +1287,21 @@
for MODULE in {%{-m*},}; do
\
[ -n "${MODULE}" ] || continue
\
MNAME=${MODULE##*/}
\
- install
${MODULE}-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \\\
+ %if %{without dist_kernel}
\
+ install %{MODULE}.ko
\\\
%{KernelD}/%{-d*}/${MNAME}%{-s:-%{-s*}}.ko
\
- %{?-s:echo "alias ${MNAME} ${MNAME}-%{-s*}"
\\\
+ %{?-s:echo "alias ${MNAME} ${MNAME}-%{-s*}"
\\\
+ >> %{ModprobeD}/%{-n*}.conf}
\
+ %endif
\
+ %if %{with up} && %{with dist_kernel}
\
+ install ${MODULE}-up.ko
\\\
+ %{KernelD}/%{-d*}/${MNAME}%{-s:-%{-s*}}.ko
\
+ %{?-s:echo "alias ${MNAME} ${MNAME}-%{-s*}"
\\\
>> %{ModprobeD}/%{-n*}.conf}
\
%if %{with smp} && %{with dist_kernel}
\
- install ${MODULE}-smp.ko
\\\
+ install ${MODULE}-smp.ko
\\\
%{KernelD}smp/%{-d*}/${MNAME}%{-s:-%{-s*}}.ko
\
- %{?-s:echo "alias ${MNAME} ${MNAME}-%{-s*}"
\\\
+ %{?-s:echo "alias ${MNAME} ${MNAME}-%{-s*}"
\\\
>> %{ModprobeD}smp/%{-n*}.conf}
\
%endif
\
done
\
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.366&r2=1.367&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
