Revert "Updated to match current stable kernel"

This reverts commit 66992c5bc975df3a5862ca4465de0f2e78cce53e.

2 files changed, 20 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6e3f13fa1347..d6dc166ca924 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -18,6 +18,8 @@ pkgbase = linux-macbook
 	source = config
 	source = config.x86_64
 	source = linux.preset
+	source = bluetooth.patch
+	source = thunderbolt.patch
 	source = change-default-console-loglevel.patch
 	source = 0001-make_flush_workqueue_non_gpl.patch
 	source = 0001-e1000e-Fix-tight-loop-implementation-of-systime-read.patch
@@ -30,6 +32,8 @@ pkgbase = linux-macbook
 	sha256sums = e6f6f804f98ad321ce3e4395924993b51decb89699fde369391ccbb4bae928b2
 	sha256sums = a071aaa327d2b3577fa4709b47ed5fe81c7914d168607f3db905fdbf226247e7
 	sha256sums = f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c
+	sha256sums = dcbed1ae73c4e1383210bad6f1f446bdd13f8b1c24d89bcf0483acc5e178c379
+	sha256sums = 4909b37856f4b2374e54e44d656971a1f1027900444ac494f4dd1bb113dc9c97
 	sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
 	sha256sums = 4e776734e2c2185910a6fbb6f333d967b04f4a72b3196310af286c6a779bd97d
 	sha256sums = 0b1e41ba59ae45f5929963aa22fdc53bc8ffb4534e976cec046269d1a462197b
@@ -37,7 +41,7 @@ pkgbase = linux-macbook
 	sha256sums = 0a8fe4434e930d393c7983e335842f6cb77ee263af5592a0ca7e14bae7296183
 
 pkgname = linux-macbook
-	pkgdesc = The Linux-macbook kernel and modules
+	pkgdesc = The Linux-macbook kernel and modules, with patches for 11,4 and 12,1 Macbook pros (2015)
 	install = linux.install
 	depends = coreutils
 	depends = linux-firmware
@@ -47,8 +51,8 @@ pkgname = linux-macbook
 	backup = etc/mkinitcpio.d/linux-macbook.preset
 
 pkgname = linux-macbook-headers
-	pkgdesc = Header files and scripts for building modules for Linux-macbook kernel
+	pkgdesc = Header files and scripts for building modules for Linux-macbook kernel, with patches for 11,4 and 12,1 Macbook pros (2015)
 
 pkgname = linux-macbook-docs
-	pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-macbook kernel
+	pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-macbook kernel, with patches for 11,4 and 12,1 Macbook pros (2015)
 
diff --git a/PKGBUILD b/PKGBUILD
index f5870643c929..579a89885d6a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 247555 2015-09-28 06:37:29Z tpowa $
+# $Id: PKGBUILD 247063 2015-09-22 05:59:35Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 
-#pkgbase=linux               # Build stock -ARCH kernel
-pkgbase=linux-macbook       # Build kernel with a different name
+pkgbase=linux-macbook               # Build stock -ARCH kernel
+#pkgbase=linux-custom       # Build kernel with a different name
 _srcname=linux-4.2
 pkgver=4.2.1
 pkgrel=1
@@ -20,6 +20,8 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         'config' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
         'linux.preset'
+        'bluetooth.patch'
+        'thunderbolt.patch'
         'change-default-console-loglevel.patch'
         '0001-make_flush_workqueue_non_gpl.patch'
         '0001-e1000e-Fix-tight-loop-implementation-of-systime-read.patch'
@@ -32,6 +34,8 @@ sha256sums=('cf20e044f17588d2a42c8f2a450b0fd84dfdbd579b489d93e9ab7d0e8b45dbeb'
             'e6f6f804f98ad321ce3e4395924993b51decb89699fde369391ccbb4bae928b2'
             'a071aaa327d2b3577fa4709b47ed5fe81c7914d168607f3db905fdbf226247e7'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
+            'dcbed1ae73c4e1383210bad6f1f446bdd13f8b1c24d89bcf0483acc5e178c379'
+            '4909b37856f4b2374e54e44d656971a1f1027900444ac494f4dd1bb113dc9c97'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
             '4e776734e2c2185910a6fbb6f333d967b04f4a72b3196310af286c6a779bd97d'
             '0b1e41ba59ae45f5929963aa22fdc53bc8ffb4534e976cec046269d1a462197b'
@@ -53,6 +57,9 @@ prepare() {
   # add latest fixes from stable queue, if needed
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
 
+  patch -p1 -i "${srcdir}/bluetooth.patch"
+  patch -p1 -i "${srcdir}/thunderbolt.patch"
+
   # fix work_queue symbol to non GPL for nvidia module building
   # already applied to 4.3 series
   patch -p1 -i "${srcdir}/0001-make_flush_workqueue_non_gpl.patch"
@@ -114,7 +121,7 @@ build() {
 }
 
 _package() {
-  pkgdesc="The ${pkgbase/linux/Linux} kernel and modules"
+  pkgdesc="The ${pkgbase/linux/Linux} kernel and modules, with patches for 11,4 and 12,1 Macbook pros (2015)"
   [ "${pkgbase}" = "linux" ] && groups=('base')
   depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
@@ -173,7 +180,7 @@ _package() {
 }
 
 _package-headers() {
-  pkgdesc="Header files and scripts for building modules for ${pkgbase/linux/Linux} kernel"
+  pkgdesc="Header files and scripts for building modules for ${pkgbase/linux/Linux} kernel, with patches for 11,4 and 12,1 Macbook pros (2015)"
 
   install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
 
@@ -290,7 +297,7 @@ _package-headers() {
 }
 
 _package-docs() {
-  pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase/linux/Linux} kernel"
+  pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase/linux/Linux} kernel, with patches for 11,4 and 12,1 Macbook pros (2015)"
 
   cd "${srcdir}/${_srcname}"