Author: glen Date: Mon Jan 8 16:47:02 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- 2.6.20-rc4 (LINUX_2_6_19 branch created for 2.6.19)
---- Files affected:
SPECS:
kernel-vanilla.spec (1.28 -> 1.29)
---- Diffs:
================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.28 SPECS/kernel-vanilla.spec:1.29
--- SPECS/kernel-vanilla.spec:1.28 Mon Dec 18 23:22:57 2006
+++ SPECS/kernel-vanilla.spec Mon Jan 8 17:46:57 2007
@@ -1,4 +1,22 @@
# $Revision$, $Date$
+# TODO
+# - unpackaged
+# /usr/src/linux-2.6.20_vanilla/arch/arm/mach-realview/clock.c
+# /usr/src/linux-2.6.20_vanilla/arch/ia64/ia32/audit.c
+# /usr/src/linux-2.6.20_vanilla/arch/sh/boards/mpc1211/led.c
+# /usr/src/linux-2.6.20_vanilla/aux_files
+# /usr/src/linux-2.6.20_vanilla/aux_files_exc
+# /usr/src/linux-2.6.20_vanilla/drivers/infiniband/hw/ipath/ipath_common.h
+# /usr/src/linux-2.6.20_vanilla/drivers/mfd/Makefile
+# /usr/src/linux-2.6.20_vanilla/drivers/scsi/megaraid/Makefile
+# /usr/src/linux-2.6.20_vanilla/fs/ncpfs/Makefile
+# /usr/src/linux-2.6.20_vanilla/net/sctp/associola.c
+# - verify:
+# File not found by glob:
/home/glen/tmp/kernel-vanilla-2.6.20-root-glen/lib/modules/2.6.20_vanilla-0.1.rc4/kernel/drivers/media/radio/miropcm20*.ko*
+# File not found by glob:
/home/glen/tmp/kernel-vanilla-2.6.20-root-glen/lib/modules/2.6.20_vanilla-0.1.rc4/kernel/drivers/media/radio/miropcm20*.ko*
+# File not found by glob:
/home/glen/tmp/kernel-vanilla-2.6.20-root-glen/lib/modules/2.6.20_vanilla-0.1.rc4smp/kernel/drivers/media/radio/miropcm20*.ko*
+# File not found by glob:
/home/glen/tmp/kernel-vanilla-2.6.20-root-glen/lib/modules/2.6.20_vanilla-0.1.rc4smp/kernel/drivers/media/radio/miropcm20*.ko*
+
#
# Conditional build:
%bcond_without smp # don't build SMP kernel
@@ -52,26 +70,35 @@
%define alt_kernel vanilla
%define _basever 2.6.19
-%define _postver .1
-%define _rel 2
-%define _rc %{nil}
+%define _postver %{nil}
+%define _rel 0.1
+
+# for rc kernels basever is the version patch (source1) should be applied to
+%define _ver 2.6.20
+%define _rc rc4
+# for non rc-kernels these should be %{nil}
+#define _ver %{nil}
+#define _rc %{nil}
+
Summary: The Linux kernel (the core of the Linux operating system)
Summary(de): Der Linux-Kernel (Kern des Linux-Betriebssystems)
Summary(fr): Le Kernel-Linux (La partie centrale du systeme)
Summary(pl): Jądro Linuksa
Name: kernel-%{alt_kernel}
-Version: %{_basever}%{_postver}
-Release: %{_rel}
+Version: %{?_ver}%{!?_ver:%{_basever}%{_postver}}
+Release: %{?_rc:%{_rc}.}%{_rel}
Epoch: 3
License: GPL v2
Group: Base/Kernel
-#define _rc -rc6
-#Source0:
ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-%{_basever}%{_rc}.tar.bz2
Source0:
http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{_basever}.tar.bz2
# Source0-md5: 443c265b57e87eadc0c677c3acc37e20
%if "%{_postver}" != "%{nil}"
Source1: http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
-# Source1-md5: 899a0932373a5299b69b9579fceb099e
+# Source1-md5: 9b325c6086ad2a3fcde643f01a4c4640
+%endif
+%if "%{_ver}" != "%{nil}"
+Source1:
http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-%{_ver}-%{_rc}.bz2
+# Source1-md5: 9b325c6086ad2a3fcde643f01a4c4640
%endif
Source2: kernel-vanilla-module-build.pl
@@ -555,9 +582,9 @@
Documentation.
%prep
-%setup -q -n linux-%{_basever}%{_rc}
+%setup -q -n linux-%{_basever}
-%if "%{_postver}" != "%{nil}"
+%if "%{_postver}" != "%{nil}" || "%{_ver}" != "%{nil}"
%{__bzip2} -dc %{SOURCE1} | %{__patch} -p1 -s
%endif
@@ -566,6 +593,9 @@
sed -i -e '/select INPUT/d' net/bluetooth/hidp/Kconfig
+# remove unwanted files after patching (if any)
+find . '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 |
xargs -0 -r -l512 rm -f
+
%build
TuneUpConfigForIX86 () {
%ifarch %{ix86}
@@ -1006,9 +1036,9 @@
%ifnarch sparc
%exclude /lib/modules/%{kernel_release}/kernel/drivers/char/drm
%endif
-%if %{have_oss} && %{have_isa}
-%exclude
/lib/modules/%{kernel_release}/kernel/drivers/media/radio/miropcm20*.ko*
-%endif
+#%if %{have_oss} && %{have_isa}
+#%exclude
/lib/modules/%{kernel_release}/kernel/drivers/media/radio/miropcm20*.ko*
+#%endif
/lib/modules/%{kernel_release}/kernel/fs
/lib/modules/%{kernel_release}/kernel/kernel
/lib/modules/%{kernel_release}/kernel/lib
@@ -1086,9 +1116,9 @@
%files sound-oss
%defattr(644,root,root,755)
/lib/modules/%{kernel_release}/kernel/sound/oss
-%if %{have_isa}
-/lib/modules/%{kernel_release}/kernel/drivers/media/radio/miropcm20*.ko*
-%endif
+#%if %{have_isa}
+#/lib/modules/%{kernel_release}/kernel/drivers/media/radio/miropcm20*.ko*
+#%endif
%endif # %{have_oss}
%endif # %{have_sound}
%endif # %%{with up}
@@ -1111,9 +1141,9 @@
%ifnarch sparc
%exclude /lib/modules/%{kernel_release}smp/kernel/drivers/char/drm
%endif
-%if %{have_oss} && %{have_isa}
-%exclude
/lib/modules/%{kernel_release}smp/kernel/drivers/media/radio/miropcm20*.ko*
-%endif
+#%if %{have_oss} && %{have_isa}
+#%exclude
/lib/modules/%{kernel_release}smp/kernel/drivers/media/radio/miropcm20*.ko*
+#%endif
/lib/modules/%{kernel_release}smp/kernel/fs
/lib/modules/%{kernel_release}smp/kernel/kernel
/lib/modules/%{kernel_release}smp/kernel/lib
@@ -1191,9 +1221,9 @@
%files smp-sound-oss
%defattr(644,root,root,755)
/lib/modules/%{kernel_release}smp/kernel/sound/oss
-%if %{have_isa}
-/lib/modules/%{kernel_release}smp/kernel/drivers/media/radio/miropcm20*.ko*
-%endif
+#%if %{have_isa}
+#/lib/modules/%{kernel_release}smp/kernel/drivers/media/radio/miropcm20*.ko*
+#%endif
%endif # %{have_oss}
%endif # %{have_sound}
%endif # %{with_smp}
@@ -1274,6 +1304,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.29 2007/01/08 16:46:57 glen
+- 2.6.20-rc4 (LINUX_2_6_19 branch created for 2.6.19)
+
Revision 1.28 2006/12/18 22:22:57 glen
- skip stripping sourcedir
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kernel-vanilla.spec?r1=1.28&r2=1.29&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
