Author: ankry Date: Sat Aug 12 18:14:40 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- formatting
---- Files affected:
SPECS:
shfs.spec (1.58 -> 1.59) , slmodem.spec (1.24 -> 1.25)
---- Diffs:
================================================================
Index: SPECS/shfs.spec
diff -u SPECS/shfs.spec:1.58 SPECS/shfs.spec:1.59
--- SPECS/shfs.spec:1.58 Sun Jul 2 17:36:29 2006
+++ SPECS/shfs.spec Sat Aug 12 20:14:35 2006
@@ -109,11 +109,11 @@
if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
exit 1
fi
- install -d o/include/linux
- ln -sf %{_kernelsrcdir}/config-$cfg o/.config
- ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
- ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h
o/include/linux/autoconf.h
- %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+ install -d o/include/linux
+ ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+ ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
+ ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h
o/include/linux/autoconf.h
+ %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
echo "obj-m := shfs.o" > Makefile
echo "shfs-objs := dcache.o dir.o fcache.o file.o inode.o ioctl.o
proc.o shell.o symlink.o" >> Makefile
@@ -123,10 +123,10 @@
M=$PWD O=$PWD/o
%{__make} -C %{_kernelsrcdir} modules \
%if "%{_target_base_arch}" != "%{_arch}"
- ARCH=%{_target_base_arch} \
- CROSS_COMPILE=%{_target_base_cpu}-pld-linux- \
+ ARCH=%{_target_base_arch} \
+ CROSS_COMPILE=%{_target_base_cpu}-pld-linux- \
%endif
- HOSTCC="%{__cc}" \
+ HOSTCC="%{__cc}" \
%{?with_verbose:V=1} \
M=$PWD O=$PWD/o
mv shfs.ko shfs-$cfg.ko
@@ -207,6 +207,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.59 2006/08/12 18:14:35 ankry
+- formatting
+
Revision 1.58 2006/07/02 15:36:29 hawk
- release 16
================================================================
Index: SPECS/slmodem.spec
diff -u SPECS/slmodem.spec:1.24 SPECS/slmodem.spec:1.25
--- SPECS/slmodem.spec:1.24 Fri May 5 17:51:36 2006
+++ SPECS/slmodem.spec Sat Aug 12 20:14:35 2006
@@ -148,28 +148,28 @@
%if %{with kernel}
# kernel module(s)
for cfg in %{?with_dist_kernel:%{?with_smp:smp}
up}%{!?with_dist_kernel:nondist}; do
- if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
- exit 1
- fi
- install -d o/include/linux
- ln -sf %{_kernelsrcdir}/config-$cfg o/.config
- ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
- ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h
o/include/linux/autoconf.h
- %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
- %{__make} -C %{_kernelsrcdir} clean \
- RCS_FIND_IGNORE="-name '*.ko' -o" \
- M=$PWD O=$PWD/o \
- %{?with_verbose:V=1}
- %{__make} -C %{_kernelsrcdir} modules \
+ if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
+ exit 1
+ fi
+ install -d o/include/linux
+ ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+ ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
+ ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h
o/include/linux/autoconf.h
+ %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+ %{__make} -C %{_kernelsrcdir} clean \
+ RCS_FIND_IGNORE="-name '*.ko' -o" \
+ M=$PWD O=$PWD/o \
+ %{?with_verbose:V=1}
+ %{__make} -C %{_kernelsrcdir} modules \
%if "%{_target_base_arch}" != "%{_arch}"
- ARCH=%{_target_base_arch} \
- CROSS_COMPILE=%{_target_base_cpu}-pld-linux- \
+ ARCH=%{_target_base_arch} \
+ CROSS_COMPILE=%{_target_base_cpu}-pld-linux- \
%endif
- HOSTCC="%{__cc}" \
- CPP="%{__cpp}" \
- M=$PWD O=$PWD/o \
- %{?with_verbose:V=1}
- mv slamr{,-$cfg}.ko
+ HOSTCC="%{__cc}" \
+ CPP="%{__cpp}" \
+ M=$PWD O=$PWD/o \
+ %{?with_verbose:V=1}
+ mv slamr{,-$cfg}.ko
mv slusb{,-$cfg}.ko
done
%endif
@@ -194,14 +194,14 @@
%if %{with kernel}
install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
install drivers/slamr-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/slamr.ko
+ $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/slamr.ko
install drivers/slusb-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/slusb.ko
+ $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/slusb.ko
%if %{with smp} && %{with dist_kernel}
install drivers/slamr-smp.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/slamr.ko
+ $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/slamr.ko
install drivers/slusb-smp.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/slusb.ko
+ $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/slusb.ko
%endif
%endif
@@ -278,6 +278,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.25 2006/08/12 18:14:35 ankry
+- formatting
+
Revision 1.24 2006/05/05 15:51:36 shadzik
- more %build and %install fixes; builds now
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/shfs.spec?r1=1.58&r2=1.59&f=u
http://cvs.pld-linux.org/SPECS/slmodem.spec?r1=1.24&r2=1.25&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
