From 65eeff79fff8a1bfdf67ca51d147384f46f4d5c0 Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <fauno@endefensadelsl.org>
Date: Fri, 27 Dec 2013 23:55:53 +0000
Subject: Fri Dec 27 23:54:04 UTC 2013

---
 kernels/linux-libre-pae/PKGBUILD | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

(limited to 'kernels/linux-libre-pae/PKGBUILD')

diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD
index 2ddd1ad62..530f6d6dd 100644
--- a/kernels/linux-libre-pae/PKGBUILD
+++ b/kernels/linux-libre-pae/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 196455 2013-10-14 06:53:31Z tpowa $
+# $Id: PKGBUILD 202239 2013-12-20 19:15:03Z tpowa $
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgbase=linux-libre-pae     # Build stock -LIBRE-PAE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
-_basekernel=3.11
-pkgver=${_basekernel}.5
+_basekernel=3.12
+pkgver=${_basekernel}.6
 pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
@@ -21,16 +21,14 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         "${pkgbase}.preset"
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
-        'criu-no-expert.patch'
-        '3.11-haswell-intel_pstate.patch')
-md5sums=('7ec84223c7adcf01a5287eb7af96b7e7'
-         'bcd700aa1ae7f13107a14885923358eb'
-         '3c6c0273ea8624e94cf960091c7809e7'
+        'criu-no-expert.patch')
+md5sums=('254f59707b6676b59ce5ca5c3c698319'
+         '4b18ce60daff87504e6740670edf6b50'
+         '0a663d07acafb493399e8a5706a4cb84'
          'f302c931bd85309da9d9792b4cc96467'
-         '36e90334b12b2e9d53fd92129ee98f5b'
+         '44260d2cb1a8b51c119d2ce1f83e457a'
          '98beb36f9b8cf16e58de2483ea9985e3'
-         'd50c1ac47394e9aec637002ef3392bd1'
-         '1040ae6c10d4a68f89899f94a2318a17')
+         'd50c1ac47394e9aec637002ef3392bd1')
 
 _kernelname=${pkgbase#linux-libre}
 _localversionname=-LIBRE-PAE
@@ -45,16 +43,14 @@ prepare() {
   # add freedo as boot logo
   patch -Np1 -i "${srcdir}/boot-logo.patch"
 
+  # fix issue on Hal8188EFWImg_CE.c deblobbed file
+  sed -i "\|DEBLOBBED| s|,||" drivers/staging/rtl8188eu/hal/Hal8188EFWImg_CE.c
+
   # 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)
   patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
 
-  # add intel haswell support to intel_pstate
-  # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=6cdcdb793791f776ea9408581b1242b636d43b37
-  # will be in 3.12
-  patch -Np1 -i "${srcdir}/3.11-haswell-intel_pstate.patch"
- 
   # allow criu without expert option set
   # patch from fedora
   patch -Np1 -i "${srcdir}/criu-no-expert.patch"
-- 
cgit v1.2.3-54-g00ecf