From 314fa07e21215a4297a7b533c7c84af3cda6b865 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Thu, 14 Aug 2014 15:19:25 -0300
Subject: linux-libre-3.16-2: updating version

* bump to 3.16
* enable RO/NX protection for kernel modules (FS#41347 -> https://bugs.archlinux.org/task/41347)
* add industrial I/O subsystem (FS#41080 -> https://bugs.archlinux.org/task/41080)
* fix compal hwmon (FS#41458 -> https://bugs.archlinux.org/task/41458)
---
 libre/linux-libre/PKGBUILD | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

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

diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 3839efe50..476bb3f4d 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 218478 2014-08-01 07:04:17Z tpowa $
+# $Id: PKGBUILD 219731 2014-08-14 06:02:01Z tpowa $
 # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer (Arch): Thomas Baechler <thomas@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
@@ -10,18 +10,19 @@
 
 pkgbase=linux-libre         # Build stock -libre kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
-_basekernel=3.15
-_sublevel=8
-pkgver=${_basekernel}.${_sublevel}
-pkgrel=1
-_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver
+_basekernel=3.16
+pkgver=${_basekernel}
+#_sublevel=8
+#pkgver=${_basekernel}.${_sublevel}
+pkgrel=2
+_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
 options=('!strip')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
-        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
+        #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
         # the main kernel config files
         'config.i686' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
@@ -30,17 +31,18 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'Kbuild.platforms'
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
+        'compal-laptop-hwmon-fix.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz")
-sha256sums=('93450dc189131b6a4de862f35c5087a58cc7bae1c24caa535d2357cc3301b688'
-            '6dfa7e972f54feef3a40047704495c00b4e163d7f164c133aaaa70871ab61afe'
-            'b5e3769f14d22dc1fa574e913a10a2b06d92c046bf78063d35ff5233fd5a25e0'
-            '6a3bfcc809d4fa302b70322a6c7dff12419d881d54a8e6ddc1b80dce4388ac52'
+sha256sums=('9c2a524c901febe0f0138f702bfdeb52d6f79f22c1fdbabaa37580bc70f16218'
+            '46f70101acc6ffa57ea8f077db55ad554dd4b335c2e0fa85edf61db9f89c45ed'
+            '5b809f025fc13ccffb77092fadf044b4a52d9b8242028b01d15845589c4e1e19'
             'dfe01c93d83cdac9ca502715ceb6ac9502d327c939fec2e3052a5a58422dc176'
             'c5451d5e1eafc4f8d28b1a2958ec3102c124433a414a86450fc32058e004156b'
             '55bf07738a3286168a7929ae16dbca29defd14e77b9d24c487ae4c3d12bb9eb9'
             '8303b426b1a6dce456b2350003558ae312d21cab0ae6c1f0d7b9d21395f4e177'
-            'faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182'
-            '2b514ce7d678919bc923fc3a4beef38f4a757a6275717dfe7147544c2e9964f0')
+            '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
+            'f36f61a0a72bcb0a9c04264343503bfbf927c9ea0db819e66734a3933b060588'
+            '86a5e1ab424fe5dec8dffe24253d11575d5e7a51b7fb117db95a5bf1efdba3fd')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -68,6 +70,9 @@ prepare() {
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -p1 -i "${srcdir}/change-default-console-loglevel.patch"
 
+  # #41458 fix hwmon for compal-laptop module
+  patch -p1 -i "${srcdir}/compal-laptop-hwmon-fix.patch"
+
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
     sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
-- 
cgit v1.2.3