packages (LINUX_3_0): kernel/kernel.spec - drop our -(non)dist kernel modul...

[baggins]

Author: baggins                      Date: Fri Feb 10 18:35:00 2012 GMT
Module: packages                      Tag: LINUX_3_0
---- Log message:
- drop our -(non)dist kernel module build hacks, just install it as-is
  allowing for both rpm-based and 3rd party out-of-tree modules to build easily

---- Files affected:
packages/kernel:
   kernel.spec (1.987.2.29 -> 1.987.2.30) 

---- Diffs:

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.987.2.29 packages/kernel/kernel.spec:1.987.2.30
--- packages/kernel/kernel.spec:1.987.2.29	Tue Feb  7 07:08:36 2012
+++ packages/kernel/kernel.spec	Fri Feb 10 19:34:54 2012
@@ -1118,13 +1118,9 @@
 fi
 
 cp -a$l %{srcdir}/* $RPM_BUILD_ROOT%{_kernelsrcdir}
-cp -a %{objdir}/Module.symvers $RPM_BUILD_ROOT%{_kernelsrcdir}/Module.symvers-dist
-cp -aL %{objdir}/.config $RPM_BUILD_ROOT%{_kernelsrcdir}/config-dist
-cp -a %{objdir}/include/generated $RPM_BUILD_ROOT%{_kernelsrcdir}/include
-mv $RPM_BUILD_ROOT%{_kernelsrcdir}/include/generated/autoconf{,-dist}.h
-cp -a %{objdir}/include/linux/version.h $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux
-cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_kernelsrcdir}/include/generated/autoconf.h
-cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/config.h
+cp -a %{objdir}/Module.symvers $RPM_BUILD_ROOT%{_kernelsrcdir}
+cp -aL %{objdir}/.config $RPM_BUILD_ROOT%{_kernelsrcdir}
+cp -a %{objdir}/include $RPM_BUILD_ROOT%{_kernelsrcdir}
 
 # collect module-build files and directories
 # Usage: kernel-module-build.pl $rpmdir $fileoutdir
@@ -1133,6 +1129,17 @@
 %{__perl} %{topdir}/kernel-module-build.pl %{_kernelsrcdir} $fileoutdir
 cd -
 
+for f in `find %{objdir}/scripts -type f -print | grep -v "/\.\|\.o$"` ; do
+	ff=${f##%{objdir}/}
+	if [ -x "$f" ]; then
+		echo "%attr(755,root,root) %{_kernelsrcdir}/$ff" >>files.mb_include_modulebuild_and_dirs
+	else
+		echo "%{_kernelsrcdir}/$ff" >>files.mb_include_modulebuild_and_dirs
+	fi
+	echo "%exclude %{_kernelsrcdir}/$ff" >>files.source_exclude_modulebuild_and_dirs
+	cp -a "$f" "$RPM_BUILD_ROOT%{_kernelsrcdir}/$ff"
+done
+
 # move to %{_docdir} so we wouldn't depend on any kernel package for dirs
 install -d $RPM_BUILD_ROOT%{_docdir}
 mv $RPM_BUILD_ROOT{%{_kernelsrcdir}/Documentation,%{_docdir}/%{name}-%{version}}
@@ -1400,8 +1407,8 @@
 %dir %{_kernelsrcdir}/security
 %dir %{_kernelsrcdir}/security/selinux
 %{_kernelsrcdir}/security/selinux/include
-%{_kernelsrcdir}/config-dist
-%{_kernelsrcdir}/Module.symvers-dist
+%{_kernelsrcdir}/.config
+%{_kernelsrcdir}/Module.symvers
 
 %files module-build -f files.mb_include_modulebuild_and_dirs
 %defattr(644,root,root,755)
@@ -1415,17 +1422,17 @@
 %{_kernelsrcdir}/drivers/media/video/bt8xx/bttv.h
 %{_kernelsrcdir}/kernel/bounds.c
 %dir %{_kernelsrcdir}/scripts
-%{_kernelsrcdir}/scripts/Kbuild.include
-%{_kernelsrcdir}/scripts/Makefile*
 %{_kernelsrcdir}/scripts/basic
 %{_kernelsrcdir}/scripts/kconfig
-%{_kernelsrcdir}/scripts/mkcompile_h
-%{_kernelsrcdir}/scripts/mkmakefile
 %{_kernelsrcdir}/scripts/mod
+%{_kernelsrcdir}/scripts/Kbuild.include
+%{_kernelsrcdir}/scripts/Makefile*
+%attr(755,root,root) %{_kernelsrcdir}/scripts/mkcompile_h
+%{_kernelsrcdir}/scripts/mkmakefile
 %{_kernelsrcdir}/scripts/module-common.lds
-%{_kernelsrcdir}/scripts/setlocalversion
+%attr(755,root,root) %{_kernelsrcdir}/scripts/setlocalversion
 %{_kernelsrcdir}/scripts/*.c
-%{_kernelsrcdir}/scripts/*.sh
+%attr(755,root,root) %{_kernelsrcdir}/scripts/*.sh
 %dir %{_kernelsrcdir}/scripts/selinux
 %{_kernelsrcdir}/scripts/selinux/Makefile
 %dir %{_kernelsrcdir}/scripts/selinux/genheaders
@@ -1534,6 +1541,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.987.2.30  2012/02/10 18:34:54  baggins
+- drop our -(non)dist kernel module build hacks, just install it as-is
+  allowing for both rpm-based and 3rd party out-of-tree modules to build easily
+
 Revision 1.987.2.29  2012/02/07 06:08:36  arekm
 - up to 3.0.20
 
================================================================

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