summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <andre@pc-01.localdomain>2012-05-26 17:28:16 -0300
committerAndré Fabian Silva Delgado <andre@pc-01.localdomain>2012-05-26 17:28:16 -0300
commit8faefeff558c5795dc2266a371ade278f2fd19c6 (patch)
tree4f77d9025cce6831cb76f8ff8f4af4f5f49507f9 /libre
parenta551f58a692e5e75e8fdc0844563d7addc9d0538 (diff)
downloadabslibre-8faefeff558c5795dc2266a371ade278f2fd19c6.tar.gz
abslibre-8faefeff558c5795dc2266a371ade278f2fd19c6.tar.bz2
abslibre-8faefeff558c5795dc2266a371ade278f2fd19c6.zip
linux-libre-3.4-1.2: fixing issues on config files
Diffstat (limited to 'libre')
-rw-r--r--libre/linux-libre/ChangeLog6
-rw-r--r--libre/linux-libre/PKGBUILD6
-rw-r--r--libre/linux-libre/config.i6864
-rw-r--r--libre/linux-libre/config.x86_644
4 files changed, 12 insertions, 8 deletions
diff --git a/libre/linux-libre/ChangeLog b/libre/linux-libre/ChangeLog
index 9af9fcb7e..a6f62e2cd 100644
--- a/libre/linux-libre/ChangeLog
+++ b/libre/linux-libre/ChangeLog
@@ -1,7 +1,7 @@
-2012-04-24 André Silva <andre.paulista@adinet.com.uy>
+2012-05-26 André Silva <andre.paulista@adinet.com.uy>
- * linux-libre-3.4-1.1
- * Disabled CONFIG_MICROCODE module https://labs.parabola.nu/issues/116
+ * linux-libre-3.4-1.2
+ * Disabled CONFIG_MICROCODE_INTEL and CONFIG_MICROCODE_AMD modules https://labs.parabola.nu/issues/116
2012-04-24 André Silva <andre.paulista@adinet.com.uy>
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index d23284ec1..ae3f19ae1 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.1
+pkgrel=1.2
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'
- 'bdacf2c154f02eca557c7aae2f57fc8f'
- '5f031e546eed543e75262282a70021ec'
+ '631bee7d8e6e125f859fc51200699685'
+ '54f6db6c3b747fbee10cb02460ba66f0'
'e49ac236dfeef709f91a3d993ea7b62c'
'2967cecc3af9f954ccc822fd63dca6ff'
'8267264d9a8966e57fdacd1fa1fc65c4'
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 953b00b92..0bea26739 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -408,7 +408,9 @@ CONFIG_VM86=y
CONFIG_TOSHIBA=m
CONFIG_I8K=m
CONFIG_X86_REBOOTFIXUPS=y
-# CONFIG_MICROCODE is not set
+CONFIG_MICROCODE=m
+# CONFIG_MICROCODE_INTEL is not set
+# CONFIG_MICROCODE_AMD 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 4bac59586..8a4734dac 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -386,7 +386,9 @@ CONFIG_X86_MCE_THRESHOLD=y
# CONFIG_X86_MCE_INJECT is not set
CONFIG_X86_THERMAL_VECTOR=y
CONFIG_I8K=m
-# CONFIG_MICROCODE is not set
+CONFIG_MICROCODE=m
+# CONFIG_MICROCODE_INTEL is not set
+# CONFIG_MICROCODE_AMD is not set
CONFIG_X86_MSR=m
CONFIG_X86_CPUID=m
CONFIG_ARCH_PHYS_ADDR_T_64BIT=y