X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fkernel-2.6-planetlab.spec;h=d329bfdd0587f5db12c07ff019876ea7f1685c26;hb=b236b354c7079363392f180f7dae8ab84fabafed;hp=8d84b1436c45dcb5f35ddbd3a300770058f0cc0f;hpb=5124f0c35772da9ca49c0159a16cd0cc9870cd78;p=linux-2.6.git diff --git a/scripts/kernel-2.6-planetlab.spec b/scripts/kernel-2.6-planetlab.spec index 8d84b1436..d329bfdd0 100644 --- a/scripts/kernel-2.6-planetlab.spec +++ b/scripts/kernel-2.6-planetlab.spec @@ -18,24 +18,18 @@ Summary: The Linux kernel (the core of the Linux operating system) # that the kernel isn't the stock distribution kernel, for example by # adding some text to the end of the version number. # -%define sublevel 7 +%define sublevel 8 %define kversion 2.6.%{sublevel} %define rpmversion 2.6.%{sublevel} %define rhbsys %([ -r /etc/beehive-root ] && echo || echo .`whoami`) -%define release 1.planetlab%{?date:.%{date}} -# For Mandrake -%define _enable_debug_packages 1 +%define release 1.521.1.planetlab%{?date:.%{date}} +%define signmodules 0 %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE} -# groups of related archs -%define all_x86 i586 i686 - # Override generic defaults with per-arch defaults -%ifarch %{all_x86} %define image_install_path boot -%endif # # Three sets of minimum package version requirements in the form of Conflicts: @@ -68,12 +62,16 @@ Summary: The Linux kernel (the core of the Linux operating system) # %define kernel_prereq fileutils, module-init-tools, initscripts >= 5.83, mkinitrd >= 3.5.5 +Vendor: PlanetLab +Packager: PlanetLab Central +Distribution: PlanetLab 3.0 +URL: http://cvs.planet-lab.org/cvs/linux-2.6 + Name: kernel Group: System Environment/Kernel License: GPLv2 Version: %{rpmversion} Release: %{release} -ExclusiveArch: %{all_x86} ExclusiveOS: Linux Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 @@ -91,12 +89,10 @@ AutoReqProv: no # BuildPreReq: module-init-tools, patch >= 2.5.4, bash >= 2.03, sh-utils, tar BuildPreReq: bzip2, findutils, gzip, m4, perl, make >= 3.78, gnupg -#BuildPreReq: kernel-utils >= 2.4-12.1.139 -# temporary req since modutils changed output format -#BuildPreReq: modutils >= 2.4.26-14 -BuildRequires: gcc >= 2.96-98, binutils >= 2.12 -#BuildRequires: redhat-rpm-config +#BuildPreReq: kernel-utils >= 1:2.4-12.1.142 +BuildRequires: gcc >= 2.96-98, binutils >= 2.12, redhat-rpm-config BuildConflicts: rhbuildsys(DiskFree) < 500Mb +BuildArchitectures: i686 @@ -184,8 +180,7 @@ This package includes a user mode version of the Linux kernel. %prep -%setup -q -n %{name}-%{version} -c -cd linux-%{kversion} +%setup -n linux-%{kversion} # make sure the kernel has the sublevel we know it has. This looks weird # but for -pre and -rc versions we need it since we only want to use @@ -202,10 +197,6 @@ find . -name "*~" -exec rm -fv {} \; ### %build -cd linux-%{kversion} - - - BuildKernel() { # Pick the right config file for the kernel we're building @@ -236,8 +227,7 @@ BuildKernel() { make -s %{?_smp_mflags} bzImage make -s %{?_smp_mflags} modules || exit 1 - # XXX This causes all sorts of errors. Need to debug. -# make buildcheck + make buildcheck # Start installing the results @@ -255,6 +245,7 @@ BuildKernel() { grep "__crc_$i\$" System.map >> $RPM_BUILD_ROOT/boot/System.map-$KernelVer ||: done rm -f exported +# install -m 644 init/kerntypes.o $RPM_BUILD_ROOT/boot/Kerntypes-$KernelVer install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer rm -f System.map cp arch/*/boot/bzImage $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-$KernelVer @@ -339,8 +330,6 @@ BuildKernel uml %install -cd linux-%{kversion} - # architectures that don't get kernel-source (i586/i686/athlon) dont need # much of an install because the build phase already copied the needed files @@ -403,7 +392,19 @@ exit 0 exit 0 %post +# trick mkinitrd in case the current environment does not have device mapper +rootdev=$(awk '/^[ \t]*[^#]/ { if ($2 == "/") { print $1; }}' /etc/fstab) +if echo $rootdev |grep -q /dev/mapper 2>/dev/null ; then + if [ ! -f $rootdev ]; then + fake_root_lvm=1 + mkdir -p $(dirname $rootdev) + touch $rootdev + fi +fi [ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --mkinitrd --depmod --install %{KVERREL} +if [ -n "$fake_root_lvm" ]; then + rm -f $rootdev +fi if [ -x /usr/sbin/hardlink ] ; then pushd /lib/modules/%{KVERREL}/build > /dev/null ; { cd /lib/modules/%{KVERREL}/build @@ -412,6 +413,20 @@ pushd /lib/modules/%{KVERREL}/build > /dev/null ; { popd fi +# make some useful links +pushd /boot > /dev/null ; { + ln -sf System.map-%{KVERREL} System.map +# ln -sf Kerntypes-%{KVERREL} Kerntypes + ln -sf config-%{KVERREL} config + ln -sf initrd-%{KVERREL}.img initrd-boot + ln -sf vmlinuz-%{KVERREL} kernel-boot +} +popd + +# ask for a reboot +mkdir -p /etc/planetlab +touch /etc/planetlab/update-reboot + %post smp [ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --mkinitrd --depmod --install %{KVERREL}smp if [ -x /usr/sbin/hardlink ] ; then @@ -440,6 +455,7 @@ fi %files %defattr(-,root,root) /%{image_install_path}/vmlinuz-%{KVERREL} +#/boot/Kerntypes-%{KVERREL} /boot/System.map-%{KVERREL} /boot/config-%{KVERREL} %dir /lib/modules/%{KVERREL} @@ -452,6 +468,7 @@ fi %files smp %defattr(-,root,root) /%{image_install_path}/vmlinuz-%{KVERREL}smp +#/boot/Kerntypes-%{KVERREL}smp /boot/System.map-%{KVERREL}smp /boot/config-%{KVERREL}smp %dir /lib/modules/%{KVERREL}smp @@ -482,10 +499,60 @@ fi %endif %changelog +* Thu Sep 16 2004 Mark Huang +- merge to Fedora Core 2 2.6.8-1.521 + +* Tue Aug 31 2004 Arjan van de Ven +- fix execshield buglet with legacy binaries +- 2.6.9-rc1-bk7 + +* Mon Aug 30 2004 Arjan van de Ven +- 2.6.9-rc1-bk6 + +* Sat Aug 28 2004 Arjan van de Ven +- 2.6.9-rc1-bk4, now with i915 DRM driver + +* Fri Aug 27 2004 Arjan van de Ven +- 2.6.9-rc1-bk2 + +* Mon Aug 23 2004 Arjan van de Ven +- 2.6.8.1-bk2 + +* Sat Aug 21 2004 Arjan van de Ven +- attempt to fix early-udev bug + +* Fri Aug 13 2004 Arjan van de Ven +- 2.6.8-rc4-bk3 +- split execshield up some more + +* Fri Aug 13 2004 Dave Jones +- Update SCSI whitelist again with some more card readers. + +* Mon Aug 9 2004 Arjan van de Ven +- 2.6.8-rc3-bk3 + * Thu Aug 5 2004 Mark Huang - adapt for Fedora Core 2 based PlanetLab 3.0 (remove Source and Patch sections, most non-x86 sections, and GPG sections) +* Wed Aug 4 2004 Arjan van de Ven +- Add the flex-mmap bits for s390/s390x (Pete Zaitcev) +- Add flex-mmap for x86-64 32 bit emulation +- 2.6.8-rc3 + +* Mon Aug 2 2004 Arjan van de Ven +- Add Rik's token trashing control patch + +* Sun Aug 1 2004 Arjan van de Ven +- 2.6.8-rc2-bk11 + +* Fri Jul 30 2004 Arjan van de Ven +- 2.6.8-rc2-bk8 + +* Wed Jul 28 2004 Arjan van de Ven +- 2.6.8-rc2-bk6 +- make a start at splitting up the execshield patchkit + * Fri Jul 16 2004 Arjan van de Ven - ppc32 embedded updates