SPECS: kernel-desktop.spec - lazy update to 2.6.20.4 - build only ...

sparky sparky at pld-linux.org
Wed Mar 28 00:44:54 CEST 2007


Author: sparky                       Date: Tue Mar 27 22:44:54 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- lazy update to 2.6.20.4
- build only one of up or smp -> building simplified
- only ck patch and ppc configs prepared

---- Files affected:
SPECS:
   kernel-desktop.spec (1.101 -> 1.102) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.101 SPECS/kernel-desktop.spec:1.102
--- SPECS/kernel-desktop.spec:1.101	Tue Feb 13 09:06:37 2007
+++ SPECS/kernel-desktop.spec	Wed Mar 28 00:44:49 2007
@@ -1,8 +1,7 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	smp		# don't build SMP kernel
-%bcond_without	up		# don't build UP kernel
+%bcond_with	smp		# build SMP kernel instead of UP
 %bcond_without	source		# don't build kernel-source package
 
 %bcond_with	preemptrt	# use realtime-preempt patch
@@ -62,14 +61,14 @@
 %define		xen_version		3.0.2
 
 %if %{with laptop}
-%define		alt_kernel	laptop%{?with_preemptrt:_rt}
+%define		alt_kernel	laptop%{?with_preemptrt:_rt}%{?with_smp:_smp}
 %else
-%define		alt_kernel	desktop%{?with_preemptrt:_rt}
+%define		alt_kernel	desktop%{?with_preemptrt:_rt}%{?with_smp:_smp}
 %endif
 
-%define		_basever	2.6.18
-%define		_postver	.6
-%define		_rel		1
+%define		_basever	2.6.20
+%define		_postver	.4
+%define		_rel		0.1
 %define		_rc	%{nil}
 Summary:	The Linux kernel (the core of the Linux operating system)
 Summary(de.UTF-8):	Der Linux-Kernel (Kern des Linux-Betriebssystems)
@@ -84,13 +83,13 @@
 #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:	296a6d150d260144639c3664d127d174
+# Source0-md5:	34b0f354819217e6a345f48ebbd8f13e
 %if "%{_postver}" != "%{nil}"
 Source1:	http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
-# Source1-md5:	0290e7814031c52aaae09f3713fa3828
+# Source1-md5:	5653a8ff0d117e89c6c1cf519a113f83
 %endif
-Source2:	http://www.suspend2.net/downloads/all/suspend2-%{suspend_version}-for-%{suspend_kernel}.patch.bz2
-# Source2-md5:	8c4fe8e338051954623f9fb0c5ecc274
+#Source2:	http://www.suspend2.net/downloads/all/suspend2-%{suspend_version}-for-%{suspend_kernel}.patch.bz2
+## Source2-md5:	8c4fe8e338051954623f9fb0c5ecc274
 
 Source3:	kernel-desktop-autoconf.h
 Source4:	kernel-desktop-config.h
@@ -203,6 +202,12 @@
 Provides:	kernel-net-ipp2p = 1:0.8.0
 Provides:	kernel-net-ipw2100 = 1.1.3
 Provides:	kernel-net-ipw2200 = 1.0.8
+Provides:	kernel-smp-misc-fuse
+Provides:	kernel-smp-net-hostap = 0.4.4
+Provides:	kernel-smp-net-ieee80211
+Provides:	kernel-smp-net-ipp2p = 1:0.8.0
+Provides:	kernel-smp-net-ipw2100 = 1.1.3
+Provides:	kernel-smp-net-ipw2200 = 1.0.8
 Provides:	module-info
 Conflicts:	e2fsprogs < %{_e2fsprogs_ver}
 Conflicts:	isdn4k-utils < %{_isdn4k_utils_ver}
@@ -228,7 +233,7 @@
 %define		initrd_dir	/boot
 
 # kernel release (used in filesystem and eventually in uname -r)
-# modules will be looked from /lib/modules/%{kernel_release}%{?smp}
+# modules will be looked from /lib/modules/%{kernel_release}
 # _localversion is just that without version for "> localversion"
 %define		_localversion %{release}
 %define		kernel_release %{version}_%{alt_kernel}-%{_localversion}
@@ -256,19 +261,18 @@
 %{?with_ck: - desktop patchset by Con Kolivas}\
 %{?with_grsec_minimal: - grsecurity minimal}\
  - %{?with_bootsplash:bootsplash}%{!?with_bootsplash:fbsplash}\
+%{?with_smp: - Multi Processor support}\
+%{!?with_smp:%{?with_pae: - PAE (HIGHMEM64G) support}}\
  - HZ=100%{!?with_laptop:0}
 
-%define Features_smp %(echo "%{__features}" | sed '/^$/d')
-%define Features_up %(echo "%{__features}
-%{?with_pae: - PAE (HIGHMEM64G) support}" | sed '/^$/d')
-# vim: "
+%define Features %(echo "%{__features}" | sed '/^$/d')
 
 %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.
 
-%{Features_up}
+%{Features}
 
 %description -l de.UTF-8
 Das Kernel-Packet enthält den Linux-Kernel (vmlinuz), den Kern des
@@ -276,7 +280,7 @@
 Systemfunktionen verantwortlich: Speicherreservierung,
 Prozeß-Management, Geräte Ein- und Ausgaben, usw.
 
-%{Features_up}
+%{Features}
 
 %description -l fr.UTF-8
 Le package kernel contient le kernel linux (vmlinuz), la partie
@@ -284,14 +288,14 @@
 fonctions basiques d'un système d'exploitation: allocation mémoire,
 allocation de process, entrée/sortie de peripheriques, etc.
 
-%{Features_up}
+%{Features}
 
 %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.
 
-%{Features_up}
+%{Features}
 
 %package vmlinux
 Summary:	vmlinux - uncompressed kernel image
@@ -385,162 +389,6 @@
 %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
-Requires:	coreutils
-Requires:	geninitrd >= 2.26
-Requires:	module-init-tools >= 0.9.9
-Provides:	kernel = %{epoch}:%{version}-%{release}
-Provides:	kernel(netfilter) = %{_netfilter_snap}
-Provides:	kernel(realtime-lsm) = 0.1.1
-Provides:	kernel-smp-misc-fuse
-Provides:	kernel-smp-net-hostap = 0.4.4
-Provides:	kernel-smp-net-ieee80211
-Provides:	kernel-smp-net-ipp2p = 1:0.8.0
-Provides:	kernel-smp-net-ipw2100 = 1.1.3
-Provides:	kernel-smp-net-ipw2200 = 1.0.8
-Provides:	module-info
-Conflicts:	e2fsprogs < %{_e2fsprogs_ver}
-Conflicts:	isdn4k-utils < %{_isdn4k_utils_ver}
-Conflicts:	jfsutils < %{_jfsutils_ver}
-Conflicts:	module-init-tool < %{_module_init_tool_ver}
-Conflicts:	nfs-utils < %{_nfs_utils_ver}
-Conflicts:	oprofile < %{_oprofile_ver}
-Conflicts:	ppp < %{_ppp_ver}
-Conflicts:	procps < %{_procps_ver}
-Conflicts:	quota-tools < %{_quota_tools_ver}
-Conflicts:	reiser4progs < %{_reiser4progs_ver}
-Conflicts:	reiserfsprogs < %{_reiserfsprogs_ver}
-Conflicts:	util-linux < %{_util_linux_ver}
-Conflicts:	xfsprogs < %{_xfsprogs_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.
-
-%{Features_smp}
-
-%description smp -l de.UTF-8
-Dieses Packet enthält eine SMP (Multiprozessor)-Version vom
-Linux-Kernel %{version}. Es wird für Maschinen mit zwei oder mehr
-Prozessoren gebraucht, sollte aber auch auf Komputern mit nur einer
-CPU laufen.
-
-%{Features_smp}
-
-%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.
-
-%{Features_smp}
-
-%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.
-
-%{Features_smp}
-
-%package smp-vmlinux
-Summary:	vmlinux - uncompressed SMP kernel image
-Summary(de.UTF-8):	vmlinux - dekompressiertes SMP Kernel Bild
-Summary(pl.UTF-8):	vmlinux - rozpakowany obraz jądra SMP
-Group:		Base/Kernel
-
-%description smp-vmlinux
-vmlinux - uncompressed SMP kernel image.
-
-%description smp-vmlinux -l de.UTF-8
-vmlinux - dekompressiertes SMP Kernel Bild.
-
-%description smp-vmlinux -l pl.UTF-8
-vmlinux - rozpakowany obraz jądra SMP.
-
-%package smp-drm
-Summary:	DRM SMP kernel modules
-Summary(de.UTF-8):	DRM SMP Kernel Module
-Summary(pl.UTF-8):	Sterowniki DRM dla maszyn wieloprocesorowych
-Group:		Base/Kernel
-Requires(postun):	%{name}-smp = %{epoch}:%{version}-%{release}
-Requires:	%{name}-smp = %{epoch}:%{version}-%{release}
-Provides:	kernel-drm = %{drm_xfree_version}
-Autoreqprov:	no
-
-%description smp-drm
-DRM SMP kernel modules (%{drm_xfree_version}).
-
-%description smp-drm -l de.UTF-8
-DRM SMP Kernel Module (%{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(de.UTF-8):	PCMCIA Module für SMP Kernel
-Summary(pl.UTF-8):	Moduły PCMCIA dla maszyn SMP
-Group:		Base/Kernel
-Requires(postun):	%{name}-smp = %{epoch}:%{version}-%{release}
-Requires:	%{name}-smp = %{epoch}:%{version}-%{release}
-Provides:	kernel(pcmcia)
-Provides:	kernel-pcmcia = %{pcmcia_version}
-Conflicts:	pcmcia-cs < %{_pcmcia_cs_ver}
-Conflicts:	pcmciautils < %{_pcmciautils_ver}
-Autoreqprov:	no
-
-%description smp-pcmcia
-PCMCIA modules for SMP kernel (%{pcmcia_version}).
-
-%description smp-pcmcia -l de.UTF-8
-PCMCIA Module für 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(de.UTF-8):	ALSA SMP Kernel Module
-Summary(pl.UTF-8):	Sterowniki dźwięku ALSA dla maszyn wieloprocesorowych
-Group:		Base/Kernel
-Requires(postun):	%{name}-smp = %{epoch}:%{version}-%{release}
-Requires:	%{name}-smp = %{epoch}:%{version}-%{release}
-Autoreqprov:	no
-
-%description smp-sound-alsa
-ALSA (Advanced Linux Sound Architecture) SMP sound drivers.
-
-%description smp-sound-alsa -l de.UTF-8
-ALSA (Advanced Linux Sound Architecture) SMP Sound-Treiber.
-
-%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(de.UTF-8):	OSS SMP Kernel Module
-Summary(pl.UTF-8):	Sterowniki dźwięku OSS dla maszyn wieloprocesorowych
-Group:		Base/Kernel
-Requires(postun):	%{name}-smp = %{epoch}:%{version}-%{release}
-Requires:	%{name}-smp = %{epoch}:%{version}-%{release}
-Autoreqprov:	no
-
-%description smp-sound-oss
-OSS (Open Sound System) SMP sound drivers.
-
-%description smp-sound-oss -l de.UTF-8
-OSS (Open Sound System) SMP Sound-Treiber.
-
-%description smp-sound-oss -l pl.UTF-8
-Sterowniki OSS (Open Sound System) dla maszyn wieloprocesorowych.
-
 %package headers
 Summary:	Header files for the Linux kernel
 Summary(de.UTF-8):	Header Dateien für den Linux-Kernel
@@ -651,7 +499,7 @@
 %endif
 
 # suspend 2
-%{__bzip2} -dc %{SOURCE2} | %{__patch} -p1 -s
+#%{__bzip2} -dc %{SOURCE2} | %{__patch} -p1 -s
 
 %if %{with preemptrt}
 %patch0 -p1
@@ -677,21 +525,21 @@
 %endif
 
 # filesystems
-%patch10 -p1
-%patch11 -p1
+#%%patch10 -p1
+#%%patch11 -p1
 
 # hardware
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
+#%%patch20 -p1
+#%%patch21 -p1
+#%%patch22 -p1
+#%%patch23 -p1
+#%%patch24 -p1
 
 # console
 %if %{with bootsplash}
-%patch30 -p1
+#%%patch30 -p1
 %else
-%patch31 -p1
+#%%patch31 -p1
 %endif
 
 ### netfilter
@@ -723,10 +571,10 @@
 ### end of netfilter
 
 # net software
-%patch70 -p1
-%patch71 -p1
-%patch72 -p1
-%patch73 -p1
+#%%patch70 -p1
+#%%patch71 -p1
+#%%patch72 -p1
+#%%patch73 -p1
 
 #%%patch80 -p1	NEEDS a lot of work
 
@@ -734,7 +582,7 @@
 %patch91 -p1
 %patch92 -p1
 %patch100 -p1
-%patch101 -p1
+#%%patch101 -p1
 
 # Fix EXTRAVERSION in main Makefile
 sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}_%{alt_kernel}#g' Makefile
@@ -742,13 +590,15 @@
 sed -i -e '/select INPUT/d' net/bluetooth/hidp/Kconfig
 
 %build
-TuneUpConfigForIX86 () {
+KERNEL_BUILD_DIR=`pwd`
+
+Config="%{_target_base_arch}%{?with_smp:-smp}"
+
+cat %{SOURCE20} > .config
+cat $RPM_SOURCE_DIR/kernel-desktop-$Config.config >> .config
+echo "CONFIG_LOCALVERSION=\"-%{_localversion}\"" >> .config
+
 %ifarch %{ix86}
-	pae=
-	[ "$2" = "smp" ] && pae=yes
-	%if %{with pae}
-		pae=yes
-	%endif
 	%ifnarch i386
 	sed -i 's:CONFIG_M386=y:# CONFIG_M386 is not set:' $1
 	%endif
@@ -771,52 +621,30 @@
 	sed -i 's:# CONFIG_MK7 is not set:CONFIG_MK7=y:' $1
 	%endif
 	%ifarch i686 athlon pentium3 pentium4
-	if [ "$pae" = "yes" ]; then
+	%if %{with smp} || %{with pae}
 		sed -i "s:CONFIG_HIGHMEM4G=y:# CONFIG_HIGHMEM4G is not set:" $1
 		sed -i "s:# CONFIG_HIGHMEM64G is not set:CONFIG_HIGHMEM64G=y\nCONFIG_X86_PAE=y:" $1
-	fi
+	%endif
 	sed -i 's:CONFIG_MATH_EMULATION=y:# CONFIG_MATH_EMULATION is not set:' $1
 	%endif
 %endif
-}
-
-
-BuildConfig() {
-	%{?debug:set -x}
-	# is this a special kernel we want to build?
-	smp=
-	cfg="up"
-	[ "$1" = "smp" -o "$2" = "smp" ] && smp="smp"
-	if [ "$smp" = "smp" ]; then
-		cfg="smp"
-		Config="%{_target_base_arch}-smp"
-	else
-		Config="%{_target_base_arch}"
-	fi
-	KernelVer=%{kernel_release}$1
-
-	echo "Building config file [using $Config.conf] for KERNEL $1..."
-
-	cat %{SOURCE20} > .config
-	cat $RPM_SOURCE_DIR/kernel-desktop-$Config.config >> .config
-	echo "CONFIG_LOCALVERSION=\"-%{release}$smp\"" >> .config
 
-	TuneUpConfigForIX86 .config "$smp"
-
-	# preempt
+# preempt
 %if %{with preemptrt}
 	cat %{SOURCE41} >> .config
 %else
 	cat %{SOURCE42} >> .config
 %endif
 
-	cat %{SOURCE43} >> .config
 
-	# fbsplash, vesafb-tng, squashfs, imq, tahoe, atm, reiser4
-	cat %{SOURCE44} >> .config
+# suspend 2
+cat %{SOURCE43} >> .config
+
+# fbsplash, vesafb-tng, squashfs, imq, tahoe, atm, reiser4
+cat %{SOURCE44} >> .config
 
-	# netfilter
-	cat %{SOURCE45} >> .config
+# netfilter
+cat %{SOURCE45} >> .config
 
 %if %{with grsec_minimal}
 	cat %{SOURCE46} >> .config
@@ -839,176 +667,101 @@
 %{?debug:sed -i "s:# CONFIG_DEBUG_PREEMPT is not set:CONFIG_DEBUG_PREEMPT=y:" .config}
 %{?debug:sed -i "s:# CONFIG_RT_DEADLOCK_DETECT is not set:CONFIG_RT_DEADLOCK_DETECT=y:" .config}
 
-	install .config arch/%{_target_base_arch}/defconfig
-	install -d $KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/linux
-	rm -f include/linux/autoconf.h
-	%{__make} %{MakeOpts} include/linux/autoconf.h
-	install include/linux/autoconf.h \
-		$KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/linux/autoconf-${cfg}.h
-	install .config \
-		$KERNEL_INSTALL_DIR%{_kernelsrcdir}/config-${cfg}
-	install .config arch/%{_target_base_arch}/defconfig
-}
-
-BuildKernel() {
-	%{?debug:set -x}
-	echo "Building kernel $1 ..."
-	%{__make} %{MakeOpts} mrproper \
-		RCS_FIND_IGNORE='-name build-done -prune -o'
-	install arch/%{_target_base_arch}/defconfig .config
-
-	%{__make} %{MakeOpts} clean \
-		RCS_FIND_IGNORE='-name build-done -prune -o'
-
-	%{__make} %{MakeOpts} include/linux/version.h \
-		%{?with_verbose:V=1}
-
-
-	%{__make} %{MakeOpts} \
-		%{?with_verbose:V=1}
-}
-
-PreInstallKernel() {
-	smp=
-	cfg="up"
-	[ "$1" = "smp" -o "$2" = "smp" ] && smp=smp
-	if [ "$smp" = "smp" ]; then
-		cfg="smp"
-		Config="%{_target_base_arch}-smp"
-	else
-		Config="%{_target_base_arch}"
-	fi
-	KernelVer=%{kernel_release}$1
+rm -f include/linux/autoconf.h
+%{__make} %{MakeOpts} include/linux/autoconf.h
+install .config arch/%{_target_base_arch}/defconfig
 
-	mkdir -p $KERNEL_INSTALL_DIR/boot
-	install System.map $KERNEL_INSTALL_DIR/boot/System.map-$KernelVer
-%ifarch %{ix86} %{x8664}
-	install arch/%{_target_base_arch}/boot/bzImage $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
-%endif
 
-%ifarch ppc
-	install vmlinux $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
-%endif
-	install vmlinux $KERNEL_INSTALL_DIR/boot/vmlinux-$KernelVer
+# Build kernel
 
-	%{__make} %{MakeOpts} modules_install \
-		%{?with_verbose:V=1} \
-		DEPMOD=%{DepMod} \
-		INSTALL_MOD_PATH=$KERNEL_INSTALL_DIR \
-		KERNELRELEASE=$KernelVer
+%{__make} %{MakeOpts} mrproper
+install arch/%{_target_base_arch}/defconfig .config
 
-	install Module.symvers \
-		$KERNEL_INSTALL_DIR%{_kernelsrcdir}/Module.symvers-${cfg}
+%{__make} %{MakeOpts} clean
 
-	echo "CHECKING DEPENDENCIES FOR KERNEL MODULES"
-	%if "%{_target_base_arch}" != "%{_arch}"
-		touch $KERNEL_INSTALL_DIR/lib/modules/$KernelVer/modules.dep
-	%else
-		/sbin/depmod --basedir $KERNEL_INSTALL_DIR -ae \
-			-F $KERNEL_INSTALL_DIR/boot/System.map-$KernelVer -r $KernelVer \
-			|| echo
-	%endif
-	echo "KERNEL RELEASE $KernelVer DONE"
-}
+%{__make} %{MakeOpts} include/linux/version.h \
+	%{?with_verbose:V=1}
 
-KERNEL_BUILD_DIR=`pwd`
+%{__make} %{MakeOpts} \
+	%{?with_verbose:V=1}
 
-# UP KERNEL
-KERNEL_INSTALL_DIR="$KERNEL_BUILD_DIR/build-done/kernel-UP"
-rm -rf $KERNEL_INSTALL_DIR
-BuildConfig
-%if %{with up}
-BuildKernel
-PreInstallKernel
-%endif
-
-# SMP KERNEL
-KERNEL_INSTALL_DIR="$KERNEL_BUILD_DIR/build-done/kernel-SMP"
-rm -rf $KERNEL_INSTALL_DIR
-BuildConfig smp
-%if %{with smp}
-BuildKernel smp
-PreInstallKernel smp
-%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{/boot,%{_kernelsrcdir}}
 
 umask 022
+l=
 # test if we can hardlink -- %{_builddir} and $RPM_BUILD_ROOT on same partition
 if cp -al COPYING $RPM_BUILD_ROOT/COPYING 2>/dev/null; then
 	l=l
 	rm -f $RPM_BUILD_ROOT/COPYING
 fi
 
-export DEPMOD=%{DepMod}
 
 install -d $RPM_BUILD_ROOT%{_kernelsrcdir}
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/%{kernel_release}{,smp}
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/%{kernel_release}
 
 KERNEL_BUILD_DIR=`pwd`
 
-%if %{with up} || %{with smp}
-cp -a$l $KERNEL_BUILD_DIR/build-done/kernel-*/* $RPM_BUILD_ROOT
+
+# Install modules
+
+install System.map $RPM_BUILD_ROOT/boot/System.map-%{kernel_release}
+%ifarch %{ix86} %{x8664}
+	install arch/%{_target_base_arch}/boot/bzImage $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
 %endif
 
-for i in "" smp ; do
-	if [ -e  $RPM_BUILD_ROOT/lib/modules/%{kernel_release}$i ] ; then
-		rm -f $RPM_BUILD_ROOT/lib/modules/%{kernel_release}$i/build
-		ln -sf %{_kernelsrcdir} \
-			$RPM_BUILD_ROOT/lib/modules/%{kernel_release}$i/build
-		install -d $RPM_BUILD_ROOT/lib/modules/%{kernel_release}$i/{cluster,misc}
-	fi
-done
+%ifarch ppc
+	install vmlinux $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
+%endif
+	install vmlinux $RPM_BUILD_ROOT/boot/vmlinux-%{kernel_release}
 
-find . -maxdepth 1 ! -name "build-done" ! -name "." -exec cp -a$l "{}" "$RPM_BUILD_ROOT%{_kernelsrcdir}/" ";"
+#export DEPMOD=%{DepMod}
+%{__make} %{MakeOpts} modules_install \
+	%{?with_verbose:V=1} \
+	DEPMOD=%{DepMod} \
+	INSTALL_MOD_PATH=$RPM_BUILD_ROOT \
+	KERNELRELEASE=%{kernel_release}
 
-cd $RPM_BUILD_ROOT%{_kernelsrcdir}
<<Diff was trimmed, longer than 597 lines>>

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



More information about the pld-cvs-commit mailing list