summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO28
-rw-r--r--0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch (renamed from 0002-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch)4
-rw-r--r--0002-Bluetooth-hidp-Fix-assumptions-on-the-return-value-o.patch (renamed from 0006-Bluetooth-hidp-Fix-assumptions-on-the-return-value-o.patch)4
-rw-r--r--PKGBUILD26
-rw-r--r--config2
5 files changed, 34 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fb59612badb0..eccf5f4addc0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-rc
- pkgver = 5.3.3rc1
- pkgrel = 2
+ pkgver = 5.3.5rc1
+ pkgrel = 1
url = https://www.kernel.org/
arch = x86_64
license = GPL2
@@ -9,35 +9,35 @@ pkgbase = linux-rc
makedepends = bc
makedepends = libelf
options = !strip
- source = patch-5.3.3-rc1.patch::https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/patch/?id=linux-5.3.y&id2=v5.3.2
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.3.2.tar.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.3.2.tar.sign
+ source = patch-5.3.5-rc1.patch::https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/patch/?id=linux-5.3.y&id2=v5.3.4
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.3.4.tar.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.3.4.tar.sign
source = config
source = 60-linux.hook
source = 90-linux.hook
source = linux.preset
- source = 0002-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
- source = 0006-Bluetooth-hidp-Fix-assumptions-on-the-return-value-o.patch
+ source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+ source = 0002-Bluetooth-hidp-Fix-assumptions-on-the-return-value-o.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
- sha256sums = 33dcfeec3d0bc076850e8ec6fecf2eda155d4573008405003a815ef18e9cdb7f
- sha256sums = 361f9c953bb5ca7dbc922c3f698170523667f6a2f43961ffb88fa47b6b10fc6b
+ sha256sums = 1b11c86d3e6024688b2c8191954b3a263c54ce15b79f008d7192a6ce178cc3c0
+ sha256sums = 19541dbb3e0e6ca3acb4e7d6bb95a0af44a9607d2cb3e50c2d3f8894d95b246e
sha256sums = SKIP
- sha256sums = 89c1d6cf6c935ccda0d43236eb716a313f7989a9251bd61796ca12286a08ca5b
+ sha256sums = 7d09d1d79a4ecb82502b4483cf989ede3f643e05613de45e12563dfe85d80423
sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
sha256sums = c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636
sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
- sha256sums = 57146472c25c492d723e9f74d13c3e5ea01080156890c463be50d0f9d07496cc
- sha256sums = c03f15d61b4de37665ee972793cac2f9090546a3d52c375d6a434604a76b0fb6
+ sha256sums = 1594f81f1b1ed4f3d474aaa2ebfc03623fc0168d0243d1654c250fb7b32ad5d7
+ sha256sums = d81560f2dd07755d5d51dc1d0d2ee5d4a107c12a13f5d0a021411385813ae7dd
pkgname = linux-rc
pkgdesc = The release candidate kernel and modules
install = linux.install
depends = coreutils
- depends = linux-firmware
depends = kmod
- depends = mkinitcpio
+ depends = initramfs
optdepends = crda: to set the correct wireless channels of your country
+ optdepends = linux-firmware: firmware images needed for some devices
backup = etc/mkinitcpio.d/linux-rc.preset
pkgname = linux-rc-headers
diff --git a/0002-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
index acba8fd45cd1..bd766ec3e37e 100644
--- a/0002-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+++ b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
@@ -1,7 +1,7 @@
-From 457138ff88d815cadfe3682cb2e4c4b5cb6d5db3 Mon Sep 17 00:00:00 2001
+From d49f0463279f51b543a2b93c43c3cb1c85532116 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Mon, 16 Sep 2019 04:53:20 +0200
-Subject: [PATCH 2/7] ZEN: Add sysctl and CONFIG to disallow unprivileged
+Subject: [PATCH 1/3] ZEN: Add sysctl and CONFIG to disallow unprivileged
CLONE_NEWUSER
Our default behavior continues to match the vanilla kernel.
diff --git a/0006-Bluetooth-hidp-Fix-assumptions-on-the-return-value-o.patch b/0002-Bluetooth-hidp-Fix-assumptions-on-the-return-value-o.patch
index 80b14314e647..4c4d84d7e2d5 100644
--- a/0006-Bluetooth-hidp-Fix-assumptions-on-the-return-value-o.patch
+++ b/0002-Bluetooth-hidp-Fix-assumptions-on-the-return-value-o.patch
@@ -1,7 +1,7 @@
-From 231fa7e96a122c8a11078b48fbe9db3334db9fe4 Mon Sep 17 00:00:00 2001
+From b33eb7f826287b0952624123ef88c4b7aa27d0da Mon Sep 17 00:00:00 2001
From: Dan Elkouby <streetwalkermc@gmail.com>
Date: Fri, 6 Sep 2019 14:06:44 +0300
-Subject: [PATCH 6/7] Bluetooth: hidp: Fix assumptions on the return value of
+Subject: [PATCH 2/3] Bluetooth: hidp: Fix assumptions on the return value of
hidp_send_message
hidp_send_message was changed to return non-zero values on success,
diff --git a/PKGBUILD b/PKGBUILD
index af4904220666..069f91a83dea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,10 +3,10 @@
# Contributor: Thomas Baechler <thomas@archlinux.org>
pkgbase=linux-rc
-pkgrel=2
+pkgrel=1
_srcname=linux-5.3
_major=5.3
-_minor=2
+_minor=4
_minorc=$((_minor+1))
_rcver=1
_rcpatch=patch-${_major}.${_minorc}-rc${_rcver}
@@ -24,22 +24,22 @@ source=(
60-linux.hook # pacman hook for depmod
90-linux.hook # pacman hook for initramfs regeneration
linux.preset # standard config files for mkinitcpio ramdisk
- 0002-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
- 0006-Bluetooth-hidp-Fix-assumptions-on-the-return-value-o.patch
+ 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+ 0002-Bluetooth-hidp-Fix-assumptions-on-the-return-value-o.patch
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
-sha256sums=('33dcfeec3d0bc076850e8ec6fecf2eda155d4573008405003a815ef18e9cdb7f'
- '361f9c953bb5ca7dbc922c3f698170523667f6a2f43961ffb88fa47b6b10fc6b'
+sha256sums=('1b11c86d3e6024688b2c8191954b3a263c54ce15b79f008d7192a6ce178cc3c0'
+ '19541dbb3e0e6ca3acb4e7d6bb95a0af44a9607d2cb3e50c2d3f8894d95b246e'
'SKIP'
- '89c1d6cf6c935ccda0d43236eb716a313f7989a9251bd61796ca12286a08ca5b'
+ '7d09d1d79a4ecb82502b4483cf989ede3f643e05613de45e12563dfe85d80423'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
'c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636'
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
- '57146472c25c492d723e9f74d13c3e5ea01080156890c463be50d0f9d07496cc'
- 'c03f15d61b4de37665ee972793cac2f9090546a3d52c375d6a434604a76b0fb6')
+ '1594f81f1b1ed4f3d474aaa2ebfc03623fc0168d0243d1654c250fb7b32ad5d7'
+ 'd81560f2dd07755d5d51dc1d0d2ee5d4a107c12a13f5d0a021411385813ae7dd')
_kernelname=${pkgbase#linux}
@@ -85,8 +85,9 @@ build() {
_package() {
pkgdesc="The release candidate kernel and modules"
[[ $pkgbase = linux ]] && groups=(base)
- depends=(coreutils linux-firmware kmod mkinitcpio)
- optdepends=('crda: to set the correct wireless channels of your country')
+ depends=(coreutils kmod initramfs)
+ optdepends=('crda: to set the correct wireless channels of your country'
+ 'linux-firmware: firmware images needed for some devices')
backup=("etc/mkinitcpio.d/$pkgbase.preset")
install=linux.install
@@ -101,6 +102,9 @@ _package() {
install -Dm644 "$(make -s image_name)" "$modulesdir/vmlinuz"
install -Dm644 "$modulesdir/vmlinuz" "$pkgdir/boot/vmlinuz-$pkgbase"
+ # Used by mkinitcpio to name the kernel
+ echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"
+
msg2 "Installing modules..."
make INSTALL_MOD_PATH="$pkgdir/usr" modules_install
diff --git a/config b/config
index f97f588179c6..d5f72bad09e7 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.3.3-arch1 Kernel Configuration
+# Linux/x86 5.3.2-arch2 Kernel Configuration
#
#