From 471653deac57dab52dba66c2e267610ae99b16c2 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <andre@pc-01.localdomain>
Date: Sat, 26 May 2012 13:40:05 -0300
Subject: linux-libre-3.4-1.1: disabling CONFIG_MICROCODE module

---
 libre/linux-libre/ChangeLog     | 5 +++++
 libre/linux-libre/PKGBUILD      | 6 +++---
 libre/linux-libre/config.i686   | 5 +----
 libre/linux-libre/config.x86_64 | 5 +----
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/libre/linux-libre/ChangeLog b/libre/linux-libre/ChangeLog
index bbf62fc7c..9af9fcb7e 100644
--- a/libre/linux-libre/ChangeLog
+++ b/libre/linux-libre/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-24  André Silva  <andre.paulista@adinet.com.uy>
+
+	* linux-libre-3.4-1.1
+	* Disabled CONFIG_MICROCODE module https://labs.parabola.nu/issues/116
+
 2012-04-24  André Silva  <andre.paulista@adinet.com.uy>
 
 	* linux-libre-3.3.3-1
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 3997f7806..d23284ec1 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -16,7 +16,7 @@ _basekernel=3.4
 #pkgver=${_basekernel}.${_sublevel}
 pkgver=${_basekernel}
 _lxopkgver=${_basekernel}.5 # nearly always the same as pkgver
-pkgrel=1
+pkgrel=1.1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -36,8 +36,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
          #'6d9d139e4b53802615833372728cc0e4'
-         '7ca6615243bf1c6a6085601b0960788f'
-         '0fa0dc2875c68bdc86023e9783b8b0e2'
+         'bdacf2c154f02eca557c7aae2f57fc8f'
+         '5f031e546eed543e75262282a70021ec'
          'e49ac236dfeef709f91a3d993ea7b62c'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 1879d2a9b..953b00b92 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -408,10 +408,7 @@ CONFIG_VM86=y
 CONFIG_TOSHIBA=m
 CONFIG_I8K=m
 CONFIG_X86_REBOOTFIXUPS=y
-CONFIG_MICROCODE=m
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
-CONFIG_MICROCODE_OLD_INTERFACE=y
+# CONFIG_MICROCODE is not set
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
 # CONFIG_NOHIGHMEM is not set
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 95b8e1649..4bac59586 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -386,10 +386,7 @@ CONFIG_X86_MCE_THRESHOLD=y
 # CONFIG_X86_MCE_INJECT is not set
 CONFIG_X86_THERMAL_VECTOR=y
 CONFIG_I8K=m
-CONFIG_MICROCODE=m
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
-CONFIG_MICROCODE_OLD_INTERFACE=y
+# CONFIG_MICROCODE is not set
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-- 
cgit v1.2.3