Author: zbyniu Date: Sat May 20 00:21:41 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- updated kernel modules build; rel 1 - works for me
---- Files affected:
SPECS:
CapOver.spec (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SPECS/CapOver.spec
diff -u SPECS/CapOver.spec:1.4 SPECS/CapOver.spec:1.5
--- SPECS/CapOver.spec:1.4 Wed Apr 12 14:15:40 2006
+++ SPECS/CapOver.spec Sat May 20 02:21:35 2006
@@ -6,7 +6,7 @@
%bcond_without smp # don't build SMP module
%bcond_without userspace # don't build userspace module
#
-%define rel 0.1
+%define rel 1
Summary: Capability Override LSM
Summary(pl): ModuĊ LSM Capability Override
Name: CapOver
@@ -72,29 +72,34 @@
%if %{with kernel}
%configure
for cfg in %{?with_dist_kernel:%{?with_smp:smp}
up}%{!?with_dist_kernel:nondist}; do
- mkdir -p modules/$cfg
if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
exit 1
fi
- rm -rf include
- chmod 000 modules
- install -d include/{linux,config}
+ install -d o/include/linux
+ ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+ ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
+ ln -sf %{_kernelsrcdir}/include/linux/autoconf-${cfg}.h
o/include/linux/autoconf.h
+%if %{with dist_kernel}
+ %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+%else
+ install -d o/include/config
+ touch o/include/config/MARKER
+ ln -sf %{_kernelsrcdir}/scripts o/scripts
+%endif
%{__make} -C %{_kernelsrcdir} clean \
- SUBDIRS=$PWD \
- O=$PWD \
+ RCS_FIND_IGNORE="-name '*.ko' -o" \
+ SYSSRC=%{_kernelsrcdir} \
+ SYSOUT=$PWD/o \
+ M=$PWD O=$PWD/o \
%{?with_verbose:V=1}
- install -d include/config
- chmod 700 modules
- ln -sf %{_kernelsrcdir}/config-$cfg .config
- ln -sf %{_kernelsrcdir}/include/linux/autoconf-${cfg}.h
include/linux/autoconf.h
- ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
- ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
- touch include/config/MARKER
%{__make} -C %{_kernelsrcdir} modules \
- SUBDIRS=$PWD \
- O=$PWD \
+ CC="%{__cc}" CPP="%{__cpp}" \
+ SYSSRC=%{_kernelsrcdir} \
+ SYSOUT=$PWD/o \
+ M=$PWD O=$PWD/o \
%{?with_verbose:V=1}
- mv *.ko modules/$cfg/
+
+ mv cap_over{,-$cfg}.ko
done
%endif
@@ -103,11 +108,11 @@
%if %{with kernel}
install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
-install modules/%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}/*.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
+install cap_over-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
+ $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/cap_over.ko
%if %{with smp} && %{with dist_kernel}
-install modules/smp/*.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc
+install cap_over-smp.ko \
+ $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/cap_over.ko
%endif
%endif
@@ -156,6 +161,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.5 2006/05/20 00:21:35 zbyniu
+- updated kernel modules build; rel 1 - works for me
+
Revision 1.4 2006/04/12 12:15:40 glen
- add kernel epoch, adapterized
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/CapOver.spec?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
