diff options
Diffstat (limited to 'main/linux-vserver')
| -rw-r--r-- | main/linux-vserver/APKBUILD | 10 | ||||
| -rw-r--r-- | main/linux-vserver/fixes-for-using-make-3.82.patch | 25 |
2 files changed, 4 insertions, 31 deletions
diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD index ebe55a639..775fef1b9 100644 --- a/main/linux-vserver/APKBUILD +++ b/main/linux-vserver/APKBUILD @@ -2,7 +2,7 @@ _flavor=vserver pkgname=linux-${_flavor} -pkgver=2.6.32.20 +pkgver=2.6.32.21 _kernver=2.6.32 pkgrel=0 @@ -15,9 +15,8 @@ _config=${config:-kernelconfig.${CARCH:-x86}} install= source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 - http://vserver.13thfloor.at/Experimental/patch-2.6.32.20-vs2.3.0.36.29.6.diff + http://vserver.13thfloor.at/Experimental/patch-2.6.32.21-vs2.3.0.36.29.6.diff x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch - fixes-for-using-make-3.82.patch kernelconfig.x86 " subpackages="$pkgname-dev" @@ -125,8 +124,7 @@ dev() { } md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 -37cd37164dd7f288dc84f831fc33a598 patch-2.6.32.20.bz2 -e5253891d0c4eff99470c6ef9de4c075 patch-2.6.32.20-vs2.3.0.36.29.6.diff +29aa10a231882a6e52908642b572326f patch-2.6.32.21.bz2 +4f95f1b2d1572a2377ec3585401fc759 patch-2.6.32.21-vs2.3.0.36.29.6.diff a1bcf76870b63a4a4035a8948fb758e2 x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch -3177c2a571b4827c1140d227e6ed06d0 fixes-for-using-make-3.82.patch 884ba32b4edb6c51426e826c44063e98 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 dd6e6ace9..000000000 --- a/main/linux-vserver/fixes-for-using-make-3.82.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- linux-2.6.36-rc1/firmware/Makefile -+++ 2.6.36-rc1-make-3.82-fixes/firmware/Makefile -@@ -142,7 +142,7 @@ fw-shipped-$(CONFIG_YAM) += yam/1200.bin - fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-) - - # Directories which we _might_ need to create, so we have a rule for them. --firmware-dirs := $(sort $(patsubst %,$(objtree)/$(obj)/%/,$(dir $(fw-external-y) $(fw-shipped-all)))) -+firmware-dirs := $(sort $(addprefix $(objtree)/$(obj)/,$(dir $(fw-external-y) $(fw-shipped-all)))) - - quiet_cmd_mkdir = MKDIR $(patsubst $(objtree)/%,%,$@) - cmd_mkdir = mkdir -p $@ ---- linux-2.6.36-rc1/scripts/mkmakefile -+++ 2.6.36-rc1-make-3.82-fixes/scripts/mkmakefile -@@ -44,7 +44,9 @@ all: - - Makefile:; - --\$(all) %/: all -+\$(all): all - @: - -+%/: all -+ @: - EOF - |