SPECS: kernel-desktop.spec - automatical Kconfig and Makefiles col...

sparky sparky at pld-linux.org
Tue Jun 13 21:03:22 CEST 2006


Author: sparky                       Date: Tue Jun 13 19:03:22 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- automatical Kconfig and Makefiles collecting, based on kernel.spec at LINUX_2_6
  WARNING: rpm is loosing some files, -f bug ?

---- Files affected:
SPECS:
   kernel-desktop.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.17 SPECS/kernel-desktop.spec:1.18
--- SPECS/kernel-desktop.spec:1.17	Tue Jun 13 12:06:36 2006
+++ SPECS/kernel-desktop.spec	Tue Jun 13 21:03:17 2006
@@ -42,7 +42,7 @@
 %define		_oprofile_ver		0.9
 %define		_udev_ver		071
 
-%define		_rel			0.1
+%define		_rel			0.1.1
 
 %define		_netfilter_snap		20060504
 %define		_nf_hipac_ver		0.9.1
@@ -80,6 +80,7 @@
 #Source0:	http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{version}%{_rc}.tar.bz2
 Source1:	kernel-autoconf.h
 Source2:	kernel-config.h
+Source5:	kernel-desktop-module-build.pl
 
 Source20:	kernel-desktop-common.config
 Source21:	kernel-desktop-i386.config
@@ -957,6 +958,9 @@
 install %{SOURCE1} $RPM_BUILD_ROOT%{_prefix}/src/linux-%{ver}/include/linux/autoconf.h
 install %{SOURCE2} $RPM_BUILD_ROOT%{_prefix}/src/linux-%{ver}/include/linux/config.h
 
+# collect module-build files and directories
+perl %{SOURCE5} %{_prefix}/src/linux-%{ver} $KERNEL_BUILD_DIR
+
 %if %{with up} || %{with smp}
 # ghosted initrd
 touch $RPM_BUILD_ROOT/boot/initrd-%{ver_rel}{,smp}.gz
@@ -1298,24 +1302,14 @@
 %{_prefix}/src/linux-%{ver}/config-up
 %{?with_up:%{_prefix}/src/linux-%{ver}/Module.symvers-up}
 
-%files module-build
+%files module-build -f aux_files
 %defattr(644,root,root,755)
 %{_prefix}/src/linux-%{ver}/Kbuild
-%{_prefix}/src/linux-%{ver}/Makefile
 %{_prefix}/src/linux-%{ver}/localversion
-%dir %{_prefix}/src/linux-%{ver}/arch
-%dir %{_prefix}/src/linux-%{ver}/arch/*
-%{_prefix}/src/linux-%{ver}/arch/*/Makefile*
-%{_prefix}/src/linux-%{ver}/*/Kconfig*
-%{_prefix}/src/linux-%{ver}/*/*/Kconfig*
-%{_prefix}/src/linux-%{ver}/*/*/*/Kconfig*
-%{_prefix}/src/linux-%{ver}/*/*/*/*/Kconfig*
-%{_prefix}/src/linux-%{ver}/*/*/*/*/*/Kconfig*
-%dir %{_prefix}/src/linux-%{ver}/arch/*/kernel
-%{_prefix}/src/linux-%{ver}/arch/*/kernel/Makefile
 %{_prefix}/src/linux-%{ver}/arch/*/kernel/asm-offsets.*
 %{_prefix}/src/linux-%{ver}/arch/*/kernel/sigframe.h
 %dir %{_prefix}/src/linux-%{ver}/scripts
+%dir %{_prefix}/src/linux-%{ver}/scripts/kconfig
 %{_prefix}/src/linux-%{ver}/scripts/Kbuild.include
 %{_prefix}/src/linux-%{ver}/scripts/Makefile*
 %{_prefix}/src/linux-%{ver}/scripts/basic
@@ -1331,17 +1325,12 @@
 %{_prefix}/src/linux-%{ver}/Documentation
 
 %if %{with source}
-%files source
+%files source -f aux_files_exc
 %defattr(644,root,root,755)
 %{_prefix}/src/linux-%{ver}/arch/*/[!Mk]*
 %{_prefix}/src/linux-%{ver}/arch/*/kernel/[!M]*
 %exclude %{_prefix}/src/linux-%{ver}/arch/*/kernel/asm-offsets.*
 %exclude %{_prefix}/src/linux-%{ver}/arch/*/kernel/sigframe.h
-%exclude %{_prefix}/src/linux-%{ver}/*/Kconfig*
-%exclude %{_prefix}/src/linux-%{ver}/*/*/Kconfig*
-%exclude %{_prefix}/src/linux-%{ver}/*/*/*/Kconfig*
-%exclude %{_prefix}/src/linux-%{ver}/*/*/*/*/Kconfig*
-%exclude %{_prefix}/src/linux-%{ver}/*/*/*/*/*/Kconfig*
 %{_prefix}/src/linux-%{ver}/block
 %{_prefix}/src/linux-%{ver}/crypto
 %{_prefix}/src/linux-%{ver}/drivers
@@ -1381,6 +1370,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2006/06/13 19:03:17  sparky
+- automatical Kconfig and Makefiles collecting, based on kernel.spec at LINUX_2_6
+  WARNING: rpm is loosing some files, -f bug ?
+
 Revision 1.17  2006/06/13 10:06:36  sparky
 - reenabled preempt_ppc_fix patch
 - /boot/{vmlinu[zx],inidts,System.map} renamed with -desktop suffix, for not
================================================================

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



More information about the pld-cvs-commit mailing list