linux-cachyos-rc: Revert broken upstream commit and trim down crypto …

…patchset Kconfig was updated to match upstream and checksums were updated. Signed-off-by: Eric Naim <[email protected]>
CachyOS · Jan 7, 2025 · fb875c7 · fb875c7
1 parent 9665091
commit fb875c7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 18 deletions.
diff --git a/linux-cachyos-rc/.SRCINFO b/linux-cachyos-rc/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = linux-cachyos-rc
 	pkgdesc = Linux BORE + LTO + Cachy Sauce Kernel by CachyOS with other patches and improvements - Release Candidate
 	pkgver = 6.13.rc6
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/CachyOS/linux-cachyos
 	arch = x86_64
 	license = GPL-2.0-only
@@ -28,9 +28,9 @@ pkgbase = linux-cachyos-rc
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.13/misc/dkms-clang.patch
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.13/sched/0001-bore-cachy.patch
 	b2sums = e82921a5852d76802004fa3764f60a916b5a2382d81ec593b63421bdfd09a2222c8afe91905abcbb1d9a4bbb270808cb247ca7f63f1db70abba39c7507133834
-	b2sums = 62156108dc2cf8b2421ca4a90d1281267ba6867b7f8ed11e346a44a88bb699667af405fb4d12e4f72a8815dfb8fbf9c32120270d0455e21ca262cffe982829e9
+	b2sums = 9f099de709e971acfb9463ac96810a0ddfbd669dd8af891c7301e9ae463130a0ece65ce0c6ec35af62fcb4ed921e15870ec9db29f74b7f9d9017ff268b43d2d5
 	b2sums = 390c7b80608e9017f752b18660cc18ad1ec69f0aab41a2edfcfc26621dcccf5c7051c9d233d9bdf1df63d5f1589549ee0ba3a30e43148509d27dafa9102c19ab
-	b2sums = 1e4cf21d220271d0d63ea23ae13f3172a286eeb858c00d12900bde1691dcf7a0825560f991d97d40f23107aabdada02127b7deb6fead0c1ade0d73ba684e883a
+	b2sums = 4bb8bbbaea6669663e2b4d4879dba05d352fd3fb5b8d9b9889d0c3ffcb8c46a6d5f63a167c64470ea6ea17e1046c7d297c7139edc8da0df2ae7636d20e311619
 	b2sums = c7294a689f70b2a44b0c4e9f00c61dbd59dd7063ecbe18655c4e7f12e21ed7c5bb4f5169f5aa8623b1c59de7b2667facb024913ecb9f4c650dabce4e8a7e5452
 	b2sums = d376480bcb5c468b431be29e252fbf25b350d2742d24e9e41fb113bb4ccc33045566d5ff76005ba167ca58bebde211e93a918c7a7c88da86fb29a28c273a30da
 

diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD
@@ -181,7 +181,7 @@ _stable=${_major}-${_rcver}
 _srcname=linux-${_stable}
 #_srcname=linux-${_major}
 pkgdesc='Linux BORE + LTO + Cachy Sauce Kernel by CachyOS with other patches and improvements - Release Candidate'
-pkgrel=1
+pkgrel=2
 _kernver="$pkgver-$pkgrel"
 _kernuname="${pkgver}-${_pkgsuffix}"
 arch=('x86_64')
@@ -832,8 +832,8 @@ for _p in "${pkgname[@]}"; do
 done
 
 b2sums=('e82921a5852d76802004fa3764f60a916b5a2382d81ec593b63421bdfd09a2222c8afe91905abcbb1d9a4bbb270808cb247ca7f63f1db70abba39c7507133834'
-        '62156108dc2cf8b2421ca4a90d1281267ba6867b7f8ed11e346a44a88bb699667af405fb4d12e4f72a8815dfb8fbf9c32120270d0455e21ca262cffe982829e9'
+        '9f099de709e971acfb9463ac96810a0ddfbd669dd8af891c7301e9ae463130a0ece65ce0c6ec35af62fcb4ed921e15870ec9db29f74b7f9d9017ff268b43d2d5'
         '390c7b80608e9017f752b18660cc18ad1ec69f0aab41a2edfcfc26621dcccf5c7051c9d233d9bdf1df63d5f1589549ee0ba3a30e43148509d27dafa9102c19ab'
-        '1e4cf21d220271d0d63ea23ae13f3172a286eeb858c00d12900bde1691dcf7a0825560f991d97d40f23107aabdada02127b7deb6fead0c1ade0d73ba684e883a'
+        '4bb8bbbaea6669663e2b4d4879dba05d352fd3fb5b8d9b9889d0c3ffcb8c46a6d5f63a167c64470ea6ea17e1046c7d297c7139edc8da0df2ae7636d20e311619'
         'c7294a689f70b2a44b0c4e9f00c61dbd59dd7063ecbe18655c4e7f12e21ed7c5bb4f5169f5aa8623b1c59de7b2667facb024913ecb9f4c650dabce4e8a7e5452'
         'd376480bcb5c468b431be29e252fbf25b350d2742d24e9e41fb113bb4ccc33045566d5ff76005ba167ca58bebde211e93a918c7a7c88da86fb29a28c273a30da')
diff --git a/linux-cachyos-rc/config b/linux-cachyos-rc/config
@@ -12117,6 +12117,9 @@ CONFIG_CRYPTO_SHA256_SSSE3=m
 CONFIG_CRYPTO_SHA512_SSSE3=m
 CONFIG_CRYPTO_SM3_AVX_X86_64=m
 CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
+CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
 # end of Accelerated Cryptographic Algorithms for CPU (x86)
 
 CONFIG_CRYPTO_HW=y
@@ -12230,22 +12233,14 @@ CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
-CONFIG_ARCH_HAS_CRC_T10DIF=y
-CONFIG_CRC_T10DIF_IMPL_ARCH=y
-# CONFIG_CRC_T10DIF_IMPL_GENERIC is not set
-CONFIG_CRC_T10DIF_ARCH=y
 CONFIG_CRC64_ROCKSOFT=y
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
-CONFIG_ARCH_HAS_CRC32=y
-CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY8=y
-# CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY1 is not set
-# CONFIG_CRC32_IMPL_SLICEBY8 is not set
-# CONFIG_CRC32_IMPL_SLICEBY4 is not set
-# CONFIG_CRC32_IMPL_SLICEBY1 is not set
-# CONFIG_CRC32_IMPL_BIT is not set
-CONFIG_CRC32_ARCH=y
+# CONFIG_CRC32_SELFTEST is not set
 CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
 CONFIG_CRC64=y
 CONFIG_CRC4=m
 CONFIG_CRC7=m