SPECS (LINUX_2_6_14): kernel.spec - move scripts/mkmakefile to mod...

arekm arekm at pld-linux.org
Sun Jan 29 14:05:40 CET 2006


Author: arekm                        Date: Sun Jan 29 13:05:40 2006 GMT
Module: SPECS                         Tag: LINUX_2_6_14
---- Log message:
- move scripts/mkmakefile to module-build; drop empty linux/autoconf.h and linux/config.h; drop crappy linux-kbuild-extmod.patch patch

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1357.2.15 -> 1.441.2.1357.2.16) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1357.2.15 SPECS/kernel.spec:1.441.2.1357.2.16
--- SPECS/kernel.spec:1.441.2.1357.2.15	Fri Jan 27 12:44:14 2006
+++ SPECS/kernel.spec	Sun Jan 29 14:05:32 2006
@@ -151,7 +151,7 @@
 %define		_oprofile_ver		0.5.3
 %define		_udev_ver		058
 
-%define		_rel			5
+%define		_rel			5.1
 
 %define		_netfilter_snap		20051125
 %define		_nf_hipac_ver		0.9.1
@@ -180,8 +180,6 @@
 #Source0:	ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-%{version}%{_rc}.tar.bz2
 Source0:	http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{version}%{_rc}.tar.bz2
 # Source0-md5:	57368527b7e6f3ce072f0da541cca9c6
-Source1:	kernel-autoconf.h
-Source2:	kernel-config.h
 #Source3:	http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.14%{_rc}-git2.bz2
 ## Source3-md5:	3db58f38e8a3c001d1a18eb1ee27db3b
 Source4:	http://people.redhat.com/mingo/realtime-preempt/older/patch-2.6.14-rt22
@@ -227,7 +225,6 @@
 Patch1:		linux-2.6-version.patch
 Patch2:		linux-2.6-biarch-build.patch
 Patch3:		2.6.0-t9-acpi_osl-lkml.patch
-Patch4:		linux-kbuild-extmod.patch
 Patch5:		kernel-MAX_INIT_ARGS.patch
 Patch6:		linux-2.6-extended-utf8.patch
 Patch7:		linux-2.6-realtime-lsm-0.1.1.patch
@@ -768,7 +765,6 @@
 %{?with_pld_vers:%patch1 -p0}
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
@@ -1305,8 +1301,6 @@
 
 %{__make} $CrossOpts mrproper
 %{__make} $CrossOpts include/linux/version.h
-install %{SOURCE1} $RPM_BUILD_ROOT%{_prefix}/src/linux-%{version}/include/linux/autoconf.h
-install %{SOURCE2} $RPM_BUILD_ROOT%{_prefix}/src/linux-%{version}/include/linux/config.h
 
 %if %{with up} || %{with smp}
 # ghosted initrd
@@ -1728,6 +1722,7 @@
 %{_prefix}/src/linux-%{version}/scripts/Kbuild.include
 %{_prefix}/src/linux-%{version}/scripts/Makefile*
 %{_prefix}/src/linux-%{version}/scripts/basic
+%{_prefix}/src/linux-%{version}/scripts/mkmakefile
 %{_prefix}/src/linux-%{version}/scripts/mod
 %{_prefix}/src/linux-%{version}/scripts/setlocalversion
 %{_prefix}/src/linux-%{version}/scripts/*.c
@@ -1766,6 +1761,7 @@
 %exclude %{_prefix}/src/linux-%{version}/scripts/Kbuild.include
 %exclude %{_prefix}/src/linux-%{version}/scripts/Makefile*
 %exclude %{_prefix}/src/linux-%{version}/scripts/basic
+%exclude %{_prefix}/src/linux-%{version}/scripts/mkmakefile
 %exclude %{_prefix}/src/linux-%{version}/scripts/mod
 %exclude %{_prefix}/src/linux-%{version}/scripts/setlocalversion
 %exclude %{_prefix}/src/linux-%{version}/scripts/*.c
@@ -1786,6 +1782,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1357.2.16  2006/01/29 13:05:32  arekm
+- move scripts/mkmakefile to module-build; drop empty linux/autoconf.h and linux/config.h; drop crappy linux-kbuild-extmod.patch patch
+
 Revision 1.441.2.1357.2.15  2006/01/27 11:44:14  pluto
 - fix biarch build.
 
================================================================

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



More information about the pld-cvs-commit mailing list