From 6cd14767850eb7db23a774f7c47f91c87f5502ea Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Fri, 11 Nov 2011 22:10:43 +0000 Subject: [PATCH] bump to latest version --- PKGBUILD | 43 +++++++++++-------------------------------- config | 5 +++-- config.x86_64 | 5 +++-- linux.install | 2 +- 4 files changed, 18 insertions(+), 37 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index c2c1195..e3e5446 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,15 +7,15 @@ pkgname=('linux' 'linux-headers' 'linux-docs') # Build stock -ARCH kernel # pkgname=linux-custom # Build kernel with a different name _kernelname=${pkgname#linux} _basekernel=3.1 -pkgver=${_basekernel} -pkgrel=4 +pkgver=${_basekernel}.1 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.kernel.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl') options=('!strip') -source=("http://www.kernel.org/pub/linux/kernel/v3.x/linux-${pkgver}.tar.xz" - #"http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz" +source=("http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.1.tar.xz" + "http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz" # the main kernel config files 'config' 'config.x86_64' # standard config files for mkinitcpio ramdisk @@ -23,27 +23,22 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/linux-${pkgver}.tar.xz" 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' 'i915-fix-incorrect-error-message.patch' - 'iwlagn-fix-NULL-pointer-dereference.patch' - 'dib0700-fix.patch' - 'usb-add-reset-resume-quirk-for-several-webcams.patch' - 'md-raid10-fix-bug-when-activating-a-hot-spare.patch') + 'usb-add-reset-resume-quirk-for-several-webcams.patch') md5sums=('edbdc798f23ae0f8045c82f6fa22c536' - 'b88bbe3ed780441dbe1e385f4beae1e4' - '08774980ad31da185e7f7379596b9001' + '2bf7eb28a58238e1a062fa7393bf7824' + 'cbaaa923f00c1935055273ccc1630144' + '93687a4b7e1e6bcd4e7417d6e5079bc4' 'eb14dcfd80c00852ef81ded6e826826a' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' 'a50c9076012cb2dda49952dc6ec3e9c1' - '61a6be40e8e1e9eae5f23f241e7a0779' - '442334d777475e2a37db92d199672a28' - '52d41fa61e80277ace2b994412a0c856' - 'de12ec5c342f945a95b2f12c2b85e6bf') + '52d41fa61e80277ace2b994412a0c856') build() { cd "${srcdir}/linux-${_basekernel}" # add upstream patch - #patch -p1 -i "${srcdir}/patch-${pkgver}" + patch -p1 -i "${srcdir}/patch-${pkgver}" # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git @@ -57,31 +52,15 @@ build() { # needed. patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch" - # In 3.1.0, a DRM_DEBUG message is falsely declared as DRM_ERROR. This + # In 3.1.1, a DRM_DEBUG message is falsely declared as DRM_ERROR. This # worries users, as this message is displayed even at loglevel 4. Fix # this. patch -Np1 -i "${srcdir}/i915-fix-incorrect-error-message.patch" - # iwlagn has a critical bug that hangs the system on 3.1.0. A patch - # was posted, but didn't make it into the tree in time. - # http://marc.info/?l=linux-wireless&m=131840748927629&w=2 - # FS#26674 - patch -Np1 -i "${srcdir}/iwlagn-fix-NULL-pointer-dereference.patch" - - # Fix dib0700 driver - # http://git.linuxtv.org/pb/media_tree.git/shortlog/refs/heads/for_v3.0 - # FS#25939 - patch -Np1 -i "${srcdir}/dib0700-fix.patch" - # Add the USB_QUIRK_RESET_RESUME for several webcams # FS#26528 patch -Np1 -i "${srcdir}/usb-add-reset-resume-quirk-for-several-webcams.patch" - # Fix RAID10 hot spare activation (critical) - # https://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git;a=blob_plain;f=queue-3.1/md-raid10-fix-bug-when-activating-a-hot-spare.patch;h=880849db5b7089b523f72c4d67a473e5330037fc;hb=HEAD - # FS#26767 - patch -Np1 -i "${srcdir}/md-raid10-fix-bug-when-activating-a-hot-spare.patch" - # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) diff --git a/config b/config index 24216e7..181921a 100644 --- a/config +++ b/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.1.0 Kernel Configuration +# Linux/i386 3.1.1-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -4281,7 +4281,7 @@ CONFIG_USB_HIDDEV=y # CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m @@ -4413,6 +4413,7 @@ CONFIG_USB_TMC=m CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m diff --git a/config.x86_64 b/config.x86_64 index 6b18f07..16432b4 100644 --- a/config.x86_64 +++ b/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.1.0 Kernel Configuration +# Linux/x86_64 3.1.1-1 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -4071,7 +4071,7 @@ CONFIG_USB_HIDDEV=y # CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m @@ -4203,6 +4203,7 @@ CONFIG_USB_TMC=m CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m diff --git a/linux.install b/linux.install index d6fda0c..74ee35d 100644 --- a/linux.install +++ b/linux.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.1.0-4-ARCH +KERNEL_VERSION=3.1.1-1-ARCH post_install () { # updating module dependencies