git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Default to build a coblitz kernel.
[linux-2.6.git]
/
kernel-2.6.spec
diff --git
a/kernel-2.6.spec
b/kernel-2.6.spec
index
a360f10
..
c75d295
100644
(file)
--- a/
kernel-2.6.spec
+++ b/
kernel-2.6.spec
@@
-1,7
+1,7
@@
#
#
-# $Id: kernel-2.6.spec 1
4099 2009-06-26 01:52:18Z dhozac
$
+# $Id: kernel-2.6.spec 1
3623 2009-05-26 10:51:21Z thierry
$
#
#
-%define url $URL: https://mef@svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-22-
42
/kernel-2.6.spec $
+%define url $URL: https://mef@svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-22-
39
/kernel-2.6.spec $
Summary: The Linux kernel (the core of the Linux operating system)
Summary: The Linux kernel (the core of the Linux operating system)
@@
-25,7
+25,7
@@
Summary: The Linux kernel (the core of the Linux operating system)
# for module-tag.py - sublevel is used for the version (middle) part of tag names
%define name linux-2.6
%define module_version_varname sublevel
# for module-tag.py - sublevel is used for the version (middle) part of tag names
%define name linux-2.6
%define module_version_varname sublevel
-%define taglevel 4
2
+%define taglevel 4
3
#
# Polite request for people who spin their own kernel rpms:
#
# Polite request for people who spin their own kernel rpms:
@@
-46,7
+46,7
@@
Summary: The Linux kernel (the core of the Linux operating system)
%define release vs%{vsversion}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
%define release vs%{vsversion}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
-%{!?pldistro:%global pldistro
planetlab
}
+%{!?pldistro:%global pldistro
coblitz
}
%define signmodules 0
%define make_target bzImage
%define signmodules 0
%define make_target bzImage
@@
-146,13
+146,18
@@
Patch000: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-%{rpmversion}.bz2
%endif
Patch010: linux-2.6-010-e1000e.patch
%endif
Patch010: linux-2.6-010-e1000e.patch
+Patch015: linux-2.6-015-igb.patch
Patch020: linux-2.6-020-build-id.patch
Patch030: linux-2.6-030-netns.patch
Patch040: linux-2.6-040-i_mutex-check.patch
Patch020: linux-2.6-020-build-id.patch
Patch030: linux-2.6-030-netns.patch
Patch040: linux-2.6-040-i_mutex-check.patch
+Patch050: linux-2.6-050-ixgbe.patch
# These are patches picked up from Fedora/RHEL
Patch100: linux-2.6-100-build-nonintconfig.patch
# These are patches picked up from Fedora/RHEL
Patch100: linux-2.6-100-build-nonintconfig.patch
+Patch150: linux-2.6-150-cciss-allow-kexec-to-work.patch
+Patch151: linux-2.6-151-cciss-SAS.patch
+
# Linux-VServer
Patch200: patch-%{rpmversion}-vs%{vsversion}.diff
Patch210: linux-2.6-210-vserver-cpu-sched.patch
# Linux-VServer
Patch200: patch-%{rpmversion}-vs%{vsversion}.diff
Patch210: linux-2.6-210-vserver-cpu-sched.patch
@@
-188,13
+193,10
@@
Patch660: linux-2.6-660-nmi-watchdog-default.patch
Patch670: linux-2.6-670-gcc43.patch
%endif
Patch680: linux-2.6-680-htb-hysteresis-tso.patch
Patch670: linux-2.6-670-gcc43.patch
%endif
Patch680: linux-2.6-680-htb-hysteresis-tso.patch
-Patch690: linux-2.6-690-web100.patch
-Patch700: linux-2.6-700-fperm.patch
+#Patch690: linux-2.6-690-web100.patch
Patch710: linux-2.6-710-avoid-64bits-addr-pcmcia.patch
Patch710: linux-2.6-710-avoid-64bits-addr-pcmcia.patch
-# This one is a backport from usptream.
-Patch720: linux-2.6-720-bonding-layer23.patch
-Patch721: linux-2.6-721-bonding-layer3.patch
-Patch722: linux-2.6-722-bonding-rr.patch
+
+Patch800: linux-2.6-800-fix-4-bit-apicid-assumption.patch
# See also the file named 'sources' here for the related checksums
# NOTE. iwlwifi should be in-kernel starting from 2.6.24
# See also the file named 'sources' here for the related checksums
# NOTE. iwlwifi should be in-kernel starting from 2.6.24
@@
-367,6
+369,7
@@
KERNEL_PREVIOUS=vanilla
%endif
%ApplyPatch 10
%endif
%ApplyPatch 10
+%ApplyPatch 15
%ApplyPatch 20
# NetNS patch for VINI
%ApplyPatch 20
# NetNS patch for VINI
@@
-374,9
+377,13
@@
KERNEL_PREVIOUS=vanilla
%ApplyPatch 30
%endif
%ApplyPatch 40
%ApplyPatch 30
%endif
%ApplyPatch 40
+%ApplyPatch 50
%ApplyPatch 100
%ApplyPatch 100
+%ApplyPatch 150
+%ApplyPatch 151
+
%ApplyPatch 200
%ApplyPatch 210
%ApplyPatch 220
%ApplyPatch 200
%ApplyPatch 210
%ApplyPatch 220
@@
-412,12
+419,9
@@
KERNEL_PREVIOUS=vanilla
%ApplyPatch 670
%endif
%ApplyPatch 680
%ApplyPatch 670
%endif
%ApplyPatch 680
-%ApplyPatch 690
-%ApplyPatch 700
%ApplyPatch 710
%ApplyPatch 710
-%ApplyPatch 720
-%ApplyPatch 721
-%ApplyPatch 722
+
+%ApplyPatch 800
# NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
# NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
@@
-511,6
+515,12
@@
BuildKernel() {
make -s ARCH=$Arch INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr
find $RPM_BUILD_ROOT/%{_includedir} -name \*.cmd -delete
rm -f $RPM_BUILD_ROOT/%{_includedir}/{..,.}{check,install}*
make -s ARCH=$Arch INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr
find $RPM_BUILD_ROOT/%{_includedir} -name \*.cmd -delete
rm -f $RPM_BUILD_ROOT/%{_includedir}/{..,.}{check,install}*
+
+ # glibc provides scsi headers for itself, for now
+ rm -rf $RPM_BUILD_ROOT/usr/include/scsi
+ rm -f $RPM_BUILD_ROOT/usr/include/asm*/atomic.h
+ rm -f $RPM_BUILD_ROOT/usr/include/asm*/io.h
+ rm -f $RPM_BUILD_ROOT/usr/include/asm*/irq.h
%endif
%if %{build_iwlwifi}
%endif
%if %{build_iwlwifi}
@@
-892,14
+902,12
@@
rm -f /lib/modules/%{KVERREL}uml/modules.*
%endif
%changelog
%endif
%changelog
-* Fri Jun 26 2009 Daniel Hokka Zakrisson <daniel@hozac.com> - linux-2.6-22-42
-- Bonding and multipath things.
-
-* Thu Jun 11 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - linux-2.6-22-41
-- configs for the embedemu pldistro
+* Fri Feb 19 2010 Daniel Hokka Zakrisson <dhozac@coblitz.com> linux-2.6-22-42.coblitz
+- Use CoBlitz support address
+- hardware support
-*
Wed Jun 03 2009 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-22-40
--
Added patch 700, which implements VXC_PROC_WRITE support
+*
Sun Nov 8 2009 Daniel Hokka Zakrisson <daniel@hozac.com> linux-2.6-22-40.coblitz
+-
Tag CoBlitz kernel
* Tue May 26 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - linux-2.6-22-39
- outputs the kernel-headers rpm as backported from 2.6.27
* Tue May 26 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - linux-2.6-22-39
- outputs the kernel-headers rpm as backported from 2.6.27