summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO22
-rw-r--r--0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch8
-rw-r--r--0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch12
-rw-r--r--01-apple-gmux.patch31
-rw-r--r--PKGBUILD43
-rw-r--r--RFC-PCI-Workaround-to-enable-poweroff-on-Mac-Pro-11.patch (renamed from 02-macbook-suspend.patch)0
-rw-r--r--RFC-v2-PCI-Workaround-to-enable-poweroff-on-Mac-Pro-11.patch (renamed from 03-apple-poweroff-quirk-workaround.patch)0
-rw-r--r--config26
8 files changed, 48 insertions, 94 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 12e16f42d0e..ac24497f923 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = linux-macbook
- pkgver = 4.15.4
+ pkgver = 4.15.12
pkgrel = 1
url = https://www.kernel.org/
arch = x86_64
@@ -12,36 +12,32 @@ pkgbase = linux-macbook
options = !strip
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.15.tar.xz
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.15.tar.sign
- source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.4.xz
- source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.4.sign
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.12.xz
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.12.sign
source = config
source = 60-linux.hook
source = 90-linux.hook
source = linux.preset
source = macbook-wakeup.service
- source = 01-apple-gmux.patch
- source = 02-macbook-suspend.patch
- source = 03-apple-poweroff-quirk-workaround.patch
+ source = RFC-PCI-Workaround-to-enable-poweroff-on-Mac-Pro-11.patch
+ source = RFC-v2-PCI-Workaround-to-enable-poweroff-on-Mac-Pro-11.patch
source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
source = 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
- source = 0003-x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
sha256sums = 5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769
sha256sums = SKIP
- sha256sums = 5f8344fcc6b15be5f53001bb18df342bf5877563239f03271c236e3a40db89e8
+ sha256sums = 74d2ac2ea103c907213223fd4ff710ad53e1d8a2d612db18e10d3dda9f1a6b79
sha256sums = SKIP
- sha256sums = 617d1a2b0160fc72098524a51501531556050cab0e466c9dbae5d60a78991bd2
+ sha256sums = f38927db126ec7141ea2dd70cabb2ef378552672b31db4ab621493928497abd7
sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919
sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
sha256sums = c5a714823c3418692bc5c212dd5d094a0e2ae6147d6726822911f1c26e3a1d1b
- sha256sums = bb8af32880059e681396a250d8e78f600f248da8ad4f0e76d7923badb5ee8b42
sha256sums = 7c99aaeaea7837f83a3ad215cf07277934ccf39720acee7f1c371dc86bdf89fc
sha256sums = 09189eb269a9fd16898cf90a477df23306236fb897791e8d04e5a75d5007bbff
- sha256sums = c7951a3dfa6dcfd6f7c56d8d5c7c89cceb0e612ce3e6134d3fe23d1202b69863
- sha256sums = b1485882a9d26fe49b9fb2530259c2c39e03a3346ff63edcbc746f47ef693676
- sha256sums = 54380eafa1dfb42f7860a5eee9f521c14aa5fd2c9f5bfaa6e0537d75800225b7
+ sha256sums = 4ffdc2a458845c2a7c03c735477dbf51b5b01b10568bf577b37a29e872135cab
+ sha256sums = 12b281dc45f1954cc3f52276927bb2965c3132c0a8bd7f485869ced2c541d485
pkgname = linux-macbook
pkgdesc = The Linux-macbook kernel and modules
diff --git a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
index f155e964b1e..b39ed26b751 100644
--- a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
+++ b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
@@ -1,8 +1,8 @@
-From 05a43fb8b36cdaf6a3580f46cab334f2c2796544 Mon Sep 17 00:00:00 2001
-Message-Id: <05a43fb8b36cdaf6a3580f46cab334f2c2796544.1518828081.git.jan.steffens@gmail.com>
+From 188720e92122385994143a06cb16a930053eb503 Mon Sep 17 00:00:00 2001
+Message-Id: <188720e92122385994143a06cb16a930053eb503.1520639721.git.jan.steffens@gmail.com>
From: Serge Hallyn <serge.hallyn@canonical.com>
Date: Fri, 31 May 2013 19:12:12 +0100
-Subject: [PATCH 1/3] add sysctl to disallow unprivileged CLONE_NEWUSER by
+Subject: [PATCH 1/2] add sysctl to disallow unprivileged CLONE_NEWUSER by
default
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
@@ -99,5 +99,5 @@ index 246d4d4ce5c7..f64432b45cec 100644
static DEFINE_MUTEX(userns_state_mutex);
--
-2.16.1
+2.16.2
diff --git a/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch b/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
index 97848fc1859..2383c31fddd 100644
--- a/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
+++ b/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
@@ -1,10 +1,10 @@
-From 9ae12d036a480aa5352118c982ba76f2fb1640a3 Mon Sep 17 00:00:00 2001
-Message-Id: <9ae12d036a480aa5352118c982ba76f2fb1640a3.1518828081.git.jan.steffens@gmail.com>
-In-Reply-To: <05a43fb8b36cdaf6a3580f46cab334f2c2796544.1518828081.git.jan.steffens@gmail.com>
-References: <05a43fb8b36cdaf6a3580f46cab334f2c2796544.1518828081.git.jan.steffens@gmail.com>
+From 704e31424615c87ad82424a9b09a452d762daed0 Mon Sep 17 00:00:00 2001
+Message-Id: <704e31424615c87ad82424a9b09a452d762daed0.1520639721.git.jan.steffens@gmail.com>
+In-Reply-To: <188720e92122385994143a06cb16a930053eb503.1520639721.git.jan.steffens@gmail.com>
+References: <188720e92122385994143a06cb16a930053eb503.1520639721.git.jan.steffens@gmail.com>
From: Jim Bride <jim.bride@linux.intel.com>
Date: Mon, 6 Nov 2017 13:38:57 -0800
-Subject: [PATCH 2/3] drm/i915/edp: Only use the alternate fixed mode if it's
+Subject: [PATCH 2/2] drm/i915/edp: Only use the alternate fixed mode if it's
asked for
In commit dc911f5bd8aa ("drm/i915/edp: Allow alternate fixed mode for
@@ -38,5 +38,5 @@ index add4b2434aa3..14a8bef9fdfe 100644
}
--
-2.16.1
+2.16.2
diff --git a/01-apple-gmux.patch b/01-apple-gmux.patch
deleted file mode 100644
index f1a0621580a..00000000000
--- a/01-apple-gmux.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/drivers/platform/x86/apple-gmux.c
-+++ a/drivers/platform/x86/apple-gmux.c
-@@ -419,6 +419,7 @@ static int gmux_resume(struct device *dev)
-
- static struct pci_dev *gmux_get_io_pdev(void)
- {
-+ struct pci_dev *igp = NULL, *dgp = NULL;
- struct pci_dev *pdev = NULL;
-
- while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev))) {
-@@ -428,10 +429,18 @@ static struct pci_dev *gmux_get_io_pdev(void)
- if (!(cmd & PCI_COMMAND_IO))
- continue;
-
-- return pdev;
-+ if (pdev->bus && pdev->bus->number > 0 && !dgp)
-+ dgp = pci_dev_get(pdev);
-+ else if (pdev->bus && pdev->bus->number == 0 && !igp)
-+ igp = pci_dev_get(pdev);
- }
-
-- return NULL;
-+ if (dgp && !igp)
-+ pr_warn("Found only discrete GPU %s, integrated GPU is hidden,"
-+ " unable to protect backlight behind VGA IO",
-+ pci_name(dgp));
-+ pci_dev_put(dgp);
-+ return igp;
- }
-
- static int gmux_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
diff --git a/PKGBUILD b/PKGBUILD
index 6ac851a8f89..03ca680046b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
#pkgbase=linux # Build stock -ARCH kernel
pkgbase=linux-macbook # Build kernel with a different name
_srcname=linux-4.15
-pkgver=4.15.4
+pkgver=4.15.12
pkgrel=1
arch=('x86_64')
url="https://www.kernel.org/"
@@ -21,12 +21,10 @@ source=(
90-linux.hook # pacman hook for initramfs regeneration
linux.preset # standard config files for mkinitcpio ramdisk
macbook-wakeup.service # service file for suspend/resume events
- 01-apple-gmux.patch # linux-macbook specific patches
- 02-macbook-suspend.patch
- 03-apple-poweroff-quirk-workaround.patch
+ RFC-PCI-Workaround-to-enable-poweroff-on-Mac-Pro-11.patch
+ RFC-v2-PCI-Workaround-to-enable-poweroff-on-Mac-Pro-11.patch
0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
- 0003-x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
@@ -34,19 +32,17 @@ validpgpkeys=(
)
sha256sums=('5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769'
'SKIP'
- '5f8344fcc6b15be5f53001bb18df342bf5877563239f03271c236e3a40db89e8'
+ '74d2ac2ea103c907213223fd4ff710ad53e1d8a2d612db18e10d3dda9f1a6b79'
'SKIP'
- '617d1a2b0160fc72098524a51501531556050cab0e466c9dbae5d60a78991bd2'
+ 'f38927db126ec7141ea2dd70cabb2ef378552672b31db4ab621493928497abd7'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
'75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
'c5a714823c3418692bc5c212dd5d094a0e2ae6147d6726822911f1c26e3a1d1b'
- 'bb8af32880059e681396a250d8e78f600f248da8ad4f0e76d7923badb5ee8b42'
'7c99aaeaea7837f83a3ad215cf07277934ccf39720acee7f1c371dc86bdf89fc'
'09189eb269a9fd16898cf90a477df23306236fb897791e8d04e5a75d5007bbff'
- 'c7951a3dfa6dcfd6f7c56d8d5c7c89cceb0e612ce3e6134d3fe23d1202b69863'
- 'b1485882a9d26fe49b9fb2530259c2c39e03a3346ff63edcbc746f47ef693676'
- '54380eafa1dfb42f7860a5eee9f521c14aa5fd2c9f5bfaa6e0537d75800225b7')
+ '4ffdc2a458845c2a7c03c735477dbf51b5b01b10568bf577b37a29e872135cab'
+ '12b281dc45f1954cc3f52276927bb2965c3132c0a8bd7f485869ced2c541d485')
_kernelname=${pkgbase#linux}
: ${_kernelname:=-ARCH}
@@ -61,9 +57,13 @@ prepare() {
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
# start of macbook specific patches
- patch -Np1 -i ../01-apple-gmux.patch
- patch -Np1 -i ../02-macbook-suspend.patch
- patch -Np1 -i ../03-apple-poweroff-quirk-workaround.patch
+ # https://patchwork.kernel.org/patch/9140867/
+ msg "patch -Np1 -i ../RFC-PCI-Workaround-to-enable-poweroff-on-Mac-Pro-11.patch"
+ patch -Np1 -i ../RFC-PCI-Workaround-to-enable-poweroff-on-Mac-Pro-11.patch
+
+ # https://patchwork.kernel.org/patch/9288825/
+ msg "patch -Np1 -i ../RFC-v2-PCI-Workaround-to-enable-poweroff-on-Mac-Pro-11.patch"
+ patch -Np1 -i ../RFC-v2-PCI-Workaround-to-enable-poweroff-on-Mac-Pro-11.patch
# disable USER_NS for non-root users by default
patch -Np1 -i ../0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
@@ -71,16 +71,15 @@ prepare() {
# https://bugs.archlinux.org/task/56711
patch -Np1 -i ../0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
- # https://bugs.archlinux.org/task/57500
- patch -Np1 -i ../0003-x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch
-
cat ../config - >.config <<END
CONFIG_LOCALVERSION="${_kernelname}"
CONFIG_LOCALVERSION_AUTO=n
END
- # set extraversion to pkgrel
- sed -i "/^EXTRAVERSION =/s/=.*/= -${pkgrel}/" Makefile
+ # set extraversion to pkgrel and empty localversion
+ sed -e "/^EXTRAVERSION =/s/=.*/= -${pkgrel}/" \
+ -e "/^EXTRAVERSION =/aLOCALVERSION =" \
+ -i Makefile
# don't run depmod on 'make install'. We'll do this ourselves in packaging
sed -i '2iexit 0' scripts/depmod.sh
@@ -103,7 +102,7 @@ END
build() {
cd ${_srcname}
- make ${MAKEFLAGS} LOCALVERSION= bzImage modules
+ make bzImage modules
}
_package() {
@@ -117,12 +116,12 @@ _package() {
cd ${_srcname}
# get kernel version
- _kernver="$(make LOCALVERSION= kernelrelease)"
+ _kernver="$(make kernelrelease)"
_basekernel=${_kernver%%-*}
_basekernel=${_basekernel%.*}
mkdir -p "${pkgdir}"/{boot,usr/lib/modules}
- make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}/usr" modules_install
+ make INSTALL_MOD_PATH="${pkgdir}/usr" modules_install
cp arch/x86/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}"
# make room for external modules
diff --git a/02-macbook-suspend.patch b/RFC-PCI-Workaround-to-enable-poweroff-on-Mac-Pro-11.patch
index 0794c3856be..0794c3856be 100644
--- a/02-macbook-suspend.patch
+++ b/RFC-PCI-Workaround-to-enable-poweroff-on-Mac-Pro-11.patch
diff --git a/03-apple-poweroff-quirk-workaround.patch b/RFC-v2-PCI-Workaround-to-enable-poweroff-on-Mac-Pro-11.patch
index c43bc4bc131..c43bc4bc131 100644
--- a/03-apple-poweroff-quirk-workaround.patch
+++ b/RFC-v2-PCI-Workaround-to-enable-poweroff-on-Mac-Pro-11.patch
diff --git a/config b/config
index e58bd222377..ea0d4f1aaa0 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.15.3-1 Kernel Configuration
+# Linux/x86 4.15.5-1 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -1040,7 +1040,6 @@ CONFIG_TCP_CONG_DCTCP=m
CONFIG_TCP_CONG_CDG=m
CONFIG_TCP_CONG_BBR=m
CONFIG_DEFAULT_CUBIC=y
-# CONFIG_DEFAULT_BBR is not set
# CONFIG_DEFAULT_RENO is not set
CONFIG_DEFAULT_TCP_CONG="cubic"
CONFIG_TCP_MD5SIG=y
@@ -5878,7 +5877,7 @@ CONFIG_FB=y
CONFIG_FIRMWARE_EDID=y
CONFIG_FB_CMDLINE=y
CONFIG_FB_NOTIFY=y
-CONFIG_FB_DDC=m
+# CONFIG_FB_DDC is not set
CONFIG_FB_BOOT_VESA_SUPPORT=y
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_COPYAREA=y
@@ -5906,30 +5905,21 @@ CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_ARC is not set
# CONFIG_FB_ASILIANT is not set
# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_UVESA=m
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_UVESA is not set
CONFIG_FB_VESA=y
CONFIG_FB_EFI=y
# CONFIG_FB_N411 is not set
# CONFIG_FB_HGA is not set
# CONFIG_FB_OPENCORES is not set
# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_NVIDIA_DEBUG is not set
-CONFIG_FB_NVIDIA_BACKLIGHT=y
-CONFIG_FB_RIVA=m
-CONFIG_FB_RIVA_I2C=y
-# CONFIG_FB_RIVA_DEBUG is not set
-CONFIG_FB_RIVA_BACKLIGHT=y
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
# CONFIG_FB_I740 is not set
# CONFIG_FB_LE80578 is not set
# CONFIG_FB_INTEL is not set
# CONFIG_FB_MATROX is not set
-CONFIG_FB_RADEON=m
-CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-# CONFIG_FB_RADEON_DEBUG is not set
+# CONFIG_FB_RADEON is not set
# CONFIG_FB_ATY128 is not set
# CONFIG_FB_ATY is not set
# CONFIG_FB_S3 is not set
@@ -6003,7 +5993,7 @@ CONFIG_BACKLIGHT_GPIO=m
CONFIG_BACKLIGHT_LV5207LP=m
CONFIG_BACKLIGHT_BD6107=m
CONFIG_BACKLIGHT_ARCXCNN=m
-CONFIG_VGASTATE=m
+# CONFIG_VGASTATE is not set
CONFIG_VIDEOMODE_HELPERS=y
CONFIG_HDMI=y