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
disable barrier related patches for now
[linux-2.6.git]
/
kernel-2.6.spec
diff --git
a/kernel-2.6.spec
b/kernel-2.6.spec
index
882f69c
..
3317bc5
100644
(file)
--- a/
kernel-2.6.spec
+++ b/
kernel-2.6.spec
@@
-34,7
+34,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
4
+%define taglevel 4
6
#
# Polite request for people who spin their own kernel rpms:
#
# Polite request for people who spin their own kernel rpms:
@@
-53,9
+53,9
@@
Summary: The Linux kernel (the core of the Linux operating system)
# updated every time the PL kernel is updated.
%define vini_pl_patch 561
# updated every time the PL kernel is updated.
%define vini_pl_patch 561
-#%define updatelevel 1
+%define requiresreboot 0
-%define kernelrelease vs%{vsversion}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
%{?updatelevel:.%{updatelevel}}
+%define kernelrelease vs%{vsversion}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
%define packagerelease %{kernelrelease}
%define signmodules 0
%define packagerelease %{kernelrelease}
%define signmodules 0
@@
-157,6
+157,8
@@
Patch000: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-%{rpmversion}.bz2
Patch010: linux-2.6-010-e1000e.patch
Patch015: linux-2.6-015-igb.patch
Patch010: linux-2.6-010-e1000e.patch
Patch015: linux-2.6-015-igb.patch
+# disabled
+#Patch016: linux-2.6-016-bnx2x.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
@@
-213,6
+215,13
@@
Patch722: linux-2.6-722-bonding-rr.patch
Patch800: linux-2.6-800-fix-4-bit-apicid-assumption.patch
Patch800: linux-2.6-800-fix-4-bit-apicid-assumption.patch
+Patch810: linux-2.6-810-ich10.patch
+
+#Patch900: linux-2.6-900-ext3_mount_default_to_barrier.patch
+#Patch910: linux-2.6-910-support_barriers_on_single_device_dm_devices.patch
+
+Patch950: linux-2.6.950-ext3_backports.patch
+
# See also the file named 'sources' here for the related checksums
# NOTE. iwlwifi should be in-kernel starting from 2.6.24
# see http://bughost.org/bugzilla/show_bug.cgi?id=1584
# See also the file named 'sources' here for the related checksums
# NOTE. iwlwifi should be in-kernel starting from 2.6.24
# see http://bughost.org/bugzilla/show_bug.cgi?id=1584
@@
-360,7
+369,7
@@
else
cd kernel-%{kversion}
fi
cd kernel-%{kversion}
fi
-%if
"0%{updatelevel}"
+%if
%{requiresreboot}
echo "This is a trivial maintenance update. There will be no reboot following installation."
%endif
echo "This is a trivial maintenance update. There will be no reboot following installation."
%endif
@@
-390,6
+399,9
@@
KERNEL_PREVIOUS=vanilla
%ApplyPatch 10
%ApplyPatch 15
%ApplyPatch 10
%ApplyPatch 15
+%if 0
+%ApplyPatch 16
+%endif
%ApplyPatch 20
# NetNS patch for VINI
%ApplyPatch 20
# NetNS patch for VINI
@@
-445,7
+457,14
@@
KERNEL_PREVIOUS=vanilla
%ApplyPatch 721
%ApplyPatch 722
%ApplyPatch 800
%ApplyPatch 721
%ApplyPatch 722
%ApplyPatch 800
+%ApplyPatch 810
+%if 0
+%ApplyPatch 900
+%ApplyPatch 910
+%endif
+
+%ApplyPatch 950
# NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
# break with later patches.
# NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
# break with later patches.
@@
-794,11
+813,10
@@
pushd /boot > /dev/null ; {
}
popd > /dev/null
}
popd > /dev/null
+%if %{requiresreboot}
# ask for a reboot
mkdir -p /etc/planetlab
# ask for a reboot
mkdir -p /etc/planetlab
-
-%if "%{updatelevel}"==""
-#touch /etc/planetlab/update-reboot
+touch /etc/planetlab/update-reboot
%endif
%post devel
%endif
%post devel
@@
-922,6
+940,12
@@
rm -f /lib/modules/%{KVERREL}uml/modules.*
%endif
%changelog
%endif
%changelog
+* Tue Mar 16 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - linux-2.6-22-46
+- every released package should have a tag in svn, so remove updatelevel from naming scheme and also change the variable name
+
+* Tue Mar 16 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - linux-2.6-22-45
+- add support for ICH10
+
* Fri Feb 19 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - linux-2.6-22-44
- Disable rebooting
* Fri Feb 19 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - linux-2.6-22-44
- Disable rebooting