1 files changed, 17 insertions, 17 deletions

diff --git a/PKGBUILD b/PKGBUILD
index e2f738e5c18e..c07e94a6956b 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 # Set these variables to ANYTHING that is not null to enable them
 
 # Tweak kernel options prior to a build via nconfig
-_makenconfig=y
+_makenconfig=
 
 # Optionally select a sub architecture by number if building in a clean chroot
 # Leaving this entry blank will require user interaction during the build
@@ -59,19 +59,19 @@ _subarch=
 _localmodcfg=
 
 pkgbase=linux-bcachefs-git
-_srcver_tag=5.1.8-arch1
-pkgver="${_srcver_tag//-/.}"
+_srcver_tag=5.0.21
+pkgver="${_srcver_tag}.arch1"
 pkgrel=1
 arch=(x86_64)
 url="https://github.com/koverstreet/bcachefs"
 license=(GPL2)
 makedepends=(
-    xmlto
-    kmod
-    inetutils
     bc
-    libelf
     git
+    inetutils
+    kmod
+    libelf
+    xmlto
 )
 options=('!strip')
 
@@ -98,7 +98,7 @@ validpgpkeys=(
 )
 sha512sums=('SKIP'
             'SKIP'
-            '990204715ed5979ecfea6693255a4dbb7bf40b87321dd9a68b6ba171f1feff0bcc9740a72e5c88641727a774a9e0eb1ae9d7d6d4bb9bf65bc8fd60c550768d4c'
+            '5ad7d43b56255c6130deb130bd327f273575f085c81effb9f433d09f13ba90ac6d2cee9d1c7c55fe7a78980bf393fcd06cb4f71b6057ed298e46ffd2b33bcdb5'
             '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a'
             '2718b58dbbb15063bacb2bde6489e5b3c59afac4c0e0435b97fe720d42c711b6bcba926f67a8687878bd51373c9cf3adb1915a11666d79ccb220bf36e0788ab7'
             '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf')
@@ -114,16 +114,16 @@ prepare() {
     echo "-$pkgrel" > localversion.10-pkgrel
     echo "$_kernelname" > localversion.20-pkgname
 
-    # msg2 "Adding patches from Linux upstream kernel repository..."
-    # git remote add upstream_stable https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git || true
-    # git pull --no-edit upstream_stable v${_srcver_tag}
+    msg2 "Adding patches from Linux upstream kernel repository..."
+    git remote add upstream_stable https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git || true
+    git pull --no-edit upstream_stable v${_srcver_tag}
 
     msg2 "Adding patches from Arch Linux kernel repository..."
     git remote add arch_stable https://git.archlinux.org/linux.git || true
-    git pull --no-edit arch_stable "v${_srcver_tag}"
-    # git fetch arch_stable "v5.1.???-arch1"
-    # git cherry-pick ???
-    # sed -i -e "s/^EXTRAVERSION =.*/EXTRAVERSION = -arch1/" Makefile
+    # git pull --no-edit arch_stable "v${_srcver_tag}-arch1"
+    git fetch arch_stable "v5.0.13-arch1"
+    git cherry-pick 1ce49fc24c97401dda96f916e0aec1be26e480a8
+    sed -i -e "s/^EXTRAVERSION =.*/EXTRAVERSION = -arch1/" Makefile
 
     # https://github.com/graysky2/kernel_gcc_patch
     msg2 "Patching to enabled additional gcc CPU optimizatons..."
@@ -172,11 +172,11 @@ build() {
 _package() {
     pkgdesc="The ${pkgbase/linux/Linux} kernel and modules ${_pkgdesc_extra}"
     depends=(
+        bcachefs-tools-git
         coreutils
-        linux-firmware
         kmod
+        linux-firmware
         mkinitcpio
-        bcachefs-tools-git
     )
     optdepends=('crda: to set the correct wireless channels of your country')
     backup=("etc/mkinitcpio.d/$pkgbase.preset")