aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-12-28 08:00:20 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-01-06 15:07:21 +0000
commitbff61d1e0a127ac94f850aa57b7df666abba4628 (patch)
treeabda5b905a809594c1bac4906b144e36f909da99
parentaa0f0d6211a6fd30c88663c995a7586e45b67828 (diff)
downloadalpine_aports-bff61d1e0a127ac94f850aa57b7df666abba4628.tar.bz2
alpine_aports-bff61d1e0a127ac94f850aa57b7df666abba4628.tar.xz
alpine_aports-bff61d1e0a127ac94f850aa57b7df666abba4628.zip
main/linux-vserver: upgrade to 2.6.35.10-vs2.3.0.36.33
(cherry picked from commit 60de7e1e81761ee8704dea38a23c8908718f7496)
-rw-r--r--main/linux-vserver/APKBUILD12
-rw-r--r--main/linux-vserver/patch-2.6.35.10-vs2.3.0.36.33.diff (renamed from main/linux-vserver/patch-2.6.35.9-vs2.3.0.36.33.diff)4
2 files changed, 8 insertions, 8 deletions
diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD
index 30b881731d..0aee78b010 100644
--- a/main/linux-vserver/APKBUILD
+++ b/main/linux-vserver/APKBUILD
@@ -2,10 +2,10 @@
2 2
3_flavor=vserver 3_flavor=vserver
4pkgname=linux-${_flavor} 4pkgname=linux-${_flavor}
5pkgver=2.6.35.9 5pkgver=2.6.35.10
6 6
7_kernver=2.6.35 7_kernver=2.6.35
8pkgrel=3 8pkgrel=0
9pkgdesc="Linux kernel with vserver" 9pkgdesc="Linux kernel with vserver"
10url="http://linux-vserver.org/" 10url="http://linux-vserver.org/"
11depends="mkinitfs linux-firmware" 11depends="mkinitfs linux-firmware"
@@ -14,10 +14,10 @@ options="!strip"
14_config=${config:-kernelconfig.${CARCH:-x86}} 14_config=${config:-kernelconfig.${CARCH:-x86}}
15install= 15install=
16source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 16source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
17 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 17 http://www.kernel.org/pub/linux/kernel/v2.6/longterm/v${pkgver%.*}/patch-$pkgver.bz2
18 0001-Staging-hv-fix-sleeping-while-atomic-issue.patch 18 0001-Staging-hv-fix-sleeping-while-atomic-issue.patch
19 0004-staging-hv-fix-netvsc-sleeping-while-atomic.patch 19 0004-staging-hv-fix-netvsc-sleeping-while-atomic.patch
20 patch-2.6.35.9-vs2.3.0.36.33.diff 20 patch-$pkgver-vs2.3.0.36.33.diff
21 setlocalversion.patch 21 setlocalversion.patch
22 kernelconfig.x86 22 kernelconfig.x86
23 " 23 "
@@ -126,9 +126,9 @@ dev() {
126} 126}
127 127
128md5sums="091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2 128md5sums="091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2
129eca407cf4872ad77ae23adc8242389c4 patch-2.6.35.9.bz2 1290741b3219a009fdfc41c766416007fcf patch-2.6.35.10.bz2
130648d8b477248f233c318a3b7a961febf 0001-Staging-hv-fix-sleeping-while-atomic-issue.patch 130648d8b477248f233c318a3b7a961febf 0001-Staging-hv-fix-sleeping-while-atomic-issue.patch
1317cae2d1e1947fa57d7aaaf31c649471c 0004-staging-hv-fix-netvsc-sleeping-while-atomic.patch 1317cae2d1e1947fa57d7aaaf31c649471c 0004-staging-hv-fix-netvsc-sleeping-while-atomic.patch
132915974abb0ad49337b91f0f487593fd2 patch-2.6.35.9-vs2.3.0.36.33.diff 1321248053b5edf11914ea3909c747eb68e patch-2.6.35.10-vs2.3.0.36.33.diff
1338c224ba0cdf0aa572c7eb50379435be4 setlocalversion.patch 1338c224ba0cdf0aa572c7eb50379435be4 setlocalversion.patch
13410b1e713ce4422e69e1c96ba78feb7a9 kernelconfig.x86" 13410b1e713ce4422e69e1c96ba78feb7a9 kernelconfig.x86"
diff --git a/main/linux-vserver/patch-2.6.35.9-vs2.3.0.36.33.diff b/main/linux-vserver/patch-2.6.35.10-vs2.3.0.36.33.diff
index a559dd30be..e6ba6893c7 100644
--- a/main/linux-vserver/patch-2.6.35.9-vs2.3.0.36.33.diff
+++ b/main/linux-vserver/patch-2.6.35.10-vs2.3.0.36.33.diff
@@ -163,8 +163,8 @@ diff -NurpP --minimal linux-2.6.35.8/Makefile linux-2.6.35.8-vs2.3.0.36.33/Makef
163 VERSION = 2 163 VERSION = 2
164 PATCHLEVEL = 6 164 PATCHLEVEL = 6
165 SUBLEVEL = 35 165 SUBLEVEL = 35
166-EXTRAVERSION = .9 166-EXTRAVERSION = .10
167+EXTRAVERSION = .9-vs2.3.0.36.33 167+EXTRAVERSION = .10-vs2.3.0.36.33
168 NAME = Yokohama 168 NAME = Yokohama
169 169
170 # *DOCUMENTATION* 170 # *DOCUMENTATION*