aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-09-09 06:47:13 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-09-23 07:55:14 +0000
commit281517796d6a2a9ea1d7e598db540c44a54d345f (patch)
tree1a7f4ef056e2af47d7c074daaf2cef0058336291
parente41004cd55e2563cefc22d252ca04afc54609801 (diff)
downloadalpine_aports-281517796d6a2a9ea1d7e598db540c44a54d345f.tar.bz2
alpine_aports-281517796d6a2a9ea1d7e598db540c44a54d345f.tar.xz
alpine_aports-281517796d6a2a9ea1d7e598db540c44a54d345f.zip
main/linux-vserver: upgrade to 2.6.32.21-vs2.3.0.36.29.6
(cherry picked from commit aa3ef11005dc1f13250ba85a3a1f28ac03c59d0b)
Diffstat
-rw-r--r--main/linux-vserver/APKBUILD10
-rw-r--r--main/linux-vserver/fixes-for-using-make-3.82.patch25
2 files changed, 4 insertions, 31 deletions
diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD
index ebe55a6398..775fef1b93 100644
--- a/main/linux-vserver/APKBUILD
+++ b/main/linux-vserver/APKBUILD
@@ -2,7 +2,7 @@
2 2
3_flavor=vserver 3_flavor=vserver
4pkgname=linux-${_flavor} 4pkgname=linux-${_flavor}
5pkgver=2.6.32.20 5pkgver=2.6.32.21
6 6
7_kernver=2.6.32 7_kernver=2.6.32
8pkgrel=0 8pkgrel=0
@@ -15,9 +15,8 @@ _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 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
18 http://vserver.13thfloor.at/Experimental/patch-2.6.32.20-vs2.3.0.36.29.6.diff 18 http://vserver.13thfloor.at/Experimental/patch-2.6.32.21-vs2.3.0.36.29.6.diff
19 x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch 19 x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch
20 fixes-for-using-make-3.82.patch
21 kernelconfig.x86 20 kernelconfig.x86
22 " 21 "
23subpackages="$pkgname-dev" 22subpackages="$pkgname-dev"
@@ -125,8 +124,7 @@ dev() {
125} 124}
126 125
127md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 126md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2
12837cd37164dd7f288dc84f831fc33a598 patch-2.6.32.20.bz2 12729aa10a231882a6e52908642b572326f patch-2.6.32.21.bz2
129e5253891d0c4eff99470c6ef9de4c075 patch-2.6.32.20-vs2.3.0.36.29.6.diff 1284f95f1b2d1572a2377ec3585401fc759 patch-2.6.32.21-vs2.3.0.36.29.6.diff
130a1bcf76870b63a4a4035a8948fb758e2 x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch 129a1bcf76870b63a4a4035a8948fb758e2 x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch
1313177c2a571b4827c1140d227e6ed06d0 fixes-for-using-make-3.82.patch
132884ba32b4edb6c51426e826c44063e98 kernelconfig.x86" 130884ba32b4edb6c51426e826c44063e98 kernelconfig.x86"
diff --git a/main/linux-vserver/fixes-for-using-make-3.82.patch b/main/linux-vserver/fixes-for-using-make-3.82.patch
deleted file mode 100644
index dd6e6ace97..0000000000
--- a/main/linux-vserver/fixes-for-using-make-3.82.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1--- linux-2.6.36-rc1/firmware/Makefile
2+++ 2.6.36-rc1-make-3.82-fixes/firmware/Makefile
3@@ -142,7 +142,7 @@ fw-shipped-$(CONFIG_YAM) += yam/1200.bin
4 fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-)
5
6 # Directories which we _might_ need to create, so we have a rule for them.
7-firmware-dirs := $(sort $(patsubst %,$(objtree)/$(obj)/%/,$(dir $(fw-external-y) $(fw-shipped-all))))
8+firmware-dirs := $(sort $(addprefix $(objtree)/$(obj)/,$(dir $(fw-external-y) $(fw-shipped-all))))
9
10 quiet_cmd_mkdir = MKDIR $(patsubst $(objtree)/%,%,$@)
11 cmd_mkdir = mkdir -p $@
12--- linux-2.6.36-rc1/scripts/mkmakefile
13+++ 2.6.36-rc1-make-3.82-fixes/scripts/mkmakefile
14@@ -44,7 +44,9 @@ all:
15
16 Makefile:;
17
18-\$(all) %/: all
19+\$(all): all
20 @:
21
22+%/: all
23+ @:
24 EOF
25
© 2015 Mike Crute