Author: glen Date: Sun Oct 28 11:11:04 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- use variable in for cfg loop as empty list takes $*: (set -- 1 2; for cfg; do
echo $cfg; done) --> 1 2
---- Files affected:
SOURCES:
rpm.macros (1.398 -> 1.399)
---- Diffs:
================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.398 SOURCES/rpm.macros:1.399
--- SOURCES/rpm.macros:1.398 Thu Oct 18 22:54:33 2007
+++ SOURCES/rpm.macros Sun Oct 28 12:10:58 2007
@@ -1167,8 +1167,9 @@
compile() {
\
L="<"; [[ '%{*}' != *$L$L* ]] || PATCH_SH="set -x -e;$(cat)" \
set -e -x
\
+ local cfgs='%{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}'
\
\
-for cfg in %{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}; do \
+for cfg in $cfgs; do
\
[ -r "%{_kernelsrcdir}/config-$cfg" ] || exit 1
\
\
rm -rf o
\
@@ -1179,7 +1180,7 @@
%ifarch ppc ppc64
\
install -d o/include/asm
\
[ ! -d %{_kernelsrcdir}/include/asm-%{_target_base_arch} ] || ln -sf
%{_kernelsrcdir}/include/asm-%{_target_base_arch}/* o/include/asm \
- [ ! -d %{_kernelsrcdir}/include/asm-powerpc ] || ln -snf
%{_kernelsrcdir}/include/asm-powerpc/* o/include/asm \
+ [ ! -d %{_kernelsrcdir}/include/asm-powerpc ] || ln -snf
%{_kernelsrcdir}/include/asm-powerpc/* o/include/asm \
%else
\
ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} o/include/asm \
%endif
\
@@ -1229,7 +1230,7 @@
# -s <suffix> -- suffix to use when installing modules, useful when module
# with same name exists in kernel already
# -n <file> -- name of modprobe config file to use (without .conf extension)
-# for definig aliases, only useful with -s
+# for defining aliases, only useful with -s
%install_kernel_modules(m:d:s:n:)
\
%{!?-m:%{error:%{0}: Required module name (-m) missing}exit 1} \
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm.macros?r1=1.398&r2=1.399&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
