Merge branch 'master' of ssh://gparabola/abslibre

Conflicts:
	libre/linux-libre/PKGBUILD
	libre/linux-libre/linux-libre.install

4 files changed, 23 insertions, 24 deletions

diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index c5a25d7c8..f7b54ac11 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -3,14 +3,15 @@
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
 # Maintainer (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
+# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 pkgbase=linux-libre
 pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -LIBRE kernel
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=${pkgname#linux-libre}
 _basekernel=3.2
-pkgver=${_basekernel}.6
-pkgrel=2
+pkgver=${_basekernel}.7
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -29,6 +30,18 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li
         'change-default-console-loglevel.patch'
         'i915-fix-ghost-tv-output.patch'
         'i915-gpu-finish.patch')
+md5sums=('27c641c4f6785fc647cdd3e44963a55c'
+         '37a0fdc7ad19c9489faf09925b4fae5b'
+         '690e6201d219638544d2fba3996dc822'
+         'f27599e6b2a002d1a13b2249ff030314'
+         'c51cdf3d047db4bbb46bfa70fe92b196'
+         'a8a3843046926eb7ab81312cd438c5c5'
+         '2967cecc3af9f954ccc822fd63dca6ff'
+         '8267264d9a8966e57fdacd1fa1fc65c4'
+         '04b21c79df0a952c22d681dd4f4562df'
+         '9d3c56a4b999c8bfbd4018089a62f662'
+         '263725f20c0b9eb9c353040792d644e5'
+         '4cd79aa147825837dc8bc9f6b736c0a0')
 
 build() {
   cd "${srcdir}/linux-${_basekernel}"
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index da9104bdd..be8d43e31 100644..100755
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -5227,17 +5227,10 @@ CONFIG_SIGMA=m
 #
 # File systems
 #
-CONFIG_EXT2_FS=m
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
-CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
 CONFIG_EXT4_FS=m
+CONFIG_EXT4_USE_FOR_EXT23=y
 CONFIG_EXT4_FS_XATTR=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 5f8c3d003..427eee5e3 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.2.0 Kernel Configuration
+# Linux/x86_64 3.2.6-1 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -4988,17 +4988,10 @@ CONFIG_SIGMA=m
 #
 # File systems
 #
-CONFIG_EXT2_FS=m
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
-CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
 CONFIG_EXT4_FS=m
+CONFIG_EXT4_USE_FOR_EXT23=y
 CONFIG_EXT4_FS_XATTR=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 0869b9f9d..6e3e16986 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.2.6-2-LIBRE
+KERNEL_VERSION=3.2.7-1-LIBRE
 
 post_install () {
   # updating module dependencies