Author: mguevara Date: Mon Mar 5 21:40:43 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- rel 0.3
- added up bcond
- use make instead of build.sh for building - userland builds separately
from kernel modules
- use install_kernel_modules macro
- modules location changed from misc to kernel/misc
---- Files affected:
SPECS:
truecrypt.spec (1.13 -> 1.14)
---- Diffs:
================================================================
Index: SPECS/truecrypt.spec
diff -u SPECS/truecrypt.spec:1.13 SPECS/truecrypt.spec:1.14
--- SPECS/truecrypt.spec:1.13 Tue Feb 27 16:49:15 2007
+++ SPECS/truecrypt.spec Mon Mar 5 22:40:38 2007
@@ -8,6 +8,7 @@
%bcond_without dist_kernel # allow non-distribution kernel
%bcond_without kernel # don't build kernel modules
%bcond_without smp # don't build SMP module
+%bcond_without up # don't build UP module
%bcond_without userspace # don't build userspace utilities
%bcond_with verbose # verbose build (V=1)
#
@@ -15,7 +16,7 @@
Summary(pl.UTF-8): TrueCrypt - wolnodostępne oprogramowanie do szyfrowania
dysków
Name: truecrypt
Version: 4.2a
-%define _rel 0.2
+%define _rel 0.3
Release: %{_rel}
License: GPL
Group: Base/Kernel
@@ -113,7 +114,7 @@
%if %{with kernel}
# kernel module(s)
cd Linux/Kernel
-for cfg in %{?with_dist_kernel:%{?with_smp:smp}
up}%{!?with_dist_kernel:nondist}; do
+for cfg in %{?with_dist_kernel:%{?with_up:up}
%{?with_smp:smp}}%{!?with_dist_kernel:nondist}; do
if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
exit 1
fi
@@ -135,13 +136,22 @@
RCS_FIND_IGNORE="-name '*.ko' -o" \
M=$PWD O=$PWD/o KSRC=$PWD/o\
%{?with_verbose:V=1}
- cd ..
- ./build.sh $PWD/Kernel/o
+
+ %{__make} "KERNEL_SRC=$PWD/o" clean \
+ RCS_FIND_IGNORE="-name '*.ko' -o" \
+ M=$PWD O=$PWD/o KSRC=$PWD/o \
+ %{?with_verbose:V=1}
+
+ %{__make} "KERNEL_SRC=$PWD/o" %{!?with_verbose:NO_WARNINGS=1}
for i in truecrypt; do
- mv Kernel/$i{,-$cfg}.ko
+ mv $i{,-$cfg}.ko
done
- cd -
done
+cd -
+%endif
+
+%if %{with userspace}
+%{__make} -C Linux/Cli
%endif
%install
@@ -154,17 +164,7 @@
%endif
%if %{with kernel}
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
-for i in truecrypt; do
-install
Linux/Kernel/$i-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/$i.ko
-done
-%if %{with smp} && %{with dist_kernel}
-for i in truecrypt; do
-install Linux/Kernel/$i-smp.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/$i.ko
-done
-%endif
+%install_kernel_modules -m Linux/Kernel/truecrypt -d kernel/misc
%endif
%clean
@@ -193,12 +193,12 @@
%if %{with kernel}
%files -n kernel%{_alt_kernel}-misc-%{name}
%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/misc/*
+/lib/modules/%{_kernel_ver}/kernel/misc/*.ko*
%if %{with smp} && %{with dist_kernel}
%files -n kernel%{_alt_kernel}-smp-misc-%{name}
%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/misc/*
+/lib/modules/%{_kernel_ver}smp/kernel/misc/*.ko*
%endif
%endif
@@ -208,6 +208,14 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.14 2007/03/05 21:40:38 mguevara
+- rel 0.3
+- added up bcond
+- use make instead of build.sh for building - userland builds separately
+ from kernel modules
+- use install_kernel_modules macro
+- modules location changed from misc to kernel/misc
+
Revision 1.13 2007/02/27 15:49:15 mguevara
- modutils require (newer) -> conflicts (with older)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/truecrypt.spec?r1=1.13&r2=1.14&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
