Merge branch 'testing' of gitorious.org:chakra-packages/core into testing

This commit is contained in:
Phil 2011-11-28 11:10:36 +00:00
commit db564d0607

View File

@ -1,8 +1,8 @@
# Source env-settings
source ../_buildscripts/`pwd | cut -d/ -f3`-${_arch}-makepkg.conf
# Pre-Patch settings
_patch="3.1.2"
_prepatch="3.1.3-rc1"
_patch="3.1.3"
_prepatch="3.1.4-pre1"
_queue="3.1"
# Aufs
_aufs="3.1-20111114"
@ -24,8 +24,8 @@ PATCHES=(
# add latest fixes from stable queue, if needed
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
#http://chakra.sourceforge.net/sources/linux/patches/3.1/candidate/$_prepatch.patch%1
ftp://ftp.kernel.org/pub/linux/kernel/v3.x/stable-review/patch-$_prepatch.gz%1
http://chakra.sourceforge.net/sources/linux/patches/3.1/candidate/$_prepatch.patch%1
#ftp://ftp.kernel.org/pub/linux/kernel/v3.x/stable-review/patch-$_prepatch.gz%1
#wireless: allow to retrieve the channel set on monitor interface
http://chakra.sourceforge.net/sources/linux/patches/3.1/bugfix/channel-negative-one-maxim.patch%1
@ -178,7 +178,7 @@ PATCHES=(
)
# Name of the resulting patch (will be bzipped afterwards)
PATCHNAME="patch-3.1.2-2-CHAKRA"
PATCHNAME="patch-3.1.3-1-CHAKRA"
# Run this before applying patches
pre_apply() {