diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-08-06 08:58:36 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-08-06 08:58:36 +0000 |
| commit | 3a138c7fc3c38433f75cf3d44a4a78d80a6da705 (patch) | |
| tree | 2cd0ab881d445277630d8e74e756639d19f5649f /main/linux-vserver/APKBUILD | |
| parent | 579ba619a6a0d799c5cf1632003fa79e9551aa68 (diff) | |
| download | aports-3a138c7fc3c38433f75cf3d44a4a78d80a6da705.tar.bz2 aports-3a138c7fc3c38433f75cf3d44a4a78d80a6da705.tar.xz | |
main/linux-vserver: add fix for screen output on boot
was never applied to linux-vserver kernel.
ref #339
Diffstat (limited to 'main/linux-vserver/APKBUILD')
| -rw-r--r-- | main/linux-vserver/APKBUILD | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD index 912954526a..ff2597f754 100644 --- a/main/linux-vserver/APKBUILD +++ b/main/linux-vserver/APKBUILD @@ -5,7 +5,7 @@ pkgname=linux-${_flavor} pkgver=2.6.32.16 _kernver=2.6.32 -pkgrel=1 +pkgrel=2 pkgdesc="Linux kernel with vserver" url="http://linux-vserver.org/" depends="mkinitfs linux-firmware" @@ -16,6 +16,7 @@ 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.16-vs2.3.0.36.29.4.diff + x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch kernelconfig.x86 " subpackages="$pkgname-dev" @@ -29,10 +30,15 @@ prepare() { bunzip2 -c < ../patch-$pkgver.bz2 | patch -p1 -N || return 1 fi - for i in ../*.diff ../*.patch; do - [ -f $i ] || continue - msg "Applying $i..." - patch -p1 -N < $i || return 1 + # first apply patches in specified order + for i in $source; do + i=${i##*/} + case $i in + *.patch|*.diff) + msg "Applying $i..." + patch -s -p1 -N < "$srcdir"/$i || return 1 + ;; + esac done mkdir -p "$srcdir"/build @@ -120,4 +126,5 @@ dev() { md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 744890f9651962ceae7663d44b19df65 patch-2.6.32.16.bz2 24354a6fd8798792b9ee21f086721cd9 patch-2.6.32.16-vs2.3.0.36.29.4.diff +a1bcf76870b63a4a4035a8948fb758e2 x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch 884ba32b4edb6c51426e826c44063e98 kernelconfig.x86" |