Bug fix

3 files changed, 67 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 35750b1510d2..476c97300b1b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-mainline-bcachefs
 	pkgdesc = Linux-tkg with bcachefs
-	pkgver = 5.10
+	pkgver = 5.10.10
 	pkgrel = 115
 	url = http://www.kernel.org/
 	arch = x86_64
@@ -24,9 +24,66 @@ pkgbase = linux-mainline-bcachefs
 	makedepends = perl
 	makedepends = tar
 	makedepends = xz
+	makedepends = lld
+	makedepends = clang
+	makedepends = llvm
 	optdepends = schedtool
 	options = !strip
 	options = docs
+	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
+	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.10.10.xz
+	source = https://raw.githubusercontent.com/graysky2/kernel_gcc_patch/master/enable_additional_cpu_optimizations_for_gcc_v10.1%2B_kernel_v5.8%2B.patch
+	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-config/5.10/config.x86_64
+	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-config/5.10/config_hardened.x86_64
+	source = 90-cleanup.hook
+	source = cleanup
+	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
+	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0002-clear-patches.patch
+	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0003-glitched-base.patch
+	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0003-glitched-cfs.patch
+	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0004-glitched-ondemand-muqss.patch
+	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0004-glitched-muqss.patch
+	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0004-5.10-ck1.patch
+	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0005-undead-glitched-ondemand-pds.patch
+	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0005-undead-glitched-pds.patch
+	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0005-v5.10_undead-pds099o.patch
+	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0005-glitched-pds.patch
+	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0006-add-acs-overrides_iommu.patch
+	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0007-v5.10-fsync.patch
+	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0008-5.10-bcachefs.patch
+	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0009-glitched-ondemand-bmq.patch
+	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0009-glitched-bmq.patch
+	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0009-prjc_v5.10-r2.patch
+	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0011-ZFS-fix.patch
+	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0012-linux-hardened.patch
+	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0012-misc-additions.patch
+	sha256sums = dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43
+	sha256sums = f60f800329a7461e5ff542f7f19e24a073f1e49a74f96dfb5d45a899f6a9cad8
+	sha256sums = SKIP
+	sha256sums = 458d1ca195f3fee5501683a4b61ef0ed0cfa7e5219eccab3390fb40c0289898a
+	sha256sums = eb1da1a028a1c967222b5bdac1db2b2c4d8285bafd714892f6fc821c10416341
+	sha256sums = 1e15fc2ef3fa770217ecc63a220e5df2ddbcf3295eb4a021171e7edd4c6cc898
+	sha256sums = 66a03c246037451a77b4d448565b1d7e9368270c7d02872fbd0b5d024ed0a997
+	sha256sums = f6383abef027fd9a430fd33415355e0df492cdc3c90e9938bf2d98f4f63b32e6
+	sha256sums = 35a7cde86fb94939c0f25a62b8c47f3de0dbd3c65f876f460b263181b3e92fc0
+	sha256sums = 1ac97da07e72ec7e2b0923d32daacacfaa632a44c714d6942d9f143fe239e1b5
+	sha256sums = 7058e57fd68367b029adc77f2a82928f1433daaf02c8c279cb2d13556c8804d7
+	sha256sums = c605f638d74c61861ebdc36ebd4cb8b6475eae2f6273e1ccb2bbb3e10a2ec3fe
+	sha256sums = 2bbbac963b6ca44ef3f8a71ec7c5cad7d66df860869a73059087ee236775970a
+	sha256sums = e00096244e5cddaa5500d08b5f692fd3f25be9401dfa3b0fc624625ff2f5e198
+	sha256sums = 62496f9ca788996181ef145f96ad26291282fcc3fb95cdc04080dcf84365be33
+	sha256sums = 31b428c464905e44ed61cdcd1f42b4ec157ebe5a44cb5b608c4c99b466df66ba
+	sha256sums = 06e93b57b7a0b96aefc2c0ec12c3be28c6e8dc8506fa8a22c5a2313814a3c7f3
+	sha256sums = fca63d15ca4502aebd73e76d7499b243d2c03db71ff5ab0bf5cf268b2e576320
+	sha256sums = 19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a
+	sha256sums = b302ba6c5bbe8ed19b20207505d513208fae1e678cf4d8e7ac0b154e5fe3f456
+	sha256sums = 26b4b7b4832c5eff53bb679a410dd6300b956d4c51763512ebebf4fd99eed873
+	sha256sums = 9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177
+	sha256sums = a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911
+	sha256sums = e308292fc42840a2366280ea7cf26314e92b931bb11f04ad4830276fc0326ee1
+	sha256sums = 49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104
+	sha256sums = 105f51e904d80f63c1421203e093b612fc724edefd3e388b64f8d371c0b3a842
+	sha256sums = cf7c758604f2a99cfcb65129c436e32e2ef7a80fe486f8e55a2206a955acc40a
 
 pkgname = linux-mainline-bcachefs
 
diff --git a/PKGBUILD b/PKGBUILD
index 9d2c90908f17..5614ae113c91 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,6 +11,8 @@ _ispkgbuild="true"
 source "$_where"/customization.cfg # load default configuration from file
 source "$_where"/prepare
 
+_tkg_initscript
+
 #if [[ "$_sub" = rc* ]]; then
 #  _srcpath="linux-${_basekernel}-${_sub}"
 #  kernel_site="https://git.kernel.org/torvalds/t/linux-${_basekernel}-${_sub}.tar.gz"
@@ -43,8 +45,6 @@ fi
 optdepends=('schedtool')
 options=('!strip' 'docs')
 
-case $_basever in
-	510)
 	opt_ver="5.8%2B"
     source=("$kernel_site"
         "$patch_site"
@@ -104,8 +104,6 @@ sha256sums=('dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43'
             '49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104'
             '105f51e904d80f63c1421203e093b612fc724edefd3e388b64f8d371c0b3a842'
             'cf7c758604f2a99cfcb65129c436e32e2ef7a80fe486f8e55a2206a955acc40a')
-	;;
-esac
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase
@@ -116,8 +114,6 @@ prepare() {
 
   ln -s "${_where}/customization.cfg" "${srcdir}" # workaround
 
-  _tkg_initscript
-
   cd "${srcdir}/${_srcpath}"
 
   _tkg_srcprep
diff --git a/prepare b/prepare
index 18be4deb2937..2e64d6344fd7 100644
--- a/prepare
+++ b/prepare
@@ -27,9 +27,16 @@ _tkg_initscript() {
           echo "_basekernel=5.10" >> "$_path"/versel
           echo "_sub=${ver510}" >> "$_path"/versel
   elif [ -n "$_version" ];then
+      case "$_version" in
+		"5.10")
 		echo "_basever=510" > "$_path"/versel
 		echo "_basekernel=5.10" >> "$_path"/versel
 		echo "_sub=${ver510}" >> "$_path"/versel
+		;;
+		*)
+		error "There is something wrong with your kernel version selection, exiting..."
+		exit 1
+	esac
   fi
 
   # source versel early if present