From 674e0403d432065b05e748492e9356367f16237b Mon Sep 17 00:00:00 2001
From: "P. Jung" <ptr1337@cachyos.org>
Date: Wed, 12 Jan 2022 17:13:10 +0100
Subject: [PATCH] 5.16.0-2-fixes

---
 .SRCINFO  |  38 +++++++-------
 PKGBUILD  | 150 +++++++++++++++++++++++++++++-------------------------
 config    |   0
 configure |   0
 4 files changed, 99 insertions(+), 89 deletions(-)
 mode change 100644 => 100755 PKGBUILD
 mode change 100644 => 100755 config
 mode change 100644 => 100755 configure

diff --git a/.SRCINFO b/.SRCINFO
index 6ca9431..2dc08ca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
-pkgbase = linux-cachyos-bore
-	pkgdesc = Linux BORE scheduler Kernel by CachyOS and with some other patches and other improvements
+pkgbase = linux-cachyos
+	pkgdesc = Linux CFS scheduler Kernel by CachyOS and with some other patches and other improvements
 	pkgver = 5.16.0
 	pkgrel = 2
 	url = https://github.com/CachyOS/linux-cachyos
@@ -21,12 +21,12 @@ pkgbase = linux-cachyos-bore
 	options = !strip
 	source = https://git.kernel.org/torvalds/t/linux-5.16.tar.gz
 	source = config
-	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/sched/0001-bore-sched.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-MG-LRU-v6.patch
-	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-blk-patches.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-amd64-patches.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-sched-perf-fix.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-block-patches.patch
-	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-amdpstate.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-blk-patches.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-pm.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-anbox.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-bbr2-patches.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-btrfs.patch
@@ -34,28 +34,27 @@ pkgbase = linux-cachyos-bore
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-cfi.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-cpu.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-clearlinux.patch
-	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-f2fs-patches.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-f2fs-xfs-ext4-patches.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-misc.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-fixes.patch
-	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-futex.patch
+	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-futex-winesync.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-hwmon.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-ksmbd.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-rcu.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-zstd-patches.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-zen-patches.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-v4l2loopback.patch
-	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/misc/0007-v5.16-winesync.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/next/0002-mm-next.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/next/0003-folio-io.patch
 	source = auto-cpu-optimization.sh
 	md5sums = 5c6acbcc119ab680a32264c865ea70e1
 	md5sums = f9425b75de74d70497781f8c8448c27f
-	md5sums = 1fb4de64e7b59b67afecc7b71b951576
 	md5sums = d16ccc4f52eb0bc08893dc66a7caa154
-	md5sums = 194c8e20ad30973c32159cb23f3be4c9
-	md5sums = 1262001a6a1e72fa271481cf897ac6d1
+	md5sums = dbdb6754a1f5b3ccf26321843a070406
+	md5sums = d6feae0f2dd1b24a853d335da003cb51
 	md5sums = f717c0a238353f443a6f0633a59ee8ca
-	md5sums = 2923efbd99eea15f7ef2ada70e661bd5
+	md5sums = 194c8e20ad30973c32159cb23f3be4c9
+	md5sums = 2faaa79055263c1cdeeaa2896e641696
 	md5sums = 80e419d6847d4122a23a141fd3a40e52
 	md5sums = d194311161f8f44755e532db738f4a2d
 	md5sums = e9dff9b551b8fa7c0b47ae5ac0b16365
@@ -63,23 +62,22 @@ pkgbase = linux-cachyos-bore
 	md5sums = b61fd5f488e44208fc97bfa6a274aebb
 	md5sums = d4c38ce51fb9a69aa92ad9b9e0199122
 	md5sums = a687c26c262ccb9ad7cb54697a1476bc
-	md5sums = 55bb44747ae64b05640e6452113877c2
+	md5sums = 8ef0e994f61bcd8d2188588f42805005
 	md5sums = 80920e501b9b87bfe587edff445e6efe
 	md5sums = f574f1c40fa2d07602e77418b863e144
-	md5sums = 2458d1c5d00d10709922e686c5d1e97f
+	md5sums = 28dcc1fe3029c6c316773bbcbe82954d
 	md5sums = 2160aabf2b9798907d36c4d246937d71
 	md5sums = 12ad5085b7f01793980f137f2c9451cb
 	md5sums = 167a4267269e6a709c54e7b9ea8bf8d5
 	md5sums = bf58290793d3a095ef95fb1fac2de89a
 	md5sums = de6db1147385c058b2e94df3c1739fdf
 	md5sums = cb9384ce179d08be6c90df6d0a0977a1
-	md5sums = 972fa89ff4ad22631fca50af2305c049
 	md5sums = 258c33888c85d1ecc0bbdf59c3a92895
 	md5sums = 9956af4381a21744369bf81d76d3142d
 	md5sums = 21c98f19e883879dd3336c1fa143fd31
 
-pkgname = linux-cachyos-bore
-	pkgdesc = The Linux BORE scheduler Kernel by CachyOS and with some other patches and other improvements kernel and modules
+pkgname = linux-cachyos
+	pkgdesc = The Linux CFS scheduler Kernel by CachyOS and with some other patches and other improvements kernel and modules
 	depends = coreutils
 	depends = kmod
 	depends = initramfs
@@ -89,7 +87,7 @@ pkgname = linux-cachyos-bore
 	provides = VIRTUALBOX-GUEST-MODULES
 	provides = WIREGUARD-MODULE
 
-pkgname = linux-cachyos-bore-headers
-	pkgdesc = Headers and scripts for building modules for the Linux BORE scheduler Kernel by CachyOS and with some other patches and other improvements
-	depends = linux-cachyos-bore=5.16.0
+pkgname = linux-cachyos-headers
+	pkgdesc = Headers and scripts for building modules for the Linux CFS scheduler Kernel by CachyOS and with some other patches and other improvements
+	depends = linux-cachyos=5.16.0
 	depends = pahole
diff --git a/PKGBUILD b/PKGBUILD
old mode 100644
new mode 100755
index 3d57e70..df3866a
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@
 # 'bore' - select 'Burst-Oriented Response Enhancer'
 # 'tt' - select 'Task Type Scheduler by Hamad Marri'
 # 'cfs' - select 'Completely Fair Scheduler'
-_cpusched='bore'
+_cpusched='cfs'
 
 ### BUILD OPTIONS
 # Set these variables to ANYTHING that is not null to enable them
@@ -117,9 +117,9 @@ _use_cfi=
 
 
 if [ -n "$_use_llvm_lto" ]; then
-  pkgbase=linux-cachyos-bore-lto
+  pkgbase=linux-cachyos-lto
 else
-  pkgbase=linux-cachyos-bore
+  pkgbase=linux-cachyos
 fi
 _major=5.16
 _minor=0
@@ -132,7 +132,7 @@ _stablerc=${_major}-${_rcver}
 _srcname=linux-${_stable}
 #_srcname=linux-${_major}
 arch=(x86_64 x86_64_v3)
-pkgdesc='Linux BORE scheduler Kernel by CachyOS and with some other patches and other improvements'
+pkgdesc='Linux CFS scheduler Kernel by CachyOS and with some other patches and other improvements'
 pkgrel=2
 arch=('x86_64' 'x86_64_v3')
 url="https://github.com/CachyOS/linux-cachyos"
@@ -152,13 +152,14 @@ source=(
   "config"
   #  "${_patchsource}/sched/0001-pjrc.patch" ## not released for 5.16 right now
   #  "${_patchsource}/sched/0001-cacULE-5.16-full.patch"
-  "${_patchsource}/sched/0001-bore-sched.patch"
+  #   "${_patchsource}/sched/0001-bore-sched.patch"
   #  "${_patchsource}/sched/0001-tt.patch"
   "${_patchsource}/0001-MG-LRU-v6.patch"
-  "${_patchsource}/0001-blk-patches.patch"
+  "${_patchsource}/0001-amd64-patches.patch"
   "${_patchsource}/0001-sched-perf-fix.patch"
   "${_patchsource}/0001-block-patches.patch"
-  "${_patchsource}/0001-amdpstate.patch"
+  "${_patchsource}/0001-blk-patches.patch"
+  "${_patchsource}/0001-pm.patch"
   "${_patchsource}/0001-anbox.patch"
   "${_patchsource}/0001-bbr2-patches.patch"
   "${_patchsource}/0001-btrfs.patch"
@@ -166,17 +167,16 @@ source=(
   "${_patchsource}/0001-cfi.patch"
   "${_patchsource}/0001-cpu.patch"
   "${_patchsource}/0001-clearlinux.patch"
-  "${_patchsource}/0001-f2fs-patches.patch"
+  "${_patchsource}/0001-f2fs-xfs-ext4-patches.patch"
   "${_patchsource}/0001-misc.patch"
   "${_patchsource}/0001-fixes.patch"
-  "${_patchsource}/0001-futex.patch"
+  "${_patchsource}/0001-futex-winesync.patch"
   "${_patchsource}/0001-hwmon.patch"
   "${_patchsource}/0001-ksmbd.patch"
   "${_patchsource}/0001-rcu.patch"
   "${_patchsource}/0001-zstd-patches.patch"
   "${_patchsource}/0001-zen-patches.patch"
   "${_patchsource}/0001-v4l2loopback.patch"
-  "${_patchsource}/misc/0007-v5.16-winesync.patch"
   "${_patchsource}/next/0002-mm-next.patch"
   "${_patchsource}/next/0003-folio-io.patch"
   "auto-cpu-optimization.sh"
@@ -549,85 +549,98 @@ _package() {
   'modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig')
   provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE)
 
-
   cd $_srcname
+
   local kernver="$(<version)"
   local modulesdir="$pkgdir/usr/lib/modules/$kernver"
 
-  echo "Installing boot image..."
   # systemd expects to find the kernel here to allow hibernation
   # https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344
-  install -Dm644 "$(make -s image_name)" "$modulesdir/vmlinuz"
+  install -Dm644 "$(make $LLVMOPTS -s image_name)" "$modulesdir/vmlinuz"
 
   # Used by mkinitcpio to name the kernel
-  echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"
+  echo "${pkgbase}" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"
 
-  echo "Installing modules..."
-  make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 modules_install
+  # make room for external modules
+  local _extramodules="extramodules-${pkgbase}"
+  ln -s "../${_extramodules}" "$modulesdir/extramodules"
+  # add real version for building modules and running depmod from hook
+  echo "${kernver}" |
+  install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modules/${_extramodules}/version"
+
+  echo -e "\n${TB}* INSTALLING MODULES${TN}"
+  make $LLVMOPTS LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}/usr" INSTALL_MOD_STRIP=1 modules_install
 
   # remove build and source links
-  rm "$modulesdir"/{source,build}
+  rm "${modulesdir}/source"
+  rm "${modulesdir}/build"
+
+  # depmod
+  depmod -b "${pkgdir}/usr" -F System.map "${kernver}"
+
+
+
 }
 
 _package-headers() {
   pkgdesc="Headers and scripts for building modules for the ${pkgdesc}"
   depends=("${pkgbase}=${pkgver}" "pahole")
+
   cd $_srcname
-  local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
+  local kernver="$(<version)"
+  local _builddir="${pkgdir}/usr/lib/modules/${kernver}/build"
 
-  echo "Installing build files..."
-  install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \
-    localversion.* version vmlinux
-  install -Dt "$builddir/kernel" -m644 kernel/Makefile
-  install -Dt "$builddir/arch/x86" -m644 arch/x86/Makefile
-  cp -t "$builddir" -a scripts
+  echo -e "\n${TB}* INSTALLING HEADERS${TN}"
+  install -Dt "${_builddir}" -m644 Makefile .config Module.symvers System.map version vmlinux localversion.*
+  install -Dt "${_builddir}/kernel" -m644 kernel/Makefile
+  install -Dt "${_builddir}/arch/x86" -m644 "arch/x86/Makefile"
+  #mkdir "${_builddir}/.tmp_versions"
 
-  # required when STACK_VALIDATION is enabled
-  install -Dt "$builddir/tools/objtool" tools/objtool/objtool
+  cp -t "${_builddir}" -a include scripts
 
-  # required when DEBUG_INFO_BTF_MODULES is enabled
-#  install -Dt "$builddir/tools/bpf/resolve_btfids" tools/bpf/resolve_btfids/resolve_btfids
+  # add xfs and shmem for aufs building
+  mkdir -p "${_builddir}"/{fs/xfs,mm}
 
-  echo "Installing headers..."
-  cp -t "$builddir" -a include
-  cp -t "$builddir/arch/x86" -a arch/x86/include
-  install -Dt "$builddir/arch/x86/kernel" -m644 arch/x86/kernel/asm-offsets.s
+  # add objtool for external module building and enabled VALIDATION_STACK option
+  install -Dt "${_builddir}/tools/objtool" tools/objtool/objtool
 
-  install -Dt "$builddir/drivers/md" -m644 drivers/md/*.h
-  install -Dt "$builddir/net/mac80211" -m644 net/mac80211/*.h
+  cp -t "${_builddir}/arch/x86" -a "arch/x86/include"
+  install -Dt "${_builddir}/arch/x86/kernel" -m644 "arch/x86/kernel/asm-offsets.s"
 
-  # https://bugs.archlinux.org/task/13146
-  install -Dt "$builddir/drivers/media/i2c" -m644 drivers/media/i2c/msp3400-driver.h
+  install -Dt "${_builddir}/drivers/md" -m644 drivers/md/*.h
+  install -Dt "${_builddir}/net/mac80211" -m644 net/mac80211/*.h
 
-  # https://bugs.archlinux.org/task/20402
-  install -Dt "$builddir/drivers/media/usb/dvb-usb" -m644 drivers/media/usb/dvb-usb/*.h
-  install -Dt "$builddir/drivers/media/dvb-frontends" -m644 drivers/media/dvb-frontends/*.h
-  install -Dt "$builddir/drivers/media/tuners" -m644 drivers/media/tuners/*.h
+  # http://bugs.archlinux.org/task/13146
+  install -Dt "${_builddir}/drivers/media/i2c" -m644 drivers/media/i2c/msp3400-driver.h
 
-  # https://bugs.archlinux.org/task/71392
-  install -Dt "$builddir/drivers/iio/common/hid-sensors" -m644 drivers/iio/common/hid-sensors/*.h
+  # http://bugs.archlinux.org/task/20402
+  install -Dt "${_builddir}/drivers/media/usb/dvb-usb" -m644 drivers/media/usb/dvb-usb/*.h
+  install -Dt "${_builddir}/drivers/media/dvb-frontends" -m644 drivers/media/dvb-frontends/*.h
+  install -Dt "${_builddir}/drivers/media/tuners" -m644 drivers/media/tuners/*.h
 
-  echo "Installing KConfig files..."
-  find . -name 'Kconfig*' -exec install -Dm644 {} "$builddir/{}" \;
+  # copy in Kconfig files
+  find . -name Kconfig\* -exec install -Dm644 {} "${_builddir}/{}" \;
 
-  echo "Removing unneeded architectures..."
-  local arch
-  for arch in "$builddir"/arch/*/; do
-    [[ $arch = */x86/ ]] && continue
-    echo "Removing $(basename "$arch")"
-    rm -r "$arch"
+  # remove unneeded stuff
+  echo -e "\n${TB}* REMOVING UNNEEDED FILES${TN}"
+  # remove unneeded architectures
+  local _arch
+  for _arch in "${_builddir}"/arch/*/; do
+    [[ ${_arch} == */x86/ ]] && continue
+    rm -r "${_arch}"
   done
 
-  echo "Removing documentation..."
-  rm -r "$builddir/Documentation"
+  # remove files already in linux-docs package
+  rm -r "${_builddir}/Documentation"
 
-  echo "Removing broken symlinks..."
-  find -L "$builddir" -type l -printf 'Removing %P\n' -delete
+  # remove broken symlinks
+  find -L "${_builddir}" -type l -printf 'Removing %P\n' -delete
 
-  echo "Removing loose objects..."
-  find "$builddir" -type f -name '*.o' -printf 'Removing %P\n' -delete
+  # remove loose objects"
+  find "${_builddir}" -type f -name '*.o' -printf 'Removing %P\n' -delete
 
-  echo "Stripping build tools..."
+  # strip scripts directory
+  echo -e "\n${TB}* STRIPPING${TN}"
   local file
   while read -rd '' file; do
     case "$(file -bi "$file")" in
@@ -640,14 +653,14 @@ _package-headers() {
       application/x-pie-executable\;*) # Relocatable binaries
         strip -v $STRIP_SHARED "$file" ;;
     esac
-  done < <(find "$builddir" -type f -perm -u+x ! -name vmlinux -print0)
+  done < <(find "${_builddir}" -type f -perm -u+x ! -name vmlinux -print0)
 
-  echo "Stripping vmlinux..."
-  strip -v $STRIP_STATIC "$builddir/vmlinux"
+  strip -v $STRIP_STATIC "${_builddir}/vmlinux"
 
-  echo "Adding symlink..."
+  echo -e "\n${TB}* SYMLINKING${TN}"
   mkdir -p "$pkgdir/usr/src"
-  ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
+  ln -sr "$_builddir" "$pkgdir/usr/src/$pkgbase"
+
 }
 
 pkgname=("$pkgbase" "$pkgbase-headers")
@@ -661,12 +674,12 @@ done
 
 md5sums=('5c6acbcc119ab680a32264c865ea70e1'
          'f9425b75de74d70497781f8c8448c27f'
-         '1fb4de64e7b59b67afecc7b71b951576'
          'd16ccc4f52eb0bc08893dc66a7caa154'
-         '194c8e20ad30973c32159cb23f3be4c9'
-         '1262001a6a1e72fa271481cf897ac6d1'
+         'dbdb6754a1f5b3ccf26321843a070406'
+         'd6feae0f2dd1b24a853d335da003cb51'
          'f717c0a238353f443a6f0633a59ee8ca'
-         '2923efbd99eea15f7ef2ada70e661bd5'
+         '194c8e20ad30973c32159cb23f3be4c9'
+         '2faaa79055263c1cdeeaa2896e641696'
          '80e419d6847d4122a23a141fd3a40e52'
          'd194311161f8f44755e532db738f4a2d'
          'e9dff9b551b8fa7c0b47ae5ac0b16365'
@@ -674,17 +687,16 @@ md5sums=('5c6acbcc119ab680a32264c865ea70e1'
          'b61fd5f488e44208fc97bfa6a274aebb'
          'd4c38ce51fb9a69aa92ad9b9e0199122'
          'a687c26c262ccb9ad7cb54697a1476bc'
-         '55bb44747ae64b05640e6452113877c2'
+         '8ef0e994f61bcd8d2188588f42805005'
          '80920e501b9b87bfe587edff445e6efe'
          'f574f1c40fa2d07602e77418b863e144'
-         '2458d1c5d00d10709922e686c5d1e97f'
+         '28dcc1fe3029c6c316773bbcbe82954d'
          '2160aabf2b9798907d36c4d246937d71'
          '12ad5085b7f01793980f137f2c9451cb'
          '167a4267269e6a709c54e7b9ea8bf8d5'
          'bf58290793d3a095ef95fb1fac2de89a'
          'de6db1147385c058b2e94df3c1739fdf'
          'cb9384ce179d08be6c90df6d0a0977a1'
-         '972fa89ff4ad22631fca50af2305c049'
          '258c33888c85d1ecc0bbdf59c3a92895'
          '9956af4381a21744369bf81d76d3142d'
          '21c98f19e883879dd3336c1fa143fd31')
diff --git a/config b/config
old mode 100644
new mode 100755
diff --git a/configure b/configure
old mode 100644
new mode 100755