summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Schoenick2019-12-13 14:27:31 -0800
committerJohn Schoenick2019-12-13 14:27:31 -0800
commit10cd19d1e72ade442c61cb79bcbdbbf4e213c9a4 (patch)
treeed0e4ec156e3148f4ada953c5a746ae365300855
parent372897010d55933ebafa5adf5ae17890b37bc8e6 (diff)
parent035355f3ee087c2c8cca54c95a0fed4315125a52 (diff)
downloadaur-10cd19d1e72ade442c61cb79bcbdbbf4e213c9a4.tar.gz
Merge branch 'upstream' for 5.4.2
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD2
2 files changed, 4 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 174dc168852..655d5d93d96 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = linux-fsync
pkgdesc = Linux
- pkgver = 5.4.1.arch1
+ pkgver = 5.4.2.arch1
pkgrel = 1
- url = https://git.archlinux.org/linux.git/log/?h=v5.4.1-arch1
+ url = https://git.archlinux.org/linux.git/log/?h=v5.4.2-arch1
arch = x86_64
license = GPL2
makedepends = bc
@@ -15,7 +15,7 @@ pkgbase = linux-fsync
makedepends = imagemagick
makedepends = git
options = !strip
- source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.4.1-arch1
+ source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.4.2-arch1
source = config
source = futex-wait-multiple-5.2.1.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
diff --git a/PKGBUILD b/PKGBUILD
index 36a4fa45b11..b25f01e07f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgbase=linux-fsync
-pkgver=5.4.1.arch1
+pkgver=5.4.2.arch1
pkgrel=1
pkgdesc='Linux'
_srctag=v${pkgver%.*}-${pkgver##*.}