SPECS: kernel.spec - merged from LINUX_2_6 - cut down changelog

baggins baggins at pld-linux.org
Tue Mar 31 14:11:20 CEST 2009


Author: baggins                      Date: Tue Mar 31 12:11:20 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from LINUX_2_6
- cut down changelog

---- Files affected:
SPECS:
   kernel.spec (1.654 -> 1.655) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.654 SPECS/kernel.spec:1.655
--- SPECS/kernel.spec:1.654	Mon Feb 12 01:48:47 2007
+++ SPECS/kernel.spec	Tue Mar 31 14:11:13 2009
@@ -1,4662 +1,2515 @@
 # $Revision$, $Date$
 #
-# FOR INFORMATION ABOUT OTHER KERNELS:
-#   cvs up -r KERNEL_BRANCHES_INFORMATION kernel.spec && less kernel.spec
-#
 # NOTE:
-# - no grsecurity (not planned, use selinux)
-# - no devfs (devfs is obsolete, use udev from HEAD)
+# the following bcond combos will not work
+# - without_vserver and any of the following
+#   - with_apparmor
+#   - with_grsec_minimal
+#   - with_grsec_full
+#   - with_tomoyo
 #
 # TODO:
-# - everything
-# - activate reiser4 in configs for platforms other than i386 w/o SMP
+# - benchmark NO_HZ & HZ=1000 vs HZ=300 on i686
+# - add a subpackage (kernel-firmware?) for ~35 firmware files
+#
+# FUTURE:
+# - pom-ng quake3-conntrack-nat -> nf_conntrack ?
+# - pom-ng talk-conntrack-nat -> nf_conntrack ?
+# - nf-hipac ?
+# - pax hooks for selinux (experimental)
+#
+# HOWTO:
+# - update main config: ./kernel-config-sort.pl ./BUILD/kernel-*/linux-2.6.29 kernel-multiarch.config
 #
 # Conditional build:
-%bcond_without	BOOT		# don't build BOOT kernel
-%bcond_without	smp		# don't build SMP kernel
-%bcond_without	up		# don't build UP kernel
 %bcond_without	source		# don't build kernel-source package
+%bcond_without	pcmcia		# don't build pcmcia
+
 %bcond_with	verbose		# verbose build (V=1)
-%bcond_with	preemptive	# build preemptive kernel
+%bcond_without	reiser4		# support for reiser4 fs (experimental)
+
+%bcond_without	grsecurity	# don't build grsecurity nor pax at all
+%bcond_without	grsec_minimal	# build only minimal subset (proc,link,fifo,shm)
+%bcond_without	grsec_full	# build full grsecurity
+%bcond_with	pax_full	# build pax and full grsecurity (ie. grsec_full && pax)
+%bcond_with	pax		# build pax support
+
+%bcond_with	fbcondecor	# build fbcondecor (disable FB_TILEBLITTING and affected fb modules)
+%bcond_with	pae		# build PAE (HIGHMEM64G) support on uniprocessor
+%bcond_with	nfsroot		# build with root on NFS support
+
+%bcond_with	imq		# imq support
+%bcond_without	wrr		# wrr support
+%bcond_without	ipv6		# ipv6 support
+
+%bcond_without	vserver		# support for VServer (enabled by default)
+%bcond_without	tuxonice	# support for tuxonice (ex-suspend2) (enabled by default)
+%bcond_without	apparmor	# build kernel with apparmor (exerimental mix)
+%bcond_with	tomoyo		# build kernel with tomoyo support [ disables apparmor ]
+
+%bcond_with	rescuecd	# build kernel for our rescue
+
+%bcond_without	smp		# build uniprocessor instead of SMP kernel
+%bcond_with	myown		# build with your own config (kernel-myown.config)
 
 %{?debug:%define with_verbose 1}
 
-%ifarch sparc
-# sparc32 is missing important updates from 2.5 cycle - won't build
-%undefine	with_smp
-%endif
-%ifarch ia64
-# broken
-%undefine	with_up
+%if %{without grsecurity}
+%undefine	with_grsec_full
+%undefine	with_grsec_minimal
+%undefine	with_pax
+%undefine	with_pax_full
 %endif
 
-%ifarch i586 i686 pentium3 pentium4 athlon
-%undefine	with_BOOT
+%if %{with pax_full}
+%undefine	with_grsec_minimal
+%define		with_grsec_full		1
+%define		with_grsecurity		1
+%define		with_pax		1
 %endif
-# temporary as BOOT is not finished yet
-%undefine	with_BOOT
-
-## Program required by kernel to work.
-%define		_binutils_ver		2.12
-%define		_util_linux_ver		2.10o
-%define		_module_init_tool_ver	0.9.10
-%define		_e2fsprogs_ver		1.29
-%define		_jfsutils_ver		1.1.3
-%define		_reiserfsprogs_ver	3.6.3
-%define		_xfsprogs_ver		2.6.0
-%define		_pcmcia_cs_ver		3.1.21
-%define		_quota_tools_ver	3.09
-%define		_PPP_ver		2.4.0
-%define		_isdn4k_utils_ver	3.1pre1
-%define		_nfs_utils_ver		1.0.5
-%define		_procps_ver		3.2.0
-%define		_oprofile_ver		0.5.3
-
-%define		_post_ver	%{nil}
-%define		_rel		0.1
-%define		_cset		0
-%define		_apply_cset	0
 
-%define		_netfilter_snap		20040629
-
-%define		_enable_debug_packages			0
-%define		no_install_post_strip			1
-%define		no_install_post_chrpath			1
+%if %{with grsec_full}
+%undefine	with_grsec_minimal
+%define		with_grsecurity		1
+%if %{with pax}
+%define		with_pax_full		1
+%endif
+%endif
 
-%define		pcmcia_version		3.1.22
-%define		drm_xfree_version	4.3.0
+%if %{with grsec_minimal}
+%undefine	with_grsec_full
+%undefine	with_pax_full
+%define		with_grsecurity		1
+%endif
 
-Summary:	The Linux kernel (the core of the Linux operating system)
-Summary(de.UTF-8):   Der Linux-Kernel (Kern des Linux-Betriebssystems)
-Summary(fr.UTF-8):   Le Kernel-Linux (La partie centrale du systeme)
-Summary(pl.UTF-8):   Jądro Linuksa
-Name:		kernel
-Version:	2.6.10%{_post_ver}
-Release:	%{_rel}
-Epoch:		3
-License:	GPL v2
-Group:		Base/Kernel
-%define		_rc	%{nil}
-Source0:	http://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{version}%{_rc}.tar.bz2
-# Source0-md5:	cffcd2919d9c8ef793ce1ac07a440eda
-Source1:	%{name}-autoconf.h
-%if "%{_apply_cset}" != "0"
-Source4:	http://ftp.kernel.org/pub/linux/kernel/v2.6/testing/cset/cset-%{_cset}.txt.bz2
-# Source4-md5:	6d572bee414b6d065f90cc9824eecff3
-%endif
-
-Source20:	%{name}-i386.config
-Source21:	%{name}-i386-smp.config
-Source22:	%{name}-x86_64.config
-Source23:	%{name}-x86_64-smp.config
-Source24:	%{name}-sparc.config
-Source25:	%{name}-sparc-smp.config
-Source26:	%{name}-sparc64.config
-Source27:	%{name}-sparc64-smp.config
-Source28:	%{name}-alpha.config
-Source29:	%{name}-alpha-smp.config
-Source30:	%{name}-ppc.config
-Source31:	%{name}-ppc-smp.config
-Source32:	%{name}-ia64.config
-Source33:	%{name}-ia64-smp.config
-
-Source40:	%{name}.FAQ-pl
-
-Source80:	%{name}-netfilter.config
-Source90:	%{name}-grsec.config
-Source91:	%{name}-grsec+pax.config
-
-
-# http://kem.p.lodz.pl/~peter/qnet/
-Patch15:	patch-2.6.8.1-qnet2.bz2
-
-Patch18:	linux-kbuild-extmod.patch
-
-Patch20:	2.6.1-rc2-VLAN-NS83820-lkml.patch
-Patch21:	2.6.5-3C920b-Tornado.patch
-Patch22:	2.6.5-i386-cmpxchg.patch
-
-Patch30:	kernel-vmalloc-reserve.patch
-
-# suspend/resume
-# http://softwaresuspend.berlios.de/
-Patch500:	linux-2.6-software-suspend-2.1.5.10.patch.gz
-
-# http://sources.redhat.com/cluster/
-Patch550:	linux-cluster-cman.patch
-Patch551:	linux-cluster-dlm.patch
-Patch552:	linux-cluster-gfs.patch
-Patch553:	linux-cluster-gnbd.patch
+%define		have_drm	1
+%define		have_oss	1
+%define		have_sound	1
 
-URL:		http://www.kernel.org/
-BuildRequires:	binutils >= 2.14.90.0.7
-BuildRequires:	diffutils
-%ifarch sparc sparc64
-BuildRequires:	elftoaout
+%if %{with rescuecd}
+%undefine	with_apparmor
+%undefine	with_tuxonice
+%undefine	with_grsec_full
+%undefine	with_grsec_minimal
+%undefine	with_pax
+%undefine	with_pax_full
+%undefine	with_vserver
+%define		have_drm	0
+%define		have_sound	0
 %endif
-BuildRequires:	module-init-tools
-BuildRequires:	perl-base
-BuildRequires:	rpmbuild(macros) >= 1.213
-BuildRequires:	sed >= 4.0
-Autoreqprov:	no
-PreReq:		coreutils
-PreReq:		module-init-tools >= 0.9.9
-PreReq:		geninitrd >= 2.57
-Requires(pre):	rc-scripts
-Provides:	%{name}-up = %{epoch}:%{version}-%{release}
-Provides:	module-info
-Provides:	%{name}(netfilter) = %{_netfilter_snap}
-Obsoletes:	kernel-modules
-Conflicts:	util-linux < %{_util_linux_ver}
-Conflicts:	module-init-tool < %{_module_init_tool_ver}
-Conflicts:	e2fsprogs < %{_e2fsprogs_ver}
-Conflicts:	jfsutils < %{_jfsutils_ver}
-Conflicts:	reiserfsprogs < %{_reiserfsprogs_ver}
-Conflicts:	xfsprogs < %{_xfsprogs_ver}
-Conflicts:	quota-tools < %{_quota_tools_ver}
-Conflicts:	PPP < %{_PPP_ver}
-Conflicts:	isdn4k-utils < %{_isdn4k_utils_ver}
-Conflicts:	nfs-utils < %{_nfs_utils_ver}
-Conflicts:	procps < %{_procps_ver}
-Conflicts:	oprofile < %{_oprofile_ver}
-ExclusiveArch:	%{ix86} %{x8664} alpha ia64 ppc sparc sparc64
-ExclusiveOS:	Linux
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%ifarch ia64
-%define		initrd_dir	/boot/efi
+%ifarch %{ix86} alpha ppc
+%define		have_isa	1
 %else
-%define		initrd_dir	/boot
+%define		have_isa	0
 %endif
 
-%description
-This package contains the Linux kernel that is used to boot and run
-your system. It contains few device drivers for specific hardware.
-Most hardware is instead supported by modules loaded after booting.
-
-%description -l de.UTF-8
-Das Kernel-Paket enthält den Linux-Kernel (vmlinuz), den Kern des
-Linux-Betriebssystems. Der Kernel ist für grundliegende
-Systemfunktionen verantwortlich: Speicherreservierung,
-Prozeß-Management, Geräte Ein- und Ausgaben, usw.
-
-%description -l fr.UTF-8
-Le package kernel contient le kernel linux (vmlinuz), la partie
-centrale d'un système d'exploitation Linux. Le noyau traite les
-fonctions basiques d'un système d'exploitation: allocation mémoire,
-allocation de process, entrée/sortie de peripheriques, etc.
-
-%description -l pl.UTF-8
-Pakiet zawiera jądro Linuksa niezbędne do prawidłowego działania
-Twojego komputera. Zawiera w sobie sterowniki do sprzętu znajdującego
-się w komputerze, takiego jak sterowniki dysków itp.
-
-%package drm
-Summary:	DRM kernel modules
-Summary(pl.UTF-8):   Sterowniki DRM
-Group:		Base/Kernel
-PreReq:		%{name}-up = %{epoch}:%{version}-%{release}
-Requires(postun):	%{name}-up = %{epoch}:%{version}-%{release}
-Provides:	%{name}-drm = %{drm_xfree_version}
-Autoreqprov:	no
-
-%description drm
-DRM kernel modules (%{drm_xfree_version}).
-
-%description drm -l pl.UTF-8
-Sterowniki DRM (%{drm_xfree_version}).
-
-%package pcmcia
-Summary:	PCMCIA modules
-Summary(pl.UTF-8):   Moduły PCMCIA
-Group:		Base/Kernel
-PreReq:		%{name}-up = %{epoch}:%{version}-%{release}
-Requires(postun):	%{name}-up = %{epoch}:%{version}-%{release}
-Provides:	%{name}-pcmcia = %{pcmcia_version}
-Provides:	kernel(pcmcia)
-Conflicts:	pcmcia-cs < %{_pcmcia_cs_ver}
-Autoreqprov:	no
-
-%description pcmcia
-PCMCIA modules (%{pcmcia_version}).
-
-%description pcmcia -l pl.UTF-8
-Moduły PCMCIA (%{pcmcia_version}).
-
-%package sound-alsa
-Summary:	ALSA kernel modules
-Summary(pl.UTF-8):   Sterowniki dźwięku ALSA
-Group:		Base/Kernel
-PreReq:		%{name}-up = %{epoch}:%{version}-%{release}
-Requires(postun):	%{name}-up = %{epoch}:%{version}-%{release}
-Autoreqprov:	no
-
-%description sound-alsa
-ALSA (Advanced Linux Sound Architecture) sound drivers.
-
-%description sound-alsa -l pl.UTF-8
-Sterowniki dźwięku ALSA (Advanced Linux Sound Architecture).
-
-%package sound-oss
-Summary:	OSS kernel modules
-Summary(pl.UTF-8):   Sterowniki dźwięku OSS
-Group:		Base/Kernel
-PreReq:		%{name}-up = %{epoch}:%{version}-%{release}
-Requires(postun):	%{name}-up = %{epoch}:%{version}-%{release}
-Autoreqprov:	no
-
-%description sound-oss
-OSS (Open Sound System) drivers.
-
-%description sound-oss -l pl.UTF-8
-Sterowniki dźwięku OSS (Open Sound System).
-
-%package smp
-Summary:	Kernel version %{version} compiled for SMP machines
-Summary(de.UTF-8):   Kernel version %{version} für Multiprozessor-Maschinen
-Summary(fr.UTF-8):   Kernel version %{version} compiler pour les machine Multi-Processeur
-Summary(pl.UTF-8):   Jądro Linuksa w wersji %{version} dla maszyn wieloprocesorowych
-Group:		Base/Kernel
-PreReq:		coreutils
-PreReq:		module-init-tools >= 0.9.9
-PreReq:		geninitrd >= 2.26
-Provides:	%{name} = %{epoch}:%{version}-%{release}
-Provides:	module-info
-Provides:	%{name}(netfilter) = %{_netfilter_snap}
-Conflicts:	util-linux < %{_util_linux_ver}
-Conflicts:	module-init-tool < %{_module_init_tool_ver}
-Conflicts:	e2fsprogs < %{_e2fsprogs_ver}
-Conflicts:	jfsutils < %{_jfsutils_ver}
-Conflicts:	reiserfsprogs < %{_reiserfsprogs_ver}
-Conflicts:	xfsprogs < %{_xfsprogs_ver}
-Conflicts:	quota-tools < %{_quota_tools_ver}
-Conflicts:	PPP < %{_PPP_ver}
-Conflicts:	isdn4k-utils < %{_isdn4k_utils_ver}
-Conflicts:	nfs-utils < %{_nfs_utils_ver}
-Conflicts:	procps < %{_procps_ver}
-Conflicts:	oprofile < %{_oprofile_ver}
-Autoreqprov:	no
-
-%description smp
-This package includes a SMP version of the Linux %{version} kernel. It
-is required only on machines with two or more CPUs, although it should
-work fine on single-CPU boxes.
-
-%description smp -l de.UTF-8
-Dieses Paket enthält eine SMP (Multiprozessor)-Version von
-Linux-Kernel %{version}. Es wird für Maschinen mit zwei oder mehr
-Prozessoren gebraucht, sollte aber auch auf Computern mit nur einer
-CPU laufen.
-
-%description smp -l fr.UTF-8
-Ce package inclu une version SMP du noyau de Linux version {version}.
-Il et nécessaire seulement pour les machine avec deux processeurs ou
-plus, il peut quand même fonctionner pour les système mono-processeur.
-
-%description smp -l pl.UTF-8
-Pakiet zawiera jądro SMP Linuksa w wersji %{version}. Jest ono
-wymagane przez komputery zawierające dwa lub więcej procesorów.
-Powinno również dobrze działać na maszynach z jednym procesorem.
-
-%package smp-drm
-Summary:	DRM SMP kernel modules
-Summary(pl.UTF-8):   Sterowniki DRM dla maszyn wieloprocesorowych
-Group:		Base/Kernel
-PreReq:		%{name}-smp = %{epoch}:%{version}-%{release}
-Requires(postun):	%{name}-smp = %{epoch}:%{version}-%{release}
-Provides:	%{name}-drm = %{drm_xfree_version}
-Autoreqprov:	no
-
-%description smp-drm
-DRM SMP kernel modules (%{drm_xfree_version}).
-
-%description smp-drm -l pl.UTF-8
-Sterowniki DRM dla maszyn wieloprocesorowych (%{drm_xfree_version}).
-
-%package smp-pcmcia
-Summary:	PCMCIA modules for SMP kernel
-Summary(pl.UTF-8):   Moduły PCMCIA dla maszyn SMP
-Group:		Base/Kernel
-PreReq:		%{name}-smp = %{epoch}:%{version}-%{release}
-Requires(postun):	%{name}-smp = %{epoch}:%{version}-%{release}
-Provides:	%{name}-pcmcia = %{pcmcia_version}
-Provides:	kernel(pcmcia)
-Conflicts:	pcmcia-cs < %{_pcmcia_cs_ver}
-Autoreqprov:	no
-
-%description smp-pcmcia
-PCMCIA modules for SMP kernel (%{pcmcia_version}).
-
-%description smp-pcmcia -l pl.UTF-8
-Moduły PCMCIA dla maszyn SMP (%{pcmcia_version}).
-
-%package smp-sound-alsa
-Summary:	ALSA SMP kernel modules
-Summary(pl.UTF-8):   Sterowniki dźwięku ALSA dla maszyn wieloprocesorowych
-Group:		Base/Kernel
-PreReq:		%{name}-smp = %{epoch}:%{version}-%{release}
-Requires(postun):	%{name}-smp = %{epoch}:%{version}-%{release}
-Autoreqprov:	no
-
-%description smp-sound-alsa
-ALSA (Advanced Linux Sound Architecture) SMP sound drivers.
-
-%description smp-sound-alsa -l pl.UTF-8
-Sterowniki dźwięku ALSA (Advanced Linux Sound Architecture) dla maszyn
-wieloprocesorowych.
-
-%package smp-sound-oss
-Summary:	OSS SMP kernel modules
-Summary(pl.UTF-8):   Sterowniki dźwięku OSS dla maszyn wieloprocesorowych
-Group:		Base/Kernel
-PreReq:		%{name}-smp = %{epoch}:%{version}-%{release}
-Requires(postun):	%{name}-smp = %{epoch}:%{version}-%{release}
-Autoreqprov:	no
-
-%description smp-sound-oss
-OSS (Open Sound System) SMP sound drivers.
-
-%description smp-sound-oss -l pl.UTF-8
-Sterowniki OSS (Open Sound System) dla maszyn wieloprocesorowych.
-
-%package BOOT
-Summary:	Kernel version %{version} used on the installation boot disks
-Summary(de.UTF-8):   Kernel version %{version} für Installationsdisketten
-Summary(fr.UTF-8):   Kernel version %{version} utiliser pour les disquettes d'installation
-Summary(pl.UTF-8):   Jądro Linuksa w wersji %{version} dla dyskietek startowych
-Group:		Base/Kernel
-PreReq:		module-init-tools
-Autoreqprov:	no
-
-%description BOOT
-This package includes a trimmed down version of the Linux %{version}
-kernel. This kernel is used on the installation boot disks only and
-should not be used for an installed system, as many features in this
-kernel are turned off because of the size constraints.
-
-%description BOOT -l de.UTF-8
-Dieses Paket enthält eine verkleinerte Version vom Linux-Kernel
-version %{version}. Dieser Kernel wird auf den
-Installations-Bootdisketten benutzt und sollte nicht auf einem
-installierten System verwendet werden, da viele Funktionen wegen der
-Platzprobleme abgeschaltet sind.
-
-%description BOOT -l pl.UTF-8
-Pakiet zawiera jądro Linuksa dedykowane dyskietkom startowym i powinno
-być używane jedynie podczas instalacji systemu. Wiele użytecznych
-opcji zostało wyłączonych, aby jak najbardziej zmniejszyć jego
-rozmiar.
-
-%package headers
-Summary:	Header files for the Linux kernel
-Summary(pl.UTF-8):   Pliki nagłówkowe jądra Linuksa
-Group:		Base/Kernel
-Provides:	%{name}-headers(agpgart) = %{version}
-Provides:	%{name}-headers(reiserfs) = %{version}
-Provides:	%{name}-headers(bridging) = %{version}
-Provides:	kernel-i2c-devel
-Provides:	%{name}-headers(netfilter) = %{_netfilter_snap}
-Provides:	%{name}-headers(alsa-drivers)
-Obsoletes:	kernel-i2c-devel
-Autoreqprov:	no
-
-%description headers
-These are the C header files for the Linux kernel, which define
-structures and constants that are needed when rebuilding the kernel
-or building kernel modules.
-
-%description headers -l pl.UTF-8
-Pakiet zawiera pliki nagłówkowe jądra, niezbędne do rekompilacji jądra
-oraz budowania modułów jądra.
-
-%package module-build
-Summary:	Development files for building kernel modules
-Summary(pl.UTF-8):   Pliki służące do budowania modułów jądra
-Group:		Base/Kernel
-Requires:	%{name}-headers = %{epoch}:%{version}-%{release}
-Autoreqprov:	no
-
-%description module-build
-Development files from kernel source tree needed to build Linux kernel
-modules from external packages.
-
-%description module-build -l pl.UTF-8
-Pliki ze drzewa źródeł jądra potrzebne do budowania modułów jądra
-Linuksa z zewnętrznych pakietów.
-
-%package source
-Summary:	Kernel source tree
-Summary(pl.UTF-8):   Kod źródłowy jądra Linuksa
-Group:		Base/Kernel
-Requires:	%{name}-module-build = %{epoch}:%{version}-%{release}
-Autoreqprov:	no
-
-%description source
-This is the source code for the Linux kernel. It is required to build
-most C programs as they depend on constants defined in here. You can
-also build a custom kernel that is better tuned to your particular
-hardware.
-
-%description source -l de.UTF-8
-Das Kernel-Source-Paket enthält den source code (C/Assembler-Code) des
-Linux-Kernels. Die Source-Dateien werden gebraucht, um viele
-C-Programme zu compilieren, da sie auf Konstanten zurückgreifen, die
-im Kernel-Source definiert sind. Die Source-Dateien können auch
-benutzt werden, um einen Kernel zu compilieren, der besser auf Ihre
-Hardware ausgerichtet ist.
-
-%description source -l fr.UTF-8
-Le package pour le kernel-source contient le code source pour le noyau
-linux. Ces sources sont nécessaires pour compiler la plupart des
-programmes C, car il dépend de constantes définies dans le code
-source. Les sources peuvent être aussi utilisée pour compiler un noyau
-personnalisé pour avoir de meilleures performances sur des matériels
-particuliers.
-
-%description source -l pl.UTF-8
-Pakiet zawiera kod źródłowy jądra systemu.
-
-%package doc
-Summary:	Kernel documentation
-Summary(pl.UTF-8):   Dokumentacja do jądra Linuksa
-Group:		Base/Kernel
-Provides:	%{name}-doc = %{version}
-Autoreqprov:	no
-
-%description doc
-This is the documentation for the Linux kernel, as found in
-/usr/src/linux/Documentation directory.
-
-%description doc -l pl.UTF-8
-Pakiet zawiera dokumentację do jądra Linuksa pochodzącą z katalogu
-/usr/src/linux/Documentation.
-
-%prep
-%setup -q -n linux-%{version}%{_rc}
-
-%if "%{_apply_cset}" != "0"
-bzcat %{SOURCE4} | patch -p1 -s
-[ $? -ne 0 ] && exit 1
+%ifarch sparc sparc64
+%undefine	with_pcmcia
+%define		have_drm	0
+%define		have_oss	0
 %endif
 
-%patch15 -p1
-%patch18 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-
-%patch30 -p1
-
-%patch500 -p1
+%define		basever		2.6.29
+%define		postver		%{nil}
+%define		rel		0.1
 
-%patch550 -p1
-%patch551 -p1
-%patch552 -p1
-%patch553 -p1
-
-# Fix EXTRAVERSION in main Makefile
-sed -i -e 's#EXTRAVERSION =.*#EXTRAVERSION =#g' Makefile
-sed -i -e 's#CC.*$(CROSS_COMPILE)gcc#CC		= $(CROSS_COMPILE)$(OURCC)#g' Makefile
-sed -i -e 's#\-pipe##' arch/*/Makefile
+%define		_enable_debug_packages			0
 
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.654&r2=1.655&f=u



More information about the pld-cvs-commit mailing list