bump to 3.3 series

This commit is contained in:
Tobias Powalowski 2012-03-19 10:39:45 +00:00
parent 9f60222f09
commit 61a739ce77
6 changed files with 463 additions and 301 deletions

View File

@ -6,29 +6,30 @@ pkgbase=linux
pkgname=('linux' 'linux-headers' 'linux-docs') # Build stock -ARCH kernel pkgname=('linux' 'linux-headers' 'linux-docs') # Build stock -ARCH kernel
# pkgname=linux-custom # Build kernel with a different name # pkgname=linux-custom # Build kernel with a different name
_kernelname=${pkgname#linux} _kernelname=${pkgname#linux}
_basekernel=3.2 _basekernel=3.3
pkgver=${_basekernel}.11 pkgver=${_basekernel}
pkgrel=1 pkgrel=1
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url="http://www.kernel.org/" url="http://www.kernel.org/"
license=('GPL2') license=('GPL2')
makedepends=('xmlto' 'docbook-xsl') makedepends=('xmlto' 'docbook-xsl')
options=('!strip') options=('!strip')
source=("http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.tar.xz" source=("http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.3.tar.xz"
"http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz" #"http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz"
# the main kernel config files # the main kernel config files
'config' 'config.x86_64' 'config' 'config.x86_64'
# standard config files for mkinitcpio ramdisk # standard config files for mkinitcpio ramdisk
"${pkgname}.preset" "${pkgname}.preset"
'fix-acerhdf-1810T-bios.patch'
'change-default-console-loglevel.patch' 'change-default-console-loglevel.patch'
'i915-fix-ghost-tv-output.patch' 'i915-fix-ghost-tv-output.patch'
'i915-gpu-finish.patch' 'i915-gpu-finish.patch'
'ext4-options.patch') 'ext4-options.patch')
md5sums=('364066fa18767ec0ae5f4e4abcf9dc51' md5sums=('7133f5a2086a7d7ef97abac610c094f5'
'39b3efb92f23130c3fd9c3cbdcd9ecb1' 'e20b15a7b6cf9db86788f06816b27ddb'
'a6913ef2a39541f18bd610cbb8f360ea' '938a150ce9c1aa99b16302409ecbc274'
'2182f8e0de70498130f7d9d770092c73'
'eb14dcfd80c00852ef81ded6e826826a' 'eb14dcfd80c00852ef81ded6e826826a'
'38c1fd4a1f303f1f6c38e7f082727e2f'
'9d3c56a4b999c8bfbd4018089a62f662' '9d3c56a4b999c8bfbd4018089a62f662'
'263725f20c0b9eb9c353040792d644e5' '263725f20c0b9eb9c353040792d644e5'
'4cd79aa147825837dc8bc9f6b736c0a0' '4cd79aa147825837dc8bc9f6b736c0a0'
@ -38,7 +39,7 @@ build() {
cd "${srcdir}/linux-${_basekernel}" cd "${srcdir}/linux-${_basekernel}"
# add upstream patch # add upstream patch
patch -p1 -i "${srcdir}/patch-${pkgver}" # patch -p1 -i "${srcdir}/patch-${pkgver}"
# add latest fixes from stable queue, if needed # add latest fixes from stable queue, if needed
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
@ -56,6 +57,11 @@ build() {
# needed. # needed.
patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch" patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch"
# Patch submitted upstream, waiting for inclusion:
# https://lkml.org/lkml/2012/2/19/51
# add support for latest bios of Acer 1810T acerhdf module
patch -Np1 -i "${srcdir}/fix-acerhdf-1810T-bios.patch"
# set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
# remove this when a Kconfig knob is made available by upstream # remove this when a Kconfig knob is made available by upstream
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
@ -301,3 +307,12 @@ package_linux-docs() {
# remove a file already in linux package # remove a file already in linux package
rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
} }
md5sums=('7133f5a2086a7d7ef97abac610c094f5'
'e20b15a7b6cf9db86788f06816b27ddb'
'938a150ce9c1aa99b16302409ecbc274'
'eb14dcfd80c00852ef81ded6e826826a'
'38c1fd4a1f303f1f6c38e7f082727e2f'
'9d3c56a4b999c8bfbd4018089a62f662'
'263725f20c0b9eb9c353040792d644e5'
'4cd79aa147825837dc8bc9f6b736c0a0'
'bb7fd1aa23016c8057046b84fd4eb528')

363
config

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -46,4 +46,5 @@ index 502c61f..30de9cd 100644
+#endif +#endif
default: default:
ext4_msg(sb, KERN_ERR, ext4_msg(sb, KERN_ERR,
"Unrecognized mount option \"%s\" " "Unrecognized mount option \"%s\" "

View File

@ -0,0 +1,10 @@
--- linux-3.3/drivers/platform/x86/acerhdf.c~ 2012-03-08 09:21:18.759446675 +0100
+++ linux-3.3/drivers/platform/x86/acerhdf.c 2012-03-08 09:20:17.900452311 +0100
@@ -182,6 +182,7 @@
{"Acer", "Aspire 1810T", "v1.3308", 0x55, 0x58, {0x9e, 0x00} },
{"Acer", "Aspire 1810TZ", "v1.3310", 0x55, 0x58, {0x9e, 0x00} },
{"Acer", "Aspire 1810T", "v1.3310", 0x55, 0x58, {0x9e, 0x00} },
+ {"Acer", "Aspire 1810T", "v1.3314", 0x55, 0x58, {0x9e, 0x00} },
{"Acer", "Aspire 1810TZ", "v1.3314", 0x55, 0x58, {0x9e, 0x00} },
/* Acer 531 */
{"Acer", "AO531h", "v0.3201", 0x55, 0x58, {0x20, 0x00} },

View File

@ -2,7 +2,7 @@
# arg 2: the old package version # arg 2: the old package version
KERNEL_NAME= KERNEL_NAME=
KERNEL_VERSION=3.2.11-1-ARCH KERNEL_VERSION=3.3.0-1-ARCH
post_install () { post_install () {
# updating module dependencies # updating module dependencies