upgpkg: linux-gc 5.4.2-1

upstream release

3 files changed, 22 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a9ab32eca229..840c0a3c0896 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,45 +1,44 @@
 pkgbase = linux-gc
 	pkgdesc = Linux
-	pkgver = 5.4.1
+	pkgver = 5.4.2
 	pkgrel = 1
 	url = https://cchalpha.blogspot.co.uk/
 	arch = x86_64
 	license = GPL2
-	makedepends = xmlto
-	makedepends = kmod
-	makedepends = inetutils
 	makedepends = bc
+	makedepends = kmod
 	makedepends = libelf
+	makedepends = xmlto
 	makedepends = python-sphinx
 	makedepends = python-sphinx_rtd_theme
 	makedepends = graphviz
 	makedepends = imagemagick
 	makedepends = git
 	options = !strip
-	source = linux-v5.4-arch1.tar.gz::https://git.archlinux.org/linux.git/snapshot/linux-v5.4-arch1.tar.gz
+	source = linux-v5.4.2-arch1.tar.gz::https://git.archlinux.org/linux.git/snapshot/linux-v5.4.2-arch1.tar.gz
 	source = config
 	source = 0001_bmq_v5.4-r0.patch::https://gitlab.com/alfredchen/bmq/raw/master/5.4/bmq_v5.4-r0.patch
 	source = 0002_enable_additional_cpu_optimizations-20190822.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20190822.tar.gz
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	validpgpkeys = 8218F88849AAC522E94CF470A5E9288C4FA415FA
-	sha256sums = 4a536b063cd2bb205d192534edc685f1e2fe1856f37a6691d8062e7255176c48
-	sha256sums = 3acc13b209c53573cc590f171fbb9328b202978e59027ebbd204940b149191db
+	sha256sums = d2ddb19955f6367b08fc3d26b466420c391ac77cddeb37dbeafebcb41bafcd06
+	sha256sums = ccc2959135ccc7a335649e6453a71b842cef56bd02d082cd420de23b79073b1d
 	sha256sums = d3405db8ab0557a8d4ca28c15052413abefe0ae267016c3708dfaed2dae8a858
 	sha256sums = 8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5
 
 pkgname = linux-gc
-	pkgdesc = The Linux kernel and modules with the PDS-mq CPU scheduler
+	pkgdesc = The Linux kernel and modules with the BMQ CPU scheduler
 	depends = coreutils
 	depends = kmod
 	depends = initramfs
 	optdepends = crda: to set the correct wireless channels of your country
 	optdepends = linux-firmware: firmware images needed for some devices
-	provides = linux-gc=5.4.1
+	provides = linux-gc=5.4.2
 
 pkgname = linux-gc-headers
 	pkgdesc = Headers and scripts for building modules for the Linux kernel
 	depends = linux-gc
-	provides = linux-gc-headers=5.4.1
-	provides = linux-headers=5.4.1
+	provides = linux-gc-headers=5.4.2
+	provides = linux-headers=5.4.2
 
diff --git a/PKGBUILD b/PKGBUILD
index 15d380722e38..7ac139c2c24d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,16 +20,16 @@ _localmodcfg=
 ### IMPORTANT: Do no edit below this line unless you know what you're doing
 
 pkgbase=linux-gc
-pkgver=5.4.1
+pkgver=5.4.2
 pkgrel=1
 pkgdesc='Linux'
-_srctag=v${pkgver%.*}-arch${pkgver##*.}
+_srctag=v${pkgver}-arch${pkgrel}
 url="https://cchalpha.blogspot.co.uk/"
 arch=(x86_64)
 license=(GPL2)
 makedepends=(
-  xmlto kmod inetutils bc libelf
-  python-sphinx python-sphinx_rtd_theme graphviz imagemagick
+  bc kmod libelf
+  xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick
   git
 )
 options=('!strip')
@@ -48,8 +48,8 @@ validpgpkeys=(
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
   '8218F88849AAC522E94CF470A5E9288C4FA415FA'  # Jan Alexander Steffens (heftig)
 )
-sha256sums=('4a536b063cd2bb205d192534edc685f1e2fe1856f37a6691d8062e7255176c48'
-            '3acc13b209c53573cc590f171fbb9328b202978e59027ebbd204940b149191db'
+sha256sums=('d2ddb19955f6367b08fc3d26b466420c391ac77cddeb37dbeafebcb41bafcd06'
+            'ccc2959135ccc7a335649e6453a71b842cef56bd02d082cd420de23b79073b1d'
             'd3405db8ab0557a8d4ca28c15052413abefe0ae267016c3708dfaed2dae8a858'
             '8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5')
 
@@ -115,7 +115,7 @@ build() {
 }
 
 _package() {
-  pkgdesc="The $pkgdesc kernel and modules with the PDS-mq CPU scheduler"
+  pkgdesc="The $pkgdesc kernel and modules with the BMQ CPU scheduler"
   depends=(coreutils kmod initramfs)
   optdepends=('crda: to set the correct wireless channels of your country'
               'linux-firmware: firmware images needed for some devices')
diff --git a/config b/config
index 65c0d06dcec4..1c834a239938 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.0-arch1 Kernel Configuration
+# Linux/x86 5.4.1-arch1 Kernel Configuration
 #
 
 #
@@ -4148,7 +4148,7 @@ CONFIG_RMI4_F11=y
 CONFIG_RMI4_F12=y
 CONFIG_RMI4_F30=y
 CONFIG_RMI4_F34=y
-CONFIG_RMI4_F54=y
+# CONFIG_RMI4_F54 is not set
 CONFIG_RMI4_F55=y
 
 #
@@ -6761,7 +6761,7 @@ CONFIG_SND_YMFPCI=m
 #
 CONFIG_SND_HDA=m
 CONFIG_SND_HDA_INTEL=m
-# CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
+CONFIG_SND_HDA_INTEL_DETECT_DMIC=y
 CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDA_INPUT_BEEP=y
@@ -6932,10 +6932,8 @@ CONFIG_SND_SOC_SOF_INTEL_PCI=m
 CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m
 CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m
 CONFIG_SND_SOC_SOF_INTEL_COMMON=m
-CONFIG_SND_SOC_SOF_BAYTRAIL_SUPPORT=y
-CONFIG_SND_SOC_SOF_BAYTRAIL=m
-CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT=y
-CONFIG_SND_SOC_SOF_BROADWELL=m
+# CONFIG_SND_SOC_SOF_BAYTRAIL_SUPPORT is not set
+# CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT is not set
 CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y
 CONFIG_SND_SOC_SOF_MERRIFIELD=m
 CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y