Author: glen Date: Sun Nov 4 20:29:22 2007 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- use kernel build macros
---- Files affected:
SPECS:
submount.spec (1.22.2.15 -> 1.22.2.16)
---- Diffs:
================================================================
Index: SPECS/submount.spec
diff -u SPECS/submount.spec:1.22.2.15 SPECS/submount.spec:1.22.2.16
--- SPECS/submount.spec:1.22.2.15 Sun Nov 4 21:22:05 2007
+++ SPECS/submount.spec Sun Nov 4 21:29:16 2007
@@ -104,31 +104,7 @@
%build
%if %{with kernel}
-cd subfs-%{version}
-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} -j1 -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- \
-%endif
- HOSTCC="%{__cc}" \
- M=$PWD O=$PWD/o \
- %{?with_verbose:V=1}
- mv subfs.ko subfs-$cfg.ko
-done
-cd -
+%build_kernel_modules -C subfs-%{version} -m subfs
%endif
%if %{with userspace}
@@ -142,15 +118,7 @@
rm -rf $RPM_BUILD_ROOT
%if %{with kernel}
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/fs
-cd subfs-%{version}
-install subfs-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/fs/subfs.ko
-%if %{with smp} && %{with dist_kernel}
-install subfs-smp.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/fs/subfs.ko
-%endif
-cd -
+%install_kernel_modules -m subfs-%{version}/subfs -d kernel/fs
%endif
%if %{with userspace}
@@ -203,6 +171,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.22.2.16 2007/11/04 20:29:16 glen
+- use kernel build macros
+
Revision 1.22.2.15 2007/11/04 20:22:05 glen
- prefix src package with alt kernel if present
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/submount.spec?r1=1.22.2.15&r2=1.22.2.16&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
