Merge branch 'master' into i486

7 files changed, 37 insertions, 16 deletions

diff --git a/extra/firefox/PKGBUILD b/extra/firefox/PKGBUILD
new file mode 100644
index 00000000..8eba80f3
--- /dev/null
+++ b/extra/firefox/PKGBUILD
@@ -0,0 +1,6 @@
+eval "$(
+  declare -f build | \
+    sed '
+      2 a export LDFLAGS+=" -Wl,--no-keep-memory"
+    '
+)"
diff --git a/extra/linux-pae/PKGBUILD b/extra/linux-pae/PKGBUILD
index a4ad284f..27d89ae1 100644
--- a/extra/linux-pae/PKGBUILD
+++ b/extra/linux-pae/PKGBUILD
@@ -4,9 +4,9 @@
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 
 pkgbase=linux-pae           # Build stock -ARCH kernel
-pkgver=4.18.5
+pkgver='4.18.6'
 _srcname=linux-${pkgver}
-pkgrel=1
+pkgrel='1'
 arch=('i686')
 url="https://www.kernel.org/"
 license=('GPL2')
@@ -24,9 +24,9 @@ validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
-sha256sums=('fb090a3680eddf6f10bf895bc3075bd3f830e3d2429ce469982db5a28df647bd'
+sha256sums=('05db97fd6891217af6d4203bdc442ef2af78d7902b6a8e9bd348682704c22894'
             'SKIP'
-            '3957b6865cff44be43d879db8131974c7a4933ae0a2462f491640a11964abd7c'
+            'af0060a53e75f3c6ca348a5ef8317a5908bb9d1d7ab2434ca9142d91309a0290'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
diff --git a/extra/linux-pae/config b/extra/linux-pae/config
index 621b184f..4fbfec7e 100644
--- a/extra/linux-pae/config
+++ b/extra/linux-pae/config
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.18.5-1 Kernel Configuration
+# Linux/x86 4.18.6-1 Kernel Configuration
 #
 
 #
-# Compiler: gcc (GCC) 8.2.0
+# Compiler: gcc (GCC) 8.2.1 20180831
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -43,7 +43,7 @@ CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_PGTABLE_LEVELS=3
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=80200
+CONFIG_GCC_VERSION=80201
 CONFIG_CLANG_VERSION=0
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
@@ -302,6 +302,7 @@ CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_RCU_TABLE_FREE=y
+CONFIG_HAVE_RCU_TABLE_INVALIDATE=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
diff --git a/extra/linux-zen/PKGBUILD b/extra/linux-zen/PKGBUILD
index 93b03bf7..933ce385 100644
--- a/extra/linux-zen/PKGBUILD
+++ b/extra/linux-zen/PKGBUILD
@@ -1,9 +1,9 @@
-# upstream git revision: cfe9d37d927bb78eb0f2992ef8f14df121138e60
+# upstream git revision: 2edc3f8d648d3f161a9593c0a41332dae246cdfd
 
 # fail if upstream's .config changes
 for ((i=0; i<${#sha256sums[@]}; i++)); do
-  if [ "${sha256sums[${i}]}" = '931789c60228540e2f727eee1bf59583446f2a5fc5a2495ca946e2bfc1b89099' ]; then
-    sha256sums[${i}]='010b73eb4ede60d16bc5f1471fa076f9d5639fa15d62073bf4ed075064b9c4a4'
+  if [ "${sha256sums[${i}]}" = 'fd5a7203579777ab2c0deb3bcdf94ded8a4422fefc81506b98c3bce8070b5a8f' ]; then
+    sha256sums[${i}]='ad2a55218708ad7af672c718013b9626b847719371bb1a38dfd7df374e87624a'
   fi
 done
 
@@ -13,4 +13,3 @@ eval "$(
       \,/tools/objtool" ,d
     '
 )"
-010b73eb4ede60d16bc5f1471fa076f9d5639fa15d62073bf4ed075064b9c4a4  ../work/tmp.zXfUnz/config
diff --git a/extra/linux-zen/config b/extra/linux-zen/config
index fd3bb957..b68c8746 100644
--- a/extra/linux-zen/config
+++ b/extra/linux-zen/config
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.18.3-zen1 Kernel Configuration
+# Linux/x86 4.18.6-zen1 Kernel Configuration
 #
 
 #
-# Compiler: gcc (GCC) 8.2.0
+# Compiler: gcc (GCC) 8.2.1 20180831
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -43,7 +43,7 @@ CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_PGTABLE_LEVELS=2
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=80200
+CONFIG_GCC_VERSION=80201
 CONFIG_CLANG_VERSION=0
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
@@ -53,7 +53,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 # General setup
 #
 CONFIG_ZEN_INTERACTIVE=y
-# CONFIG_SCHED_PDS is not set
+# CONFIG_SCHED_MUQSS is not set
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION="-zen"
@@ -306,6 +306,7 @@ CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_RCU_TABLE_FREE=y
+CONFIG_HAVE_RCU_TABLE_INVALIDATE=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
@@ -540,6 +541,8 @@ CONFIG_NR_CPUS=8
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_MC_PRIO=y
+CONFIG_RQ_NONE=y
+CONFIG_SHARERQ=0
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
@@ -7437,7 +7440,7 @@ CONFIG_RTC_DRV_RV3029_HWMON=y
 #
 # Platform RTC drivers
 #
-CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_CMOS=y
 CONFIG_RTC_DRV_DS1286=m
 CONFIG_RTC_DRV_DS1511=m
 CONFIG_RTC_DRV_DS1553=m
diff --git a/extra/thunderbird/PKGBUILD b/extra/thunderbird/PKGBUILD
new file mode 100644
index 00000000..8eba80f3
--- /dev/null
+++ b/extra/thunderbird/PKGBUILD
@@ -0,0 +1,6 @@
+eval "$(
+  declare -f build | \
+    sed '
+      2 a export LDFLAGS+=" -Wl,--no-keep-memory"
+    '
+)"
diff --git a/extra/vulkan-lunarg-tools/PKGBUILD b/extra/vulkan-lunarg-tools/PKGBUILD
new file mode 100644
index 00000000..8a87fa09
--- /dev/null
+++ b/extra/vulkan-lunarg-tools/PKGBUILD
@@ -0,0 +1,6 @@
+eval "$(
+  declare -f package_vulkan-trace | \
+    sed '
+      /_install / s/libVkLayer_vktrace_layer/\032/
+    '
+)"