packages: kernel/kernel.spec, kernel/kernel-module-build.pl - drop our -(no...

[baggins]

Author: baggins                      Date: Fri Feb 10 18:21:46 2012 GMT
Module: packages                      Tag: HEAD
---- 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.1014 -> 1.1015) , kernel-module-build.pl (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.1014 packages/kernel/kernel.spec:1.1015
--- packages/kernel/kernel.spec:1.1014	Sun Feb  5 10:25:05 2012
+++ packages/kernel/kernel.spec	Fri Feb 10 19:21:40 2012
@@ -1083,13 +1083,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
@@ -1098,6 +1094,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}}
@@ -1365,8 +1372,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)
@@ -1384,13 +1391,13 @@
 %{_kernelsrcdir}/scripts/Makefile*
 %{_kernelsrcdir}/scripts/basic
 %{_kernelsrcdir}/scripts/kconfig
-%{_kernelsrcdir}/scripts/mkcompile_h
+%attr(755,root,root) %{_kernelsrcdir}/scripts/mkcompile_h
 %{_kernelsrcdir}/scripts/mkmakefile
 %{_kernelsrcdir}/scripts/mod
 %{_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
@@ -1499,6 +1506,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.1015  2012/02/10 18:21:40  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.1014  2012/02/05 09:25:05  arekm
 R: virtual(module-tools) instead of module-init-tools
 

================================================================
Index: packages/kernel/kernel-module-build.pl
diff -u packages/kernel/kernel-module-build.pl:1.3 packages/kernel/kernel-module-build.pl:1.4
--- packages/kernel/kernel-module-build.pl:1.3	Sat Dec  5 04:07:20 2009
+++ packages/kernel/kernel-module-build.pl	Fri Feb 10 19:21:40 2012
@@ -32,7 +32,7 @@
 	return unless -f;
 	return unless /^Kconfig/ or /^Makefile/ or /^Kbuild/;
 	#return if /\.orig$/;
-	return if $File::Find::name =~ /(Documentation|scripts)/;
+	return if $File::Find::name =~ /Documentation/;
 	(my $file = $File::Find::name) =~ s#^\./##;
 	$file =~ m#^(.*)/#;
 	my $dir = $1 || "";
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.1014&r2=1.1015&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-module-build.pl?r1=1.3&r2=1.4&f=u