summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD8
-rw-r--r--config.x86_647
-rw-r--r--linux-macbook.install10
4 files changed, 19 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 51f33d2a4707..feef1536da05 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = linux-macbook
- pkgver = 4.8.6
+ pkgver = 4.8.12
pkgrel = 1
url = http://www.kernel.org/
arch = i686
@@ -14,8 +14,8 @@ pkgbase = linux-macbook
options = !strip
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.8.tar.xz
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.8.tar.sign
- source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.8.6.xz
- source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.8.6.sign
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.8.12.xz
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.8.12.sign
source = config
source = config.x86_64
source = linux-macbook.preset
@@ -28,10 +28,10 @@ pkgbase = linux-macbook
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
sha256sums = 3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a
sha256sums = SKIP
- sha256sums = 3ac0ea443ac8a7aa40f8d5ce8ec33b84abbad4dbfc567c7699df728c2c21df37
+ sha256sums = 9a498761be20c10db6b30fac095e0591173d4046c19585bcdd7a72ca8503eb87
sha256sums = SKIP
sha256sums = 1e72cd2e9e1fa8bf1478f7a7d9b9719d1fd2d1754dbe915a6b6d7e0d0a92da0a
- sha256sums = f2dd0867fea624a1d99b9ca9fed4649d609391a4ee19b7002e39a5030f453723
+ sha256sums = 8646ab1d39f1755de240a27dd1970be39b8b81b1f1caca0dd77c0a4b157292d9
sha256sums = f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c
sha256sums = bb8af32880059e681396a250d8e78f600f248da8ad4f0e76d7923badb5ee8b42
sha256sums = 4d4a622733c2ba742256f369c32a1e98fc216966589f260c7457d299dbb55971
@@ -52,12 +52,12 @@ pkgname = linux-macbook
pkgname = linux-macbook-headers
pkgdesc = Header files and scripts for building modules for Linux-macbook kernel (with brightness key and suspend patches)
depends = linux-macbook
- provides = linux-macbook-headers=4.8.6
- provides = linux-headers=4.8.6
+ provides = linux-macbook-headers=4.8.12
+ provides = linux-headers=4.8.12
pkgname = linux-macbook-docs
pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-macbook kernel (with brightness key and suspend patches)
depends = linux-macbook
- provides = linux-macbook-docs=4.8.6
- provides = linux-docs=4.8.6
+ provides = linux-macbook-docs=4.8.12
+ provides = linux-docs=4.8.12
diff --git a/PKGBUILD b/PKGBUILD
index 4fa4bba38665..4ac6a234f2a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgbase=linux-macbook # Build kernel with a different name
_kernelname=-macbook
_srcname=linux-4.8
-pkgver=4.8.6
+pkgver=4.8.12
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.kernel.org/"
@@ -29,10 +29,10 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
sha256sums=('3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a'
'SKIP'
- '3ac0ea443ac8a7aa40f8d5ce8ec33b84abbad4dbfc567c7699df728c2c21df37'
+ '9a498761be20c10db6b30fac095e0591173d4046c19585bcdd7a72ca8503eb87'
'SKIP'
'1e72cd2e9e1fa8bf1478f7a7d9b9719d1fd2d1754dbe915a6b6d7e0d0a92da0a'
- 'f2dd0867fea624a1d99b9ca9fed4649d609391a4ee19b7002e39a5030f453723'
+ '8646ab1d39f1755de240a27dd1970be39b8b81b1f1caca0dd77c0a4b157292d9'
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
'bb8af32880059e681396a250d8e78f600f248da8ad4f0e76d7923badb5ee8b42'
'4d4a622733c2ba742256f369c32a1e98fc216966589f260c7457d299dbb55971'
@@ -314,5 +314,3 @@ for _p in ${pkgname[@]}; do
_package${_p#${pkgbase}}
}"
done
-
-# vim:set ts=8 sts=2 sw=2 et:
diff --git a/config.x86_64 b/config.x86_64
index 1330f799530a..63d00510a1bb 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.8.0-1 Kernel Configuration
+# Linux/x86 4.8.9-1 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -586,6 +586,7 @@ CONFIG_KEXEC_JUMP=y
CONFIG_PHYSICAL_START=0x1000000
CONFIG_RELOCATABLE=y
# CONFIG_RANDOMIZE_BASE is not set
+CONFIG_X86_NEED_RELOCS=y
CONFIG_PHYSICAL_ALIGN=0x1000000
CONFIG_HOTPLUG_CPU=y
# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
@@ -7025,6 +7026,7 @@ CONFIG_EXT4_USE_FOR_EXT2=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_ENCRYPTION=y
+CONFIG_EXT4_FS_ENCRYPTION=y
# CONFIG_EXT4_DEBUG is not set
CONFIG_JBD2=m
# CONFIG_JBD2_DEBUG is not set
@@ -7603,7 +7605,6 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
#
CONFIG_KEYS=y
CONFIG_PERSISTENT_KEYRINGS=y
-CONFIG_BIG_KEYS=y
CONFIG_TRUSTED_KEYS=m
CONFIG_ENCRYPTED_KEYS=m
CONFIG_KEY_DH_OPERATIONS=y
@@ -7646,7 +7647,7 @@ CONFIG_CRYPTO_BLKCIPHER=y
CONFIG_CRYPTO_BLKCIPHER2=y
CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=y
+CONFIG_CRYPTO_RNG=m
CONFIG_CRYPTO_RNG2=y
CONFIG_CRYPTO_RNG_DEFAULT=m
CONFIG_CRYPTO_AKCIPHER2=y
diff --git a/linux-macbook.install b/linux-macbook.install
index bd582758fae4..475462b7d987 100644
--- a/linux-macbook.install
+++ b/linux-macbook.install
@@ -9,17 +9,13 @@ cat <<-EOF
To get suspend working properly you must do the following:
- Add disable_mode=1 and processor.ignore_ppc=1 to your kernel boot options.
+ Add disable_mode=1 to your kernel boot options.
In my case I use grub so I appended this to GRUB_CMDLINE_LINUX
in /etc/default/grub and then ran the following command as root:
grub-mkconfig -o /boot/grub/grub.cfg
- disable_mode=1 allows waking correctly from suspend
- processor.ignore_ppc=1 allows changing the CPU frequency when on battery
-
- Install rc-local from the AUR and add the following to /etc/rc.local:
- awk '$3 ~ "enabled" {print $1}' /proc/acpi/wakeup | xargs -I{} echo "{}" > /proc/acpi/wakeup
- echo LID0 > /proc/acpi/wakeup
+ Create /etc/tmpfiles.d/wakeup.conf with the contents:
+ w /proc/acpi/wakeup - - - - LID0
EOF
}