SPECS (LINUX_2_6_20): kernel.spec - merge up/smp kernel infrastruc...
pluto
pluto at pld-linux.org
Fri Mar 16 11:05:17 CET 2007
Author: pluto Date: Fri Mar 16 10:05:17 2007 GMT
Module: SPECS Tag: LINUX_2_6_20
---- Log message:
- merge up/smp kernel infrastructure. th will use only smp.
---- Files affected:
SPECS:
kernel.spec (1.441.2.1698.2.80 -> 1.441.2.1698.2.81)
---- Diffs:
================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1698.2.80 SPECS/kernel.spec:1.441.2.1698.2.81
--- SPECS/kernel.spec:1.441.2.1698.2.80 Fri Mar 16 00:56:53 2007
+++ SPECS/kernel.spec Fri Mar 16 11:05:11 2007
@@ -3,17 +3,17 @@
# STATUS: 2.6.20.1-0.11/2.6.20.2-0.1
# - standard config includes vserver, suspend2 and grsec_minimal
# - works for me (i686 up)
-# - builds on i686 (up & smp) with gcc-3.3.6-4 (Ac)
-# - builds on x86_64 (up & smp) with gcc-4.2.0-0.20070214.1.x86_64 (Th)
-# - builds for ppc (up & smp) with crossppc-gcc-4.0.2-2 (Ac)
-# - builds for alpha (up & smp) with crossalpha-gcc-4.0.1-1 (Th)
+# - builds on i686 with gcc-3.3.6-4 (Ac)
+# - builds on x86_64 with gcc-4.2.0-0.20070214.1.x86_64 (Th)
+# - builds for ppc with crossppc-gcc-4.0.2-2 (Ac)
+# - builds for alpha with crossalpha-gcc-4.0.1-1 (Th)
# - builds --with vesafb_tng (i686)
# - builds --with reiser4 (i686/x86_64/ppc)
# - builds --with fbsplash (i686)
# - builds --with pax (i686/x86_64/ppc)
# - (external) nvidia works with & wo regparm
# - (external) nvidia-legacy works with & wo regparm
-# - (external) ati firegl builds (but probably have issues with smp)
+# - (external) ati firegl builds (but probably have issues)
# - (external) slmodem builds
# - (external) madwifi-ng works with & wo regparm
# - (external) madwifi-old-openhal builds but have no supported hardware to test
@@ -43,12 +43,10 @@
# - pom-ng rtsp-conntrack -> nf_conntrack ?
# - pom-ng talk-conntrack-nat -> nf_conntrack ?
# - nf-hipac ?
-# - update configs for up/smp ia64 - no builder ?
+# - update configs for ia64 - no builder ?
# - acrypto - http://tservice.net.ru/~s0mbre/blog/devel/acrypto
#
# Conditional build:
-%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_without regparm # if your blob doesn't work try disable this
@@ -104,11 +102,6 @@
%define with_grsecurity 1
%endif
-%ifarch ia64
-# broken
-%undefine with_up
-%endif
-
%ifnarch %{ix86}
%undefine abi
%endif
@@ -435,8 +428,6 @@
Requires: coreutils
Requires: geninitrd >= 2.57
Requires: module-init-tools >= 0.9.9
-Provides: %{name}-up = %{epoch}:%{version}-%{release}
-Provides: kernel = %{epoch}:%{version}-%{release}
Provides: kernel(netfilter) = %{_netfilter_snap}
Provides: kernel(nf-hipac) = %{_nf_hipac_ver}
Provides: kernel(realtime-lsm) = 0.1.1
@@ -450,6 +441,7 @@
Provides: kernel-net-ipw2100 = 1.1.3
Provides: kernel-net-ipw2200 = 1.0.8
Provides: module-info
+Obsoletes: kernel-smp
Obsoletes: kernel-misc-fuse
Obsoletes: kernel-modules
Obsoletes: kernel-net-hostap
@@ -488,7 +480,7 @@
%endif
# 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}-%{_localversion}
@@ -578,6 +570,7 @@
Summary: vmlinux - uncompressed kernel image
Summary(pl.UTF-8): vmlinux - rozpakowany obraz jądra
Group: Base/Kernel
+Obsoletes: kernel-smp-vmlinux
%description vmlinux
vmlinux - uncompressed kernel image.
@@ -589,9 +582,10 @@
Summary: DRM kernel modules
Summary(pl.UTF-8): Sterowniki DRM
Group: Base/Kernel
-Requires(postun): %{name}-up = %{epoch}:%{version}-%{release}
-Requires: %{name}-up = %{epoch}:%{version}-%{release}
+Requires(postun): %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
Provides: kernel-drm = %{drm_xfree_version}
+Obsoletes: kernel-smp-drm
Autoreqprov: no
%description drm
@@ -604,10 +598,11 @@
Summary: PCMCIA modules
Summary(pl.UTF-8): Moduły PCMCIA
Group: Base/Kernel
-Requires(postun): %{name}-up = %{epoch}:%{version}-%{release}
-Requires: %{name}-up = %{epoch}:%{version}-%{release}
+Requires(postun): %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
Provides: kernel(pcmcia)
Provides: kernel-pcmcia = %{pcmcia_version}
+Obsoletes: kernel-smp-pcmcia
Conflicts: pcmcia-cs < %{_pcmcia_cs_ver}
Conflicts: pcmciautils < %{_pcmciautils_ver}
Autoreqprov: no
@@ -622,8 +617,9 @@
Summary: Libraries for preparing bootable kernel on PowerPCs
Summary(pl.UTF-8): Biblioteki do przygotowania bootowalnego jądra dla PowerPC
Group: Base/Kernel
-Requires: %{name}-up = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: mkvmlinuz >= %{_mkvmlinuz_ver}
+Obsoletes: kernel-smp-libs
Autoreqprov: no
%description libs
@@ -638,8 +634,9 @@
Summary: ALSA kernel modules
Summary(pl.UTF-8): Sterowniki dźwięku ALSA
Group: Base/Kernel
-Requires(postun): %{name}-up = %{epoch}:%{version}-%{release}
-Requires: %{name}-up = %{epoch}:%{version}-%{release}
+Requires(postun): %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: kernel-smp-sound-alsa
Autoreqprov: no
%description sound-alsa
@@ -652,8 +649,9 @@
Summary: OSS kernel modules
Summary(pl.UTF-8): Sterowniki dźwięku OSS
Group: Base/Kernel
-Requires(postun): %{name}-up = %{epoch}:%{version}-%{release}
-Requires: %{name}-up = %{epoch}:%{version}-%{release}
+Requires(postun): %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: kernel-smp-sound-oss
Autoreqprov: no
%description sound-oss
@@ -662,202 +660,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(post): coreutils
-Requires(post): geninitrd >= 2.57
-Requires(post): module-init-tools >= 0.9.9
-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(nf-hipac) = %{_nf_hipac_ver}
-Provides: kernel(realtime-lsm) = 0.1.1
-%if %{with xen0} || %{with xenU}
-Provides: kernel(xen) = %{_xen_version}
-%endif
-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
-Obsoletes: kernel-smp-misc-fuse
-Obsoletes: kernel-smp-net-hostap
-Obsoletes: kernel-smp-net-ieee80211
-Obsoletes: kernel-smp-net-ipp2p
-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: vserver-packages
-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.
-
-Netfilter module dated: %{_netfilter_snap}
-%{?with_abi:Linux ABI support - enabled}
-%{?with_grsec_full:Grsecurity full support - enabled}
-%{?with_pax:PaX support - enabled}
-%{?with_xen0:Xen 0 - enabled}
-%{?with_xenU:Xen U - enabled}
-%{?with_fbsplash:Fbsplash - enabled }
-%{?with_vesafb_tng:VesaFB New generation - enabled}
-%{?with_nfsroot:Root on NFS - enabled}
-
-%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.
-
-Netfilter module dated: %{_netfilter_snap}
-%{?with_abi:Linux ABI support - enabled}
-%{?with_grsec_full:Grsecurity full support - enabled}
-%{?with_pax:PaX support - enabled}
-%{?with_xen0:Xen 0 - enabled}
-%{?with_xenU:Xen U - enabled}
-%{?with_fbsplash:Fbsplash - enabled }
-%{?with_vesafb_tng:VesaFB New generation - enabled}
-%{?with_nfsroot:Root on NFS - enabled}
-
-%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.
-
-Netfilter module dated: %{_netfilter_snap}
-%{?with_abi:Linux ABI support - enabled}
-%{?with_grsec_full:Grsecurity full support - enabled}
-%{?with_pax:PaX support - enabled}
-%{?with_xen0:Xen 0 - enabled}
-%{?with_xenU:Xen U - enabled}
-%{?with_fbsplash:Fbsplash - enabled }
-%{?with_vesafb_tng:VesaFB New generation - enabled}
-%{?with_nfsroot:Root on NFS - enabled}
-
-%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.
-
-Netfilter module dated: %{_netfilter_snap}
-%{?with_abi:Linux ABI support - enabled}
-%{?with_grsec_full:Grsecurity full support - enabled}
-%{?with_pax:PaX support - enabled}
-%{?with_xen0:Xen 0 - enabled}
-%{?with_xenU:Xen U - enabled}
-%{?with_fbsplash:Fbsplash - enabled }
-%{?with_vesafb_tng:VesaFB New generation - enabled}
-%{?with_nfsroot:Root on NFS - enabled}
-
-%package smp-vmlinux
-Summary: vmlinux - uncompressed SMP kernel image
-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 pl.UTF-8
-vmlinux - rozpakowany obraz jądra SMP.
-
-%package smp-drm
-Summary: DRM SMP kernel modules
-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 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
-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 pl.UTF-8
-Moduły PCMCIA dla maszyn SMP (%{pcmcia_version}).
-
-%package smp-libs
-Summary: Libraries for preparing bootable SMP kernel on PowerPCs
-Summary(pl.UTF-8): Biblioteki do przygotowania bootowalnego jądra dla wieloprocesorowych PowerPC
-Group: Base/Kernel
-Requires: %{name}-smp = %{epoch}:%{version}-%{release}
-Requires: mkvmlinuz >= %{_mkvmlinuz_ver}
-Autoreqprov: no
-
-%description smp-libs
-Libraries for preparing bootable SMP kernel on PowerPCs. Script called
-mkvmlinuz may be useful for this.
-
-%description smp-libs -l pl.UTF-8
-Biblioteki do przygotowania bootowalnego jądra dla wieloprocesorowych
-PowerPC. Skrypt mkvmlinuz może być do tego przydatny.
-
-%package smp-sound-alsa
-Summary: ALSA SMP kernel modules
-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 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
-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 pl.UTF-8
-Sterowniki OSS (Open Sound System) dla maszyn wieloprocesorowych.
-
%package headers
Summary: Header files for the Linux kernel
Summary(pl.UTF-8): Pliki nagłówkowe jądra Linuksa
@@ -948,9 +750,10 @@
%package net-rndis
Summary: cdc_ether, rndis_host and usbnet drivers
Group: Base/Kernel
-Requires(postun): %{name}-up = %{epoch}:%{version}-%{release}
-Requires: %{name}-up = %{epoch}:%{version}-%{release}
+Requires(postun): %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
Provides: kernel-net-rndis = %{epoch}:%{version}-%{release}
+Obsoletes: kernel-smp-net-rndis
Obsoletes: kernel-misc-usb-rndis-lite
Autoreqprov: no
@@ -959,20 +762,6 @@
modules. You could consider replacing this package with
kernel-misc-usb-rndis-lite.
-%package smp-net-rndis
-Summary: cdc_ether, rndis_host and usbnet drivers
-Group: Base/Kernel
-Requires(postun): %{name}-smp = %{epoch}:%{version}-%{release}
-Requires: %{name}-smp = %{epoch}:%{version}-%{release}
-Provides: kernel-net-rndis = %{epoch}:%{version}-%{release}
-Obsoletes: kernel-misc-usb-rndis-lite
-Autoreqprov: no
-
-%description smp-net-rndis
-Provides cdc_ether, rndis_host and usbnet device driver kernel
-modules. You could consider replacing this package with
-kernel-smp-misc-usb-rndis-lite.
-
%package libc-headers
Summary: Header files for userspace applications
Summary(pl.UTF-8): Pliki nagłówkowe dla aplikacji użytkownika
@@ -1304,19 +1093,11 @@
BuildConfig() {
%{?debug:set -x}
# is this a special kernel we want to build?
- smp=
- [ "$1" = "smp" -o "$2" = "smp" ] && smp=yes
- if [ "$smp" = "yes" ]; then
- 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..."
+ Config="%{_target_base_arch}-smp"
+ KernelVer=%{kernel_release}
+ echo "Building config file using $Config.conf..."
cat $RPM_SOURCE_DIR/kernel-$Config.config > arch/%{_target_base_arch}/defconfig
-
- TuneUpConfigForIX86 arch/%{_target_base_arch}/defconfig "$smp"
+ TuneUpConfigForIX86 arch/%{_target_base_arch}/defconfig
%ifarch ppc ppc64
if [ "$smp" = "yes" ]; then
@@ -1424,26 +1205,14 @@
%{?debug:sed -i "s:# CONFIG_DEBUG_PREEMPT is not set:CONFIG_DEBUG_PREEMPT=y:" arch/%{_target_base_arch}/defconfig}
%{?debug:sed -i "s:# CONFIG_RT_DEADLOCK_DETECT is not set:CONFIG_RT_DEADLOCK_DETECT=y:" arch/%{_target_base_arch}/defconfig}
- if [ "$smp" = "yes" ]; then
- sed -e 's:CONFIG_LOCALVERSION="":CONFIG_LOCALVERSION="smp":' \
- -i arch/%{_target_base_arch}/defconfig
- fi
-
ln -sf arch/%{_target_base_arch}/defconfig .config
install -d $KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/linux
rm -f include/linux/autoconf.h
%{__make} %CrossOpts include/linux/autoconf.h
- if [ "$smp" = "yes" ]; then
- install include/linux/autoconf.h \
- $KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/linux/autoconf-smp.h
- install .config \
- $KERNEL_INSTALL_DIR%{_kernelsrcdir}/config-smp
- else
- install include/linux/autoconf.h \
- $KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/linux/autoconf-up.h
- install .config \
- $KERNEL_INSTALL_DIR%{_kernelsrcdir}/config-up
- fi
+ install include/linux/autoconf.h \
+ $KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/linux/autoconf-dist.h
+ install .config \
+ $KERNEL_INSTALL_DIR%{_kernelsrcdir}/config-dist
}
@@ -1487,14 +1256,8 @@
}
PreInstallKernel() {
- smp=
- [ "$1" = "smp" -o "$2" = "smp" ] && smp=yes
- if [ "$smp" = "yes" ]; then
- Config="%{_target_base_arch}-smp"
- else
- Config="%{_target_base_arch}"
- fi
- KernelVer=%{kernel_release}$1
+ Config="%{_target_base_arch}-smp"
+ KernelVer=%{kernel_release}
mkdir -p $KERNEL_INSTALL_DIR/boot
install System.map $KERNEL_INSTALL_DIR/boot/System.map-$KernelVer
@@ -1537,13 +1300,7 @@
# You'd probabelly want to make it somewhat different
install -d $KERNEL_INSTALL_DIR%{_kernelsrcdir}
- if [ "$smp" = "yes" ]; then
- install Module.symvers \
- $KERNEL_INSTALL_DIR%{_kernelsrcdir}/Module.symvers-smp
- else
- install Module.symvers \
- $KERNEL_INSTALL_DIR%{_kernelsrcdir}/Module.symvers-up
- fi
+ install Module.symvers $KERNEL_INSTALL_DIR%{_kernelsrcdir}/Module.symvers-dist
echo "CHECKING DEPENDENCIES FOR KERNEL MODULES"
if [ %DepMod = /sbin/depmod ]; then
@@ -1556,32 +1313,17 @@
KERNEL_BUILD_DIR=`pwd`
echo "-%{_localversion}" > localversion
-#install -m 644 %{SOURCE50} FAQ-pl
-# UP KERNEL
-%if %{with up}
-KERNEL_INSTALL_DIR="$KERNEL_BUILD_DIR/build-done/kernel-UP"
+KERNEL_INSTALL_DIR="$KERNEL_BUILD_DIR/build-done/kernel"
rm -rf $KERNEL_INSTALL_DIR
BuildConfig
BuildKernel
PreInstallKernel
-%endif
-
-
-# SMP KERNEL
-%if %{with smp}
-KERNEL_INSTALL_DIR="$KERNEL_BUILD_DIR/build-done/kernel-SMP"
-rm -rf $KERNEL_INSTALL_DIR
-BuildConfig smp
-BuildKernel smp
-PreInstallKernel smp
-%endif
%{__make} %CrossOpts include/linux/utsrelease.h
cp include/linux/utsrelease.h{,.save}
cp include/linux/version.h{,.save}
cp scripts/mkcompile_h{,.save}
-sed -i 's:smp::' include/linux/utsrelease.h.save
%install
rm -rf $RPM_BUILD_ROOT
@@ -1590,7 +1332,7 @@
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}
%{__make} headers_install \
INSTALL_HDR_PATH=$RPM_BUILD_ROOT%{_prefix}
@@ -1605,18 +1347,13 @@
KERNEL_BUILD_DIR=`pwd`
-%if %{with up} || %{with smp}
-cp -a$l $KERNEL_BUILD_DIR/build-done/kernel-*/* $RPM_BUILD_ROOT
-%endif
+cp -a$l $KERNEL_BUILD_DIR/build-done/kernel/* $RPM_BUILD_ROOT
-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
+if [ -e $RPM_BUILD_ROOT/lib/modules/%{kernel_release} ] ; then
+ rm -f $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/build
+ ln -sf %{_kernelsrcdir} $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/build
+ install -d $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/{cluster,misc}
+fi
find . -maxdepth 1 ! -name "build-done" ! -name "." -exec cp -a$l "{}" "$RPM_BUILD_ROOT%{_kernelsrcdir}/" ";"
@@ -1625,25 +1362,15 @@
%{__make} %CrossOpts mrproper \
RCS_FIND_IGNORE='-name build-done -prune -o'
-if [ -e $KERNEL_BUILD_DIR/build-done/kernel-UP%{_kernelsrcdir}/include/linux/autoconf-up.h ]; then
-install $KERNEL_BUILD_DIR/build-done/kernel-UP%{_kernelsrcdir}/include/linux/autoconf-up.h \
- $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux
-install $KERNEL_BUILD_DIR/build-done/kernel-UP%{_kernelsrcdir}/config-up \
- $RPM_BUILD_ROOT%{_kernelsrcdir}
-fi
-
-if [ -e $KERNEL_BUILD_DIR/build-done/kernel-SMP%{_kernelsrcdir}/include/linux/autoconf-smp.h ]; then
-install $KERNEL_BUILD_DIR/build-done/kernel-SMP%{_kernelsrcdir}/include/linux/autoconf-smp.h \
- $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux
-install $KERNEL_BUILD_DIR/build-done/kernel-SMP%{_kernelsrcdir}/config-smp \
- $RPM_BUILD_ROOT%{_kernelsrcdir}
+if [ -e $KERNEL_BUILD_DIR/build-done/kernel%{_kernelsrcdir}/include/linux/autoconf-dist.h ]; then
+ install $KERNEL_BUILD_DIR/build-done/kernel%{_kernelsrcdir}/include/linux/autoconf-dist.h \
+ $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux
+ install $KERNEL_BUILD_DIR/build-done/kernel%{_kernelsrcdir}/config-dist \
+ $RPM_BUILD_ROOT%{_kernelsrcdir}
fi
-%if %{with up} || %{with smp}
-# UP or SMP
cp -Rdp$l $KERNEL_BUILD_DIR/include/linux/* \
$RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux
-%endif
%{__make} %CrossOpts mrproper
mv -f include/linux/utsrelease.h.save $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/utsrelease.h
@@ -1657,11 +1384,6 @@
# collect module-build files and directories
perl %{SOURCE7} %{_kernelsrcdir} $KERNEL_BUILD_DIR
-%if %{with up} || %{with smp}
-# ghosted initrd
-touch $RPM_BUILD_ROOT/boot/initrd-%{kernel_release}{,smp}.gz
-%endif
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -1743,84 +1465,6 @@
%postun net-rndis
%depmod %{kernel_release}
-%preun smp
-rm -f /lib/modules/%{kernel_release}smp/modules.*
-if [ -x /sbin/new-kernel-pkg ]; then
- /sbin/new-kernel-pkg --remove %{kernel_release}smp
-fi
-
-%post smp
-%ifarch ia64
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1698.2.80&r2=1.441.2.1698.2.81&f=u
More information about the pld-cvs-commit
mailing list