Author: hawk Date: Sat Nov 10 14:05:28 2007 GMT
Module: SPECS Tag: Titanium
---- Log message:
- killed kernel-common.config for easier updates
- killed archs not supported by Titanium
- updated to 2.6.23.1
---- Files affected:
SPECS:
kernel-vanilla.spec (1.43.2.11 -> 1.43.2.11.2.1)
---- Diffs:
================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.43.2.11
SPECS/kernel-vanilla.spec:1.43.2.11.2.1
--- SPECS/kernel-vanilla.spec:1.43.2.11 Fri Aug 24 20:29:49 2007
+++ SPECS/kernel-vanilla.spec Sat Nov 10 15:05:22 2007
@@ -1,22 +1,4 @@
# $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
@@ -33,19 +15,12 @@
%undefine with_pae
%endif
-%ifarch %{ix86} ppc
+%ifarch %{ix86}
%define have_isa 1
-%else
-%define have_isa 0
%endif
-%ifarch sparc sparc64
-%define have_pcmcia 0
-%define have_oss 0
-%else
%define have_pcmcia 1
%define have_oss 1
-%endif
%define have_sound 1
@@ -69,9 +44,9 @@
%define alt_kernel vanilla
-%define _basever 2.6.21
-%define _postver .7
-%define _rel 1
+%define _basever 2.6.23
+%define _postver .1
+%define _rel 0.1
# for rc kernels basever is the version patch (source1) should be applied to
#%define _ver 2.6.20
@@ -91,10 +66,10 @@
License: GPL v2
Group: Base/Kernel
Source0:
http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{_basever}.tar.bz2
-# Source0-md5: 1b515f588078dfa7f4bab2634bd17e80
+# Source0-md5: 2cc2fd4d521dc5d7cfce0d8a9d1b3472
%if "%{_postver}" != "%{nil}"
Source1:
http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{_basever}%{_postver}.bz2
-# Source1-md5: b9c8734471a454806c77f040fcf9869b
+# Source1-md5: 896c5d4e7fd68d37b8c16e5d2842563b
%endif
%if "%{_ver}" != "%{nil}"
Source10:
http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-%{_ver}-%{_rc}.bz2
@@ -104,19 +79,10 @@
Source2: kernel-vanilla-module-build.pl
Source3: kernel-vanilla-config.h
-Source20: kernel-vanilla-common.config
Source21: kernel-vanilla-i386.config
Source22: kernel-vanilla-i386-smp.config
Source23: kernel-vanilla-x86_64.config
Source24: kernel-vanilla-x86_64-smp.config
-Source25: kernel-vanilla-ppc.config
-Source26: kernel-vanilla-ppc-smp.config
-Source27: kernel-vanilla-alpha.config
-Source28: kernel-vanilla-alpha-smp.config
-Source29: kernel-vanilla-sparc64.config
-Source30: kernel-vanilla-sparc64-smp.config
-Source31: kernel-vanilla-sparc.config
-Source32: kernel-vanilla-sparc-smp.config
Source40: kernel-vanilla-preempt-nort.config
Source41: kernel-vanilla-no-preempt-nort.config
@@ -124,9 +90,6 @@
URL: http://www.kernel.org/
BuildRequires: binutils >= 3:2.14.90.0.7
-%ifarch sparc sparc64
-BuildRequires: elftoaout
-%endif
BuildRequires: gcc >= 5:3.2
BuildRequires: module-init-tools
# for hostname command
@@ -160,7 +123,7 @@
Conflicts: udev < %{_udev_ver}
Conflicts: util-linux < %{_util_linux_ver}
Conflicts: xfsprogs < %{_xfsprogs_ver}
-ExclusiveArch: %{ix86} alpha %{x8664} ppc sparc sparc64
+ExclusiveArch: %{ix86} %{x8664}
ExclusiveOS: Linux
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -181,13 +144,6 @@
%define MakeOpts %{CommonOpts} ARCH=%{_target_base_arch}
CROSS_COMPILE=%{_target_cpu}-pld-linux-
%define DepMod /bin/true
- %if "%{_arch}" == "sparc" && "%{_target_base_arch}" == "sparc64"
- %undefine CommonOpts
- %define MakeOpts ARCH=%{_target_base_arch}
CROSS_COMPILE=%{_target_cpu}-pld-linux-
- %define DepMod /sbin/depmod
- %endif
-
-
%if "%{_arch}" == "x86_64" && "%{_target_base_arch}" == "i386"
%define MakeOpts %{CommonOpts} CC="%{__cc}" ARCH=%{_target_base_arch}
%define DepMod /sbin/depmod
@@ -655,9 +611,6 @@
echo "Building config file [using $Config.conf] for KERNEL $1..."
echo "" > .config
- %ifnarch alpha sparc sparc64
- cat %{SOURCE20} > .config
- %endif
cat $RPM_SOURCE_DIR/kernel-vanilla-$Config.config >> .config
echo "CONFIG_LOCALVERSION=\"-%{_localversion}$smp\"" >> .config
@@ -698,21 +651,8 @@
%{__make} %{MakeOpts} include/linux/version.h \
%{?with_verbose:V=1}
-%ifarch sparc sparc64
-%ifarch sparc64
- %{__make} %{MakeOpts} image \
- %{?with_verbose:V=1}
-
- %{__make} %{MakeOpts} modules \
- %{?with_verbose:V=1}
-%else
- sparc %{__make} \
- %{?with_verbose:V=1}
-%endif
-%else
%{__make} %{MakeOpts} \
%{?with_verbose:V=1}
-%endif
}
PreInstallKernel() {
@@ -733,23 +673,6 @@
install arch/%{_target_base_arch}/boot/bzImage
$KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
%endif
-%ifarch alpha sparc sparc64
- gzip -cfv vmlinux > vmlinuz
- install vmlinux $KERNEL_INSTALL_DIR/boot/vmlinux-$KernelVer
- install vmlinuz $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
-%ifarch sparc
- elftoaout arch/sparc/boot/image -o vmlinux.aout
- install vmlinux.aout $KERNEL_INSTALL_DIR/boot/vmlinux.aout-$KernelVer
-%endif
-%ifarch sparc64
- elftoaout arch/sparc64/boot/image -o vmlinux.aout
- install vmlinux.aout $KERNEL_INSTALL_DIR/boot/vmlinux.aout-$KernelVer
-%endif
-%endif
-
-%ifarch ppc
- install vmlinux $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
-%endif
install vmlinux $KERNEL_INSTALL_DIR/boot/vmlinux-$KernelVer
%{__make} %{MakeOpts} modules_install \
@@ -1024,9 +947,6 @@
%if %{with up}
%files
%defattr(644,root,root,755)
-%ifarch sparc sparc64
-/boot/vmlinux.aout-%{kernel_release}
-%endif
/boot/vmlinuz-%{kernel_release}
/boot/System.map-%{kernel_release}
%ghost /boot/initrd-%{kernel_release}.gz
@@ -1035,9 +955,6 @@
/lib/modules/%{kernel_release}/kernel/arch
/lib/modules/%{kernel_release}/kernel/crypto
/lib/modules/%{kernel_release}/kernel/drivers
-%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
@@ -1049,10 +966,8 @@
%dir /lib/modules/%{kernel_release}/kernel/sound
/lib/modules/%{kernel_release}/kernel/sound/soundcore.*
%if %{have_sound}
-%ifnarch sparc
%exclude /lib/modules/%{kernel_release}/kernel/drivers/media/video/*/*-alsa.ko*
%endif
-%endif
%dir /lib/modules/%{kernel_release}/misc
%if %{have_pcmcia}
%exclude /lib/modules/%{kernel_release}/kernel/drivers/pcmcia
@@ -1075,11 +990,9 @@
%defattr(644,root,root,755)
/boot/vmlinux-%{kernel_release}
-%ifnarch sparc
%files drm
%defattr(644,root,root,755)
/lib/modules/%{kernel_release}/kernel/drivers/char/drm
-%endif
%if %{have_pcmcia}
%files pcmcia
@@ -1102,9 +1015,7 @@
%files sound-alsa
%defattr(644,root,root,755)
/lib/modules/%{kernel_release}/kernel/sound
-%ifnarch sparc
/lib/modules/%{kernel_release}/kernel/drivers/media/video/*/*-alsa.ko*
-%endif
%exclude %dir /lib/modules/%{kernel_release}/kernel/sound
%exclude /lib/modules/%{kernel_release}/kernel/sound/soundcore.*
%if %{have_oss}
@@ -1129,9 +1040,6 @@
%files smp
%defattr(644,root,root,755)
#doc FAQ-pl
-%ifarch sparc sparc64
-/boot/vmlinux.aout-%{kernel_release}smp
-%endif
/boot/vmlinuz-%{kernel_release}smp
/boot/System.map-%{kernel_release}smp
%ghost /boot/initrd-%{kernel_release}smp.gz
@@ -1140,9 +1048,7 @@
/lib/modules/%{kernel_release}smp/kernel/arch
/lib/modules/%{kernel_release}smp/kernel/crypto
/lib/modules/%{kernel_release}smp/kernel/drivers
-%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
@@ -1154,10 +1060,8 @@
%dir /lib/modules/%{kernel_release}smp/kernel/sound
/lib/modules/%{kernel_release}smp/kernel/sound/soundcore.*
%if %{have_sound}
-%ifnarch sparc
%exclude
/lib/modules/%{kernel_release}smp/kernel/drivers/media/video/*/*-alsa.ko*
%endif
-%endif
%dir /lib/modules/%{kernel_release}smp/misc
%if %{have_pcmcia}
%exclude /lib/modules/%{kernel_release}smp/kernel/drivers/pcmcia
@@ -1180,11 +1084,9 @@
%defattr(644,root,root,755)
/boot/vmlinux-%{kernel_release}smp
-%ifnarch sparc
%files smp-drm
%defattr(644,root,root,755)
/lib/modules/%{kernel_release}smp/kernel/drivers/char/drm
-%endif
%if %{have_pcmcia}
%files smp-pcmcia
@@ -1207,9 +1109,7 @@
%files smp-sound-alsa
%defattr(644,root,root,755)
/lib/modules/%{kernel_release}smp/kernel/sound
-%ifnarch sparc
/lib/modules/%{kernel_release}smp/kernel/drivers/media/video/*/*-alsa.ko*
-%endif
%exclude %dir /lib/modules/%{kernel_release}smp/kernel/sound
%exclude /lib/modules/%{kernel_release}smp/kernel/sound/soundcore.*
%if %{have_oss}
@@ -1306,6 +1206,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.43.2.11.2.1 2007/11/10 14:05:22 hawk
+- killed kernel-common.config for easier updates
+- killed archs not supported by Titanium
+- updated to 2.6.23.1
+
Revision 1.43.2.11 2007/08/24 18:29:49 shadzik
- linux-2.6.21.7
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-vanilla.spec?r1=1.43.2.11&r2=1.43.2.11.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
