6.2.8-xanmod1

2 files changed, 25 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 205a058301ea..de95004e1fc5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,21 @@
 pkgbase = linux-xanmod-linux-bin-x64v1
 	pkgdesc = The Linux kernel and modules with Xanmod patches - Current Stable (MAIN) - Prebuilt version - x64v1
-	pkgver = 6.2.7
+	pkgver = 6.2.8
 	pkgrel = 1
 	url = http://www.xanmod.org/
 	arch = x86_64
 	license = GPL2
 	makedepends = jq
 	makedepends = curl
-	noextract = https://github.com/xanmod/linux/releases/download/6.2.7-xanmod1/linux-image-6.2.7-x64v1-xanmod1_6.2.7-x64v1-xanmod1-0.20230317.a4b8292_amd64.deb
-	noextract = https://github.com/xanmod/linux/releases/download/6.2.7-xanmod1/linux-headers-6.2.7-x64v1-xanmod1_6.2.7-x64v1-xanmod1-0.20230317.a4b8292_amd64.deb
+	noextract = https://github.com/xanmod/linux/releases/download/6.2.8-xanmod1/linux-image-6.2.8-x64v1-xanmod1_6.2.8-x64v1-xanmod1-0.20230322.6ba5bb2_amd64.deb
+	noextract = https://github.com/xanmod/linux/releases/download/6.2.8-xanmod1/linux-headers-6.2.8-x64v1-xanmod1_6.2.8-x64v1-xanmod1-0.20230322.6ba5bb2_amd64.deb
 	options = !strip
-	source = https://github.com/xanmod/linux/releases/download/6.2.7-xanmod1/linux-image-6.2.7-x64v1-xanmod1_6.2.7-x64v1-xanmod1-0.20230317.a4b8292_amd64.deb
-	source = https://github.com/xanmod/linux/releases/download/6.2.7-xanmod1/linux-headers-6.2.7-x64v1-xanmod1_6.2.7-x64v1-xanmod1-0.20230317.a4b8292_amd64.deb
+	source = https://github.com/xanmod/linux/releases/download/6.2.8-xanmod1/linux-image-6.2.8-x64v1-xanmod1_6.2.8-x64v1-xanmod1-0.20230322.6ba5bb2_amd64.deb
+	source = https://github.com/xanmod/linux/releases/download/6.2.8-xanmod1/linux-headers-6.2.8-x64v1-xanmod1_6.2.8-x64v1-xanmod1-0.20230322.6ba5bb2_amd64.deb
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
-	sha256sums = ca060727461cdfa12f2310d1b9ee1bed62977470246e12a13ed2b1afedb6307d
-	sha256sums = e05cea8619fff714d48d79c2ebde7ce8addf1bae3d0e640bc6443003b11371f2
+	sha256sums = cdc4880a9832149edfcfac8216f1e7da60ebe160d0036286ecca345b2e7b1a3f
+	sha256sums = 328515b2b1c66f5cd1833286c785ca247bcb478be0a0242825ead2274b6fabfa
 
 pkgname = linux-xanmod-linux-bin-x64v1
 
diff --git a/PKGBUILD b/PKGBUILD
index 14454c91cc22..210f27235197 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,10 +4,11 @@
 # Contributor: SoftExpert <softexpert at gmail dot com>
 
 _arch=x64v1
-pkgbase=linux-xanmod-linux-bin-${_arch}
 _pkgbase=linux-xanmod
+pkgbase=${_pkgbase}-linux-bin-${_arch}
 _major=6.2
-pkgver=${_major}.7
+pkgver=${_major}.8
+_branch=6.x
 xanmod=1
 pkgrel=${xanmod}
 pkgdesc="The Linux kernel and modules with Xanmod patches - Current Stable (MAIN) - Prebuilt version - ${_arch}"
@@ -18,8 +19,8 @@ options=('!strip')
 makedepends=('jq' 'curl')
 
 # Resolve URL of sources from GiHub provider
-_url_image=$(curl -L -s https://api.github.com/repos/xanmod/linux/releases/tags/${pkgver}-xanmod${xanmod} | jq --arg PKGVER "${pkgver}" --arg XANMOD "${xanmod}" --arg ARCH "${_arch}" -r '.assets[] | select(.name | contains("linux-image-" + $PKGVER + "-" + $ARCH + "-xanmod" + $XANMOD)).browser_download_url')
-_url_headers=$(curl -L -s https://api.github.com/repos/xanmod/linux/releases/tags/${pkgver}-xanmod${xanmod} | jq --arg PKGVER "${pkgver}" --arg XANMOD "${xanmod}" --arg ARCH "${_arch}" -r '.assets[] | select(.name | contains("linux-headers-" + $PKGVER + "-" + $ARCH + "-xanmod" + $XANMOD)).browser_download_url')
+_url_image=$(curl -L -s https://api.github.com/repos/xanmod/linux/releases/tags/${pkgver}-xanmod${xanmod} | jq --arg PKGVER "${pkgver}" --arg XANMOD "${xanmod}" --arg ARCH "${_arch}" -r '.assets[] | select(.name | startswith("linux-image-" + $PKGVER + "-" + $ARCH + "-xanmod" + $XANMOD) and endswith(".deb")).browser_download_url')
+_url_headers=$(curl -L -s https://api.github.com/repos/xanmod/linux/releases/tags/${pkgver}-xanmod${xanmod} | jq --arg PKGVER "${pkgver}" --arg XANMOD "${xanmod}" --arg ARCH "${_arch}" -r '.assets[] | select(.name | startswith("linux-headers-" + $PKGVER + "-" + $ARCH + "-xanmod" + $XANMOD) and endswith(".deb")).browser_download_url')
 source=("${_url_image}" "${_url_headers}")
 noextract=("${_url_image}" "${_url_headers}")
 # Save files we will extract later manually
@@ -34,25 +35,12 @@ prepare() {
   rm -f data.tar.xz
 }
 
-# Resolve URL of sources from Sourceforge provider
-#_image_files=($(curl -sL https://sourceforge.net/projects/xanmod/files/releases/main/${pkgver}-${_arch}-xanmod${xanmod}/ | grep net.sf.files | cut -d'=' -f2- | jq '.[].name' 2>/dev/null | grep "\.deb" | grep -v linux-libc-dev | cut -d'"' -f2))
-#source=("${_image_files[0]}::https://sourceforge.net/projects/xanmod/files/releases/main/${pkgver}-${_arch}-xanmod${xanmod}/${_image_files[0]}/download"
-#        "${_image_files[1]}::https://sourceforge.net/projects/xanmod/files/releases/main/${pkgver}-${_arch}-xanmod${xanmod}/${_image_files[1]}/download")
-#noextract=("${_image_files[0]}" "${_image_files[1]}")
-#prepare() {
-#  for _f in ${_image_files[@]} ; do
-#    bsdtar -xf ${_f} data.tar.xz
-#    bsdtar -xf data.tar.xz
-#    rm -f data.tar.xz
-#  done
-#}
-
 validpgpkeys=(
     'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linux Torvalds
     '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
 )
-sha256sums=('ca060727461cdfa12f2310d1b9ee1bed62977470246e12a13ed2b1afedb6307d'
-            'e05cea8619fff714d48d79c2ebde7ce8addf1bae3d0e640bc6443003b11371f2')
+sha256sums=('cdc4880a9832149edfcfac8216f1e7da60ebe160d0036286ecca345b2e7b1a3f'
+            '328515b2b1c66f5cd1833286c785ca247bcb478be0a0242825ead2274b6fabfa')
 
 _package() {
   pkgdesc="The Linux kernel and modules with Xanmod patches - Current Stable (MAIN) - Prebuilt version - ${_arch}"
@@ -64,35 +52,35 @@ _package() {
             KSMBD-MODULE
             NTFS3-MODULE)
 
-  local kernver="${pkgver}-${_arch}-xanmod${xanmod}"
-  local modulesdir="${pkgdir}/usr/lib/modules/${kernver}"
-  mkdir -p "${modulesdir}" "${pkgdir}/usr/share/doc"
+  local kernver="$pkgver-$_arch-xanmod$xanmod"
+  local modulesdir="$pkgdir/usr/lib/modules/$kernver"
+  mkdir -p "$modulesdir" "$pkgdir/usr/share/doc"
 
   msg2 "Installing modules..."
-  cp -r lib/modules/${kernver}/* "${modulesdir}/"
+  cp -r lib/modules/$kernver/* "$modulesdir/"
 
   # Docs
-  cp -r usr/share/doc/linux-image-* "${pkgdir}/usr/share/doc/"
+  cp -r usr/share/doc/linux-image-* "$pkgdir/usr/share/doc/"
 
   msg2 "Installing boot image..."
   # systemd expects to find the kernel here to allow hibernation
   # https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344
-  install -Dm644 "boot/vmlinuz-${pkgver}-${_arch}-xanmod${xanmod}" "$modulesdir/vmlinuz"
+  install -Dm644 "boot/vmlinuz-$pkgver-$_arch-xanmod$xanmod" "$modulesdir/vmlinuz"
 
   # Used by mkinitcpio to name the kernel
-  echo "${pkgname}" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"
+  echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"
 }
 
 _package-headers() {
   pkgdesc="Headers and scripts for building modules for the Linux Xanmod - Current Stable (MAIN) - Prebuilt version - ${_arch}"
   depends=(pahole)
 
-  mkdir -p "${pkgdir}"/usr/share/doc
-  cp -r usr/share/doc/linux-headers-* "${pkgdir}/usr/share/doc/"
-  cp -r usr/src "${pkgdir}/usr/"
+  mkdir -p "$pkgdir"/usr/share/doc
+  cp -r usr/share/doc/linux-headers-* "$pkgdir/usr/share/doc/"
+  cp -r usr/src "$pkgdir/usr/"
 }
 
-pkgname=("${_pkgbase}-linux-bin-${_arch}" "${_pkgbase}-linux-headers-bin-${_arch}")
+pkgname=("$_pkgbase-linux-bin-$_arch" "$_pkgbase-linux-headers-bin-$_arch")
 eval "package_${pkgname[0]}() { _package \"\$@\"; }"
 eval "package_${pkgname[1]}() { _package-headers \"\$@\"; }"