Updated, got rid of preset

3 files changed, 12 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 00a5f612de51..1500776c5e0c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-slim
-	pkgver = 6.8.v.6
+	pkgver = 6.8.v.7
 	pkgrel = 1
 	url = http://www.kernel.org/
 	arch = x86_64
@@ -13,13 +13,11 @@ pkgbase = linux-slim
 	makedepends = libelf
 	makedepends = lzop
 	options = !strip
-	source = git+https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git#tag=v6.8.6
+	source = git+https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git#tag=v6.8.7
 	source = config.x86_64
-	source = linux-slim.preset
 	source = https://raw.githubusercontent.com/graysky2/kernel_compiler_patch/20240221.2/more-uarches-for-kernel-6.8-rc4+.patch
 	sha256sums = SKIP
-	sha256sums = ec765a0899e219b3669cc8f2ee850b71ac88033bd70f46b75dc25c376c221427
-	sha256sums = e60d58e60c809d5bd6bc2c258bce0e811a818b6a4b9ccb928902e519e90ab6d5
+	sha256sums = 1fb2041018c0dfaabd735f7a6f25c20f97b7323a356fb3e603353e9f974f0af0
 	sha256sums = d69232afd0dd6982ae941cf2d1f577f4be2011e3bb847d1db37952acf416b5d3
 
 pkgname = linux-slim
@@ -30,7 +28,6 @@ pkgname = linux-slim
 	depends = mkinitcpio>=0.7
 	depends = lzop
 	optdepends = crda: to set the correct wireless channels of your country
-	backup = etc/mkinitcpio.d/linux-slim.preset
 
 pkgname = linux-slim-headers
 	pkgdesc = Header files and scripts for building modules for the slimmed down linux kernel.
diff --git a/PKGBUILD b/PKGBUILD
index 20647083f491..506ba61cf8c2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,10 +2,10 @@
 
 pkgbase=linux-slim
 _srcname=linux
-gitver=v6.8.6
+gitver=v6.8.7
 patchver=20240221.2
 patchname=more-uarches-for-kernel-6.8-rc4+.patch
-pkgver=6.8.v.6
+pkgver=6.8.v.7
 pkgrel=1
 arch=('x86_64')
 url="http://www.kernel.org/"
@@ -18,16 +18,12 @@ source=(
 	#'git+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git'
         # the main kernel config files
         'config.x86_64'
-        # standard config files for mkinitcpio ramdisk
-        "${pkgbase}.preset"
 	# patch from our graysky archlinux colleague
 	"https://raw.githubusercontent.com/graysky2/kernel_compiler_patch/$patchver/$patchname"
 )
 sha256sums=('SKIP'
             #config.x86_64
-            'ec765a0899e219b3669cc8f2ee850b71ac88033bd70f46b75dc25c376c221427'
-            #.preset file
-            'e60d58e60c809d5bd6bc2c258bce0e811a818b6a4b9ccb928902e519e90ab6d5'
+            '1fb2041018c0dfaabd735f7a6f25c20f97b7323a356fb3e603353e9f974f0af0'
             #grayskypatch
             'd69232afd0dd6982ae941cf2d1f577f4be2011e3bb847d1db37952acf416b5d3'
            )
@@ -76,7 +72,6 @@ _package() {
   pkgdesc="Linux kernel slimmed down to only work on AMD hardware. Zero compatibility."
   depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7' 'lzop')
   optdepends=('crda: to set the correct wireless channels of your country')
-  backup=("etc/mkinitcpio.d/${pkgbase}.preset")
 
   cd "${_srcname}"
 
@@ -90,15 +85,6 @@ _package() {
   mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
   make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install
 
-  # install mkinitcpio preset file for kernel
-  install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
-  sed \
-    -e "1s|'linux.*'|'${pkgbase}'|" \
-    -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \
-    -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgbase}.img\"|" \
-    -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgbase}-fallback.img\"|" \
-    -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
-
   # remove build link
   rm -f "${pkgdir}"/lib/modules/${_kernver}/build
   # remove the firmware
diff --git a/config.x86_64 b/config.x86_64
index e56b54b57286..11dedde4894d 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.8.6 Kernel Configuration
+# Linux/x86 6.8.7 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.1 20230801"
 CONFIG_CC_IS_GCC=y
@@ -44,9 +44,9 @@ CONFIG_HAVE_KERNEL_ZSTD=y
 # CONFIG_KERNEL_BZIP2 is not set
 # CONFIG_KERNEL_LZMA is not set
 # CONFIG_KERNEL_XZ is not set
-CONFIG_KERNEL_LZO=y
+# CONFIG_KERNEL_LZO is not set
 # CONFIG_KERNEL_LZ4 is not set
-# CONFIG_KERNEL_ZSTD is not set
+CONFIG_KERNEL_ZSTD=y
 CONFIG_DEFAULT_INIT=""
 CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SYSVIPC=y
@@ -236,9 +236,9 @@ CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_RD_BZIP2 is not set
 # CONFIG_RD_LZMA is not set
 # CONFIG_RD_XZ is not set
-CONFIG_RD_LZO=y
+# CONFIG_RD_LZO is not set
 # CONFIG_RD_LZ4 is not set
-# CONFIG_RD_ZSTD is not set
+CONFIG_RD_ZSTD=y
 # CONFIG_BOOT_CONFIG is not set
 CONFIG_INITRAMFS_PRESERVE_MTIME=y
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
@@ -6738,7 +6738,7 @@ CONFIG_XZ_DEC_X86=y
 # CONFIG_XZ_DEC_MICROLZMA is not set
 CONFIG_XZ_DEC_BCJ=y
 # CONFIG_XZ_DEC_TEST is not set
-CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_ZSTD=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_DEC8=y