bump to 6.1.22

2 files changed, 24 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eec6d58b9db9..9a33fb3ed515 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,13 @@
 pkgbase = linux-aarch64-flippy-bin
-	pkgver = 6.1.18
+	pkgver = 6.1.22
 	pkgrel = 1
 	url = https://github.com/ophub/kernel
 	arch = aarch64
 	license = GPL2
-	noextract = boot-6.1.18-flippy-82+.tar.gz
-	noextract = dtb-allwinner-6.1.18-flippy-82+.tar.gz
-	noextract = dtb-amlogic-6.1.18-flippy-82+.tar.gz
-	noextract = dtb-rockchip-6.1.18-flippy-82+.tar.gz
-	noextract = header-6.1.18-flippy-82+.tar.gz
-	noextract = modules-6.1.18-flippy-82+.tar.gz
+	noextract = 6.1.22.tar.gz
 	options = !strip
-	source = https://github.com/ophub/kernel/raw/main/pub/stable/6.1.18/boot-6.1.18-flippy-82+.tar.gz
-	source = https://github.com/ophub/kernel/raw/main/pub/stable/6.1.18/dtb-allwinner-6.1.18-flippy-82+.tar.gz
-	source = https://github.com/ophub/kernel/raw/main/pub/stable/6.1.18/dtb-amlogic-6.1.18-flippy-82+.tar.gz
-	source = https://github.com/ophub/kernel/raw/main/pub/stable/6.1.18/dtb-rockchip-6.1.18-flippy-82+.tar.gz
-	source = https://github.com/ophub/kernel/raw/main/pub/stable/6.1.18/header-6.1.18-flippy-82+.tar.gz
-	source = https://github.com/ophub/kernel/raw/main/pub/stable/6.1.18/modules-6.1.18-flippy-82+.tar.gz
-	sha256sums = 2e8ffb50302295f2951d1b64eae193872c0a4db0e60675b31c03795e9d03c187
-	sha256sums = f28e12c38b78af423b73d3aec4524fce831ac5a57b2ea032b9b92e9a55b16f99
-	sha256sums = 7fe4b3fe880ee5d48e68a281da118493276ae07e8c4956bf7941bdaa158794e3
-	sha256sums = 6032bbe10cad9ec75a496c8d4593b9784e549622aa4ee7e857ac40653915efc4
-	sha256sums = cb8cf1d488967e0c564f854acef391d348eff5b99313fbc1d9f6316483dc53b9
-	sha256sums = c9b1aa23c0635288d9be7a6be992b40bb20e98c26053e3738359766534d4eb69
+	source = https://github.com/ophub/kernel/releases/download/kernel_stable/6.1.22.tar.gz
+	sha256sums = 5e91a9977449fe8ecab420fd52b8474971b20e96d48ebff47dfcb0c30526d246
 
 pkgname = linux-aarch64-flippy-bin
 	pkgdesc = The Linux Kernel and module - flippy's AArch64-focused fork aiming to increase usability. Prebuilt by ophub.
@@ -36,29 +21,29 @@ pkgname = linux-aarch64-flippy-bin
 	optdepends = linux-aarch64-flippy-dtb-allwinner: dtbs for Allwinner SoCs
 	optdepends = linux-aarch64-flippy-dtb-amlogic: dtbs for Amlogic SoCs
 	optdepends = linux-aarch64-flippy-dtb-rockchip: dtbs for Rockchip SoCs
-	provides = linux-aarch64-flippy=6.1.18
+	provides = linux-aarch64-flippy=6.1.22
 	conflicts = linux-aarch64-flippy
 	backup = etc/mkinitcpio.d/linux-aarch64-flippy.preset
 
 pkgname = linux-aarch64-flippy-bin-headers
 	pkgdesc = Header files and scripts for building modules for linux kernel - flippy's AArch64-focused fork aiming to increase usability. Prebuilt by ophub.
-	provides = linux-aarch64-flippy-headers=6.1.18
+	provides = linux-aarch64-flippy-headers=6.1.22
 	conflicts = linux-aarch64-flippy-headers
 
 pkgname = linux-aarch64-flippy-bin-dtb-allwinner
 	pkgdesc = DTB files for Allwinner SoCs for flippy's AArch64 kernel
-	provides = linux-aarch64-flippy-dtb=6.1.18
-	provides = linux-aarch64-flippy-dtb-allwinner=6.1.18
+	provides = linux-aarch64-flippy-dtb=6.1.22
+	provides = linux-aarch64-flippy-dtb-allwinner=6.1.22
 	conflicts = linux-aarch64-flippy-dtb-allwinner
 
 pkgname = linux-aarch64-flippy-bin-dtb-amlogic
 	pkgdesc = DTB files for Amlogic SoCs for flippy's AArch64 kernel
-	provides = linux-aarch64-flippy-dtb=6.1.18
-	provides = linux-aarch64-flippy-dtb-amlogic=6.1.18
+	provides = linux-aarch64-flippy-dtb=6.1.22
+	provides = linux-aarch64-flippy-dtb-amlogic=6.1.22
 	conflicts = linux-aarch64-flippy-dtb-amlogic
 
 pkgname = linux-aarch64-flippy-bin-dtb-rockchip
 	pkgdesc = DTB files for Rockchip SoCs for flippy's AArch64 kernel
-	provides = linux-aarch64-flippy-dtb=6.1.18
-	provides = linux-aarch64-flippy-dtb-rockchip=6.1.18
+	provides = linux-aarch64-flippy-dtb=6.1.22
+	provides = linux-aarch64-flippy-dtb-rockchip=6.1.22
 	conflicts = linux-aarch64-flippy-dtb-rockchip
diff --git a/PKGBUILD b/PKGBUILD
index a3c9a4b29b36..3fbb8c2073f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,10 @@
 # Maintainer: 7Ji <pugokughin@gmail.com>
 
 _desc="flippy's AArch64-focused fork aiming to increase usability. Prebuilt by ophub."
-_pkgver_main=6.1.18
-_pkgver_suffix=flippy-82+
+_pkgver_main=6.1.22
+_pkgver_suffix=ophub
 _pkgver_uname="${_pkgver_main}-${_pkgver_suffix}"
 _url_repo="https://github.com/ophub/kernel"
-_url_raw="${_url_repo}/raw/main/pub/stable/${_pkgver_main}"
 _pkgbase=linux-aarch64-flippy
 
 pkgbase="${_pkgbase}-bin"
@@ -22,26 +21,23 @@ arch=('aarch64')
 url="${_url_repo}"
 license=('GPL2')
 options=(!strip)
+_srcname="${_pkgver_main}.tar.gz"
 source=(
-  "${_url_raw}/boot-${_pkgver_uname}.tar.gz"
-  "${_url_raw}/dtb-allwinner-${_pkgver_uname}.tar.gz"
-  "${_url_raw}/dtb-amlogic-${_pkgver_uname}.tar.gz"
-  "${_url_raw}/dtb-rockchip-${_pkgver_uname}.tar.gz"
-  "${_url_raw}/header-${_pkgver_uname}.tar.gz"
-  "${_url_raw}/modules-${_pkgver_uname}.tar.gz"
+  "${_url_repo}/releases/download/kernel_stable/${_srcname}"
+)
+noextract=(
+  "${_srcname}"
 )
-noextract=("${source[@]##*/}")
 sha256sums=(
-  '2e8ffb50302295f2951d1b64eae193872c0a4db0e60675b31c03795e9d03c187'
-  'f28e12c38b78af423b73d3aec4524fce831ac5a57b2ea032b9b92e9a55b16f99'
-  '7fe4b3fe880ee5d48e68a281da118493276ae07e8c4956bf7941bdaa158794e3'
-  '6032bbe10cad9ec75a496c8d4593b9784e549622aa4ee7e857ac40653915efc4'
-  'cb8cf1d488967e0c564f854acef391d348eff5b99313fbc1d9f6316483dc53b9'
-  'c9b1aa23c0635288d9be7a6be992b40bb20e98c26053e3738359766534d4eb69'
+  '5e91a9977449fe8ecab420fd52b8474971b20e96d48ebff47dfcb0c30526d246'
 )
 
 _dtb_common_pkg="${_pkgbase}-dtb"
 
+prepare() {
+  tar -C "${srcdir}" -xvf "${srcdir}/${_srcname}" --strip-components=1
+}
+
 package_linux-aarch64-flippy-bin() {
   pkgdesc="The Linux Kernel and module - ${_desc}"
   depends=(