SPECS (LINUX_2_6): kernel.spec - new way of collecting files for m...

pluto pluto at pld-linux.org
Tue May 16 19:40:28 CEST 2006


Author: pluto                        Date: Tue May 16 17:40:28 2006 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- new way of collecting files for module-build subpkg.

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1542 -> 1.441.2.1543) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1542 SPECS/kernel.spec:1.441.2.1543
--- SPECS/kernel.spec:1.441.2.1542	Fri May 12 21:57:34 2006
+++ SPECS/kernel.spec	Tue May 16 19:40:23 2006
@@ -87,7 +87,7 @@
 %define		_udev_ver		071
 %define		_mkvmlinuz_ver		1.3
 
-%define		_rel			1
+%define		_rel			1.1
 
 %define		_netfilter_snap		20060504
 %define		_nf_hipac_ver		0.9.1
@@ -128,6 +128,7 @@
 Source5:	kernel-ppclibs.Makefile
 #Source6:	http://people.redhat.com/mingo/debloating-patches/debloating-patches-2.6.15-rc7.tar.gz
 ## Source6-md5:	ca7a1cdef3e5c95f182d039cebd92b5e
+Source6:	kernel-module-build.pl
 
 Source10:	http://suspend2.net/downloads/all/suspend2-%{suspend_version}-for-2.6.16.9.tar.bz2
 # Source10-md5:	34345b1f7ad1505f6b264427a21e8a04
@@ -775,6 +776,9 @@
 # on sparc this line causes CONFIG_INPUT=m (instead of =y), thus breaking build
 sed -i -e '/select INPUT/d' net/bluetooth/hidp/Kconfig
 
+# cleanup
+find . -type f -name '*.orig' -o -name '.gitignore' -exec rm "{}" ";"
+
 %build
 TuneUpConfigForIX86 () {
 %ifarch %{ix86}
@@ -1037,6 +1041,12 @@
 PreInstallKernel smp
 %endif
 
+find . -type f -name 'Kconfig*' -o -name 'Makefile*' | grep -v Documentation | grep -v scripts > tmp_aux
+sed -i 's:^./::g' tmp_aux
+perl %{SOURCE6} tmp_aux %{_prefix}/src/linux-%{version} | sort | uniq > aux_files && rm tmp_aux
+cp -f aux_files aux_files_exc
+sed -i 's:^:%exclude :g' aux_files_exc
+
 %install
 rm -rf $RPM_BUILD_ROOT
 umask 022
@@ -1521,24 +1531,14 @@
 %{_prefix}/src/linux-%{version}/config-up
 %{?with_up:%{_prefix}/src/linux-%{version}/Module.symvers-up}
 
-%files module-build
+%files module-build -f aux_files
 %defattr(644,root,root,755)
 %{_prefix}/src/linux-%{version}/Kbuild
-%{_prefix}/src/linux-%{version}/Makefile
 %{_prefix}/src/linux-%{version}/localversion
-%dir %{_prefix}/src/linux-%{version}/arch
-%dir %{_prefix}/src/linux-%{version}/arch/*
-%{_prefix}/src/linux-%{version}/arch/*/Makefile*
-%{_prefix}/src/linux-%{version}/*/Kconfig*
-%{_prefix}/src/linux-%{version}/*/*/Kconfig*
-%{_prefix}/src/linux-%{version}/*/*/*/Kconfig*
-%{_prefix}/src/linux-%{version}/*/*/*/*/Kconfig*
-%{_prefix}/src/linux-%{version}/*/*/*/*/*/Kconfig*
-%dir %{_prefix}/src/linux-%{version}/arch/*/kernel
-%{_prefix}/src/linux-%{version}/arch/*/kernel/Makefile
 %{_prefix}/src/linux-%{version}/arch/*/kernel/asm-offsets.*
 %{_prefix}/src/linux-%{version}/arch/*/kernel/sigframe.h
 %dir %{_prefix}/src/linux-%{version}/scripts
+%dir %{_prefix}/src/linux-%{version}/scripts/kconfig
 %{_prefix}/src/linux-%{version}/scripts/Kbuild.include
 %{_prefix}/src/linux-%{version}/scripts/Makefile*
 %{_prefix}/src/linux-%{version}/scripts/basic
@@ -1554,17 +1554,12 @@
 %{_prefix}/src/linux-%{version}/Documentation
 
 %if %{with source}
-%files source
+%files source -f aux_files_exc
 %defattr(644,root,root,755)
 %{_prefix}/src/linux-%{version}/arch/*/[!Mk]*
 %{_prefix}/src/linux-%{version}/arch/*/kernel/[!M]*
 %exclude %{_prefix}/src/linux-%{version}/arch/*/kernel/asm-offsets.*
 %exclude %{_prefix}/src/linux-%{version}/arch/*/kernel/sigframe.h
-%exclude %{_prefix}/src/linux-%{version}/*/Kconfig*
-%exclude %{_prefix}/src/linux-%{version}/*/*/Kconfig*
-%exclude %{_prefix}/src/linux-%{version}/*/*/*/Kconfig*
-%exclude %{_prefix}/src/linux-%{version}/*/*/*/*/Kconfig*
-%exclude %{_prefix}/src/linux-%{version}/*/*/*/*/*/Kconfig*
 %{_prefix}/src/linux-%{version}/block
 %{_prefix}/src/linux-%{version}/crypto
 %{_prefix}/src/linux-%{version}/drivers
@@ -1604,6 +1599,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1543  2006/05/16 17:40:23  pluto
+- new way of collecting files for module-build subpkg.
+
 Revision 1.441.2.1542  2006/05/12 19:57:34  pluto
 - regparm bcond disappeard, release 1.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1542&r2=1.441.2.1543&f=u



More information about the pld-cvs-commit mailing list