Author: arekm Date: Sat Sep 3 21:27:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - builds
---- Files affected: SPECS: kernel-fs-ocfs2.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/kernel-fs-ocfs2.spec diff -u SPECS/kernel-fs-ocfs2.spec:1.1 SPECS/kernel-fs-ocfs2.spec:1.2 --- SPECS/kernel-fs-ocfs2.spec:1.1 Sat Sep 3 22:54:42 2005 +++ SPECS/kernel-fs-ocfs2.spec Sat Sep 3 23:27:05 2005 @@ -18,9 +18,9 @@ # Source0-md5: d50680c60cd5210b4581febb2f5807ff URL: http://sources.redhat.com/cluster/ocfs2/ %if %{with kernel} -%{?with_dist_kernel:BuildRequires: kernel-module-build >= 2.6.7} +%{?with_dist_kernel:BuildRequires: kernel-module-build >= 2.6.12} %endif -BuildRequires: perl-base +BuildRequires: findutils %{?with_dist_kernel:%requires_releq_kernel_up} Requires(post,postun): /sbin/depmod %{?with_dist_kernel:Requires(postun): kernel} @@ -61,7 +61,7 @@ %configure \ --with-kernel=%{_kernelsrcdir} \ --enable-debug=no - +cd fs for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then exit 1 @@ -84,20 +84,19 @@ CC="%{__cc}" CPP="%{__cpp}" \ M=$PWD O=$PWD \ %{?with_verbose:V=1} - mv lock_${dir}.ko lock_${dir}-$cfg.ko + install -d ../${cfg} + find . -name '*.ko' > files + tar -cf - -T files | tar -C ../${cfg} -xvf - done %install rm -rf $RPM_BUILD_ROOT %if %{with kernel} -# DLM -install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/fs/ocfs2_locking/lock_dlm -install src/dlm/lock_dlm-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \ - $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/fs/ocfs2_locking/lock_dlm/lock_dlm.ko +install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/{fs,ocfs} +cp -a up/* $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/fs %if %{with smp} && %{with dist_kernel} -install src/dlm/lock_dlm-smp.ko \ - $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/fs/ocfs2_locking/lock_dlm/lock_dlm.ko +cp -a smp/* $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/fs %endif %endif @@ -134,6 +133,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.2 2005/09/03 21:27:05 arekm +- builds + Revision 1.1 2005/09/03 20:54:42 arekm - placeholder ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel-fs-ocfs2.spec?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
