packages: kernel/kernel.spec - package modules under kernel/mm - got rid of...

sparky sparky at pld-linux.org
Sat Dec 5 04:09:32 CET 2009


Author: sparky                       Date: Sat Dec  5 03:09:32 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- package modules under kernel/mm
- got rid of all duplicated files in headers <-> module-build <-> source
  subpackages

---- Files affected:
packages/kernel:
   kernel.spec (1.730 -> 1.731) 

---- Diffs:

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.730 packages/kernel/kernel.spec:1.731
--- packages/kernel/kernel.spec:1.730	Sat Dec  5 01:30:53 2009
+++ packages/kernel/kernel.spec	Sat Dec  5 04:09:26 2009
@@ -1348,6 +1348,7 @@
 /lib/modules/%{kernel_release}/kernel/kernel
 /lib/modules/%{kernel_release}/kernel/lib
 /lib/modules/%{kernel_release}/kernel/net
+/lib/modules/%{kernel_release}/kernel/mm
 %if %{have_sound}
 %dir /lib/modules/%{kernel_release}/kernel/sound
 /lib/modules/%{kernel_release}/kernel/sound/ac97_bus.ko*
@@ -1465,7 +1466,7 @@
 %endif
 %endif
 
-%files headers
+%files headers -f files.headers_exclude_kbuild
 %defattr(644,root,root,755)
 %dir %{_kernelsrcdir}
 %{_kernelsrcdir}/include
@@ -1478,11 +1479,13 @@
 %{_kernelsrcdir}/config-dist
 %{_kernelsrcdir}/Module.symvers-dist
 
-%files module-build -f aux_files
+%files module-build -f files.mb_include_modulebuild_and_dirs
 %defattr(644,root,root,755)
 %ifarch ppc ppc64
 %{_kernelsrcdir}/arch/powerpc/lib/crtsavres.*
 %endif
+%exclude %dir %{_kernelsrcdir}/arch/m68knommu
+%exclude %dir %{_kernelsrcdir}/arch/um
 %{_kernelsrcdir}/arch/*/kernel/asm-offsets*
 %{_kernelsrcdir}/arch/*/kernel/sigframe*.h
 %{_kernelsrcdir}/drivers/lguest/lg.h
@@ -1504,6 +1507,8 @@
 %dir %{_kernelsrcdir}/scripts/selinux/mdp
 %{_kernelsrcdir}/scripts/selinux/mdp/Makefile
 %{_kernelsrcdir}/scripts/selinux/mdp/*.c
+%exclude %dir %{_kernelsrcdir}/security
+%exclude %dir %{_kernelsrcdir}/security/selinux
 
 %files doc
 %defattr(644,root,root,755)
@@ -1518,7 +1523,7 @@
 %lang(zh_CN) %{_docdir}/%{name}-%{version}/zh_CN
 
 %if %{with source}
-%files source -f aux_files_exc
+%files source -f files.source_exclude_modulebuild_and_dirs
 %defattr(644,root,root,755)
 %{_kernelsrcdir}/arch/*/[!Mik]*
 %{_kernelsrcdir}/arch/*/kernel/[!M]*
@@ -1526,6 +1531,7 @@
 %{_kernelsrcdir}/arch/ia64/install.sh
 %{_kernelsrcdir}/arch/m68k/ifpsp060/[!M]*
 %{_kernelsrcdir}/arch/m68k/ifpsp060/MISC
+%{_kernelsrcdir}/arch/m68k/install.sh
 %{_kernelsrcdir}/arch/parisc/install.sh
 %{_kernelsrcdir}/arch/x86/ia32/[!M]*
 %{_kernelsrcdir}/arch/ia64/kvm
@@ -1575,6 +1581,7 @@
 %{_kernelsrcdir}/sound
 %{_kernelsrcdir}/security
 %exclude %{_kernelsrcdir}/security/selinux/include
+%{_kernelsrcdir}/tools
 %{_kernelsrcdir}/usr
 %{_kernelsrcdir}/COPYING
 %{_kernelsrcdir}/CREDITS
@@ -1589,6 +1596,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.731  2009/12/05 03:09:26  sparky
+- package modules under kernel/mm
+- got rid of all duplicated files in headers <-> module-build <-> source
+  subpackages
+
 Revision 1.730  2009/12/05 00:30:53  sparky
 - fix building modules
 - try to eliminate some duplicate files
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.730&r2=1.731&f=u



More information about the pld-cvs-commit mailing list