This commit is contained in:
P. Jung 2022-01-21 12:27:08 +01:00
parent 2a4e9a6010
commit b2f1f24377
No known key found for this signature in database
GPG Key ID: AFC052D06215E148
2 changed files with 80 additions and 108 deletions

View File

@ -1,7 +1,7 @@
pkgbase = linux-cachyos
pkgdesc = Linux CFS scheduler Kernel by CachyOS and with some other patches and other improvements
pkgver = 5.16.1
pkgrel = 1
pkgver = 5.16.2
pkgrel = 2
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
arch = x86_64_v3
@ -19,11 +19,10 @@ pkgbase = linux-cachyos
makedepends = tar
makedepends = xz
options = !strip
source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.16.1.tar.xz
source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.16.2.tar.xz
source = config
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-lru-patches.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-arch-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-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
@ -31,11 +30,11 @@ pkgbase = linux-cachyos
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-bfq-patches.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-btrfs.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-lrng.patch
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-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-lqx-patches.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-net-patches.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-fixes-miscellaneous.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-pf-patches.patch
@ -44,14 +43,12 @@ pkgbase = linux-cachyos
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-v4l2loopback.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/0001-mm-next.patch
source = auto-cpu-optimization.sh
md5sums = 121e4f65cf16ff76527020ea596fa431
md5sums = fd00badc3b53d42da3d84a7cf6f53f17
md5sums = 6048a8eb052a7b2a22b4ab159278b903
md5sums = 76b9d9fa00184d10e7949bb948ca846d
md5sums = 3d8d1eeebba7d038f6d890619233e605
md5sums = d6feae0f2dd1b24a853d335da003cb51
md5sums = 194c8e20ad30973c32159cb23f3be4c9
md5sums = 2faaa79055263c1cdeeaa2896e641696
md5sums = 80e419d6847d4122a23a141fd3a40e52
@ -59,21 +56,20 @@ pkgbase = linux-cachyos
md5sums = b5b3d9d1cefc3955a82ec895f891abf3
md5sums = e9dff9b551b8fa7c0b47ae5ac0b16365
md5sums = 9f86c3b9e6271cfc4440864a6857b256
md5sums = 0a353926bf4a790374e0f946a7039b40
md5sums = d4c38ce51fb9a69aa92ad9b9e0199122
md5sums = a687c26c262ccb9ad7cb54697a1476bc
md5sums = 2249b7ca0a7dfb0b2f835a8cc4058f1e
md5sums = a35a6dea9bc12029b3a837d86d4b842a
md5sums = 80920e501b9b87bfe587edff445e6efe
md5sums = 231fa80a33e7a926ba832d3bd66d2ce6
md5sums = bf010dff1d7a48191d491eba2dde1227
md5sums = b7867c9203f9f1ec1e3d6648a4659624
md5sums = 34a583709ee18ad075f497a1733aa8db
md5sums = be1e00d93e9c2ba91ee6017b82e64194
md5sums = 28dcc1fe3029c6c316773bbcbe82954d
md5sums = 0714c9817397ac7568afc3e327a20ddd
md5sums = 8fa4524671e6901bbdb47aaf8ecc0de8
md5sums = 12ad5085b7f01793980f137f2c9451cb
md5sums = 167a4267269e6a709c54e7b9ea8bf8d5
md5sums = bf58290793d3a095ef95fb1fac2de89a
md5sums = cb9384ce179d08be6c90df6d0a0977a1
md5sums = 1613d4689c58d19417a9cd7177f6454b
md5sums = 6bb03b7a1b9207aaf77fb886d42bab74
md5sums = 21c98f19e883879dd3336c1fa143fd31
pkgname = linux-cachyos
@ -88,6 +84,6 @@ pkgname = linux-cachyos
provides = WIREGUARD-MODULE
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.1
pkgdesc = Headers and scripts for building modules for the Linux CFS scheduler Kernel by CachyOS and with some other patches and other improvements kernel
depends = linux-cachyos=5.16.2
depends = pahole

158
PKGBUILD
View File

@ -122,7 +122,7 @@ else
pkgbase=linux-cachyos
fi
_major=5.16
_minor=1
_minor=2
#_minorc=$((_minor+1))
#_rcver=rc8
pkgver=${_major}.${_minor}
@ -133,7 +133,7 @@ _srcname=linux-${_stable}
#_srcname=linux-${_major}
arch=(x86_64 x86_64_v3)
pkgdesc='Linux CFS scheduler Kernel by CachyOS and with some other patches and other improvements'
pkgrel=1
pkgrel=2
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
license=('GPL2')
@ -143,20 +143,16 @@ makedepends=('kmod' 'bc' 'libelf' 'python-sphinx' 'python-sphinx_rtd_theme'
if [ -n "$_use_llvm_lto" ]; then
depends=(clang llvm lld python)
fi
if [ -n "$_use_llvm_lto" ]; then
makedepends+=(clang llvm lld python)
fi
_patchsource="https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16"
source=(
"https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz"
"config"
# "${_patchsource}/sched/0001-pjrc.patch" ## not released for 5.16 right now
# "${_patchsource}/sched/0001-pjrc.patch"
# "${_patchsource}/sched/0001-cacULE-5.16-full.patch"
# "${_patchsource}/sched/0001-bore-sched.patch"
# "${_patchsource}/sched/0001-tt.patch"
"${_patchsource}/0001-lru-patches.patch"
"${_patchsource}/0001-arch-patches.patch"
"${_patchsource}/0001-sched-perf-fix.patch"
"${_patchsource}/0001-blk-patches.patch"
"${_patchsource}/0001-pm.patch"
"${_patchsource}/0001-anbox.patch"
@ -164,12 +160,11 @@ source=(
"${_patchsource}/0001-bfq-patches.patch"
"${_patchsource}/0001-btrfs.patch"
"${_patchsource}/0001-lrng.patch"
# "${_patchsource}/0001-cfi.patch"
"${_patchsource}/0001-cfi.patch"
"${_patchsource}/0001-cpu.patch"
"${_patchsource}/0001-clearlinux.patch"
"${_patchsource}/0001-f2fs-xfs-ext4-patches.patch"
"${_patchsource}/0001-misc.patch"
"${_patchsource}/0001-lqx-patches.patch"
"${_patchsource}/0001-net-patches.patch"
"${_patchsource}/0001-fixes-miscellaneous.patch"
"${_patchsource}/0001-pf-patches.patch"
@ -179,8 +174,7 @@ source=(
"${_patchsource}/0001-rcu.patch"
"${_patchsource}/0001-zstd-patches.patch"
# "${_patchsource}/0001-zen-patches.patch"
"${_patchsource}/0001-v4l2loopback.patch"
"${_patchsource}/next/0002-mm-next.patch"
"${_patchsource}/next/0001-mm-next.patch"
# "${_patchsource}/0001-FG-KASLR.patch"
"auto-cpu-optimization.sh"
)
@ -545,107 +539,92 @@ build() {
_package() {
pkgdesc="The $pkgdesc kernel and modules"
depends=('coreutils' 'kmod' 'initramfs')
depends=(coreutils kmod initramfs)
optdepends=('crda: to set the correct wireless channels of your country'
'linux-firmware: firmware images needed for some devices'
'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
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 $LLVMOPTS -s image_name)" "$modulesdir/vmlinuz"
install -Dm644 "$(make -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"
# 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
echo "Installing modules..."
make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 modules_install
# remove build and source links
rm "${modulesdir}/source"
rm "${modulesdir}/build"
# depmod
depmod -b "${pkgdir}/usr" -F System.map "${kernver}"
rm "$modulesdir"/{source,build}
}
_package-headers() {
pkgdesc="Headers and scripts for building modules for the ${pkgdesc}"
pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
depends=("${pkgbase}=${pkgver}" "pahole")
cd $_srcname
local kernver="$(<version)"
local _builddir="${pkgdir}/usr/lib/modules/${kernver}/build"
local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
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"
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
cp -t "${_builddir}" -a include scripts
# add xfs and shmem for aufs building
mkdir -p "${_builddir}"/{fs/xfs,mm}
# add objtool for external module building and enabled VALIDATION_STACK option
install -Dt "${_builddir}/tools/objtool" tools/objtool/objtool
# required when STACK_VALIDATION is enabled
install -Dt "$builddir/tools/objtool" tools/objtool/objtool
# required when DEBUG_INFO_BTF_MODULES is enabled
install -Dt "${_builddir}/tools/bpf/resolve_btfids" tools/bpf/resolve_btfids/resolve_btfids
install -Dt "$builddir/tools/bpf/resolve_btfids" tools/bpf/resolve_btfids/resolve_btfids
cp -t "${_builddir}/arch/x86" -a "arch/x86/include"
install -Dt "${_builddir}/arch/x86/kernel" -m644 "arch/x86/kernel/asm-offsets.s"
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
install -Dt "${_builddir}/drivers/md" -m644 drivers/md/*.h
install -Dt "${_builddir}/net/mac80211" -m644 net/mac80211/*.h
install -Dt "$builddir/drivers/md" -m644 drivers/md/*.h
install -Dt "$builddir/net/mac80211" -m644 net/mac80211/*.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/13146
install -Dt "$builddir/drivers/media/i2c" -m644 drivers/media/i2c/msp3400-driver.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
# 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
# copy in Kconfig files
find . -name Kconfig\* -exec install -Dm644 {} "${_builddir}/{}" \;
# https://bugs.archlinux.org/task/71392
install -Dt "$builddir/drivers/iio/common/hid-sensors" -m644 drivers/iio/common/hid-sensors/*.h
# 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}"
echo "Installing 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"
done
# remove files already in linux-docs package
rm -r "${_builddir}/Documentation"
echo "Removing documentation..."
rm -r "$builddir/Documentation"
# remove broken symlinks
find -L "${_builddir}" -type l -printf 'Removing %P\n' -delete
echo "Removing broken symlinks..."
find -L "$builddir" -type l -printf 'Removing %P\n' -delete
# remove loose objects"
find "${_builddir}" -type f -name '*.o' -printf 'Removing %P\n' -delete
echo "Removing loose objects..."
find "$builddir" -type f -name '*.o' -printf 'Removing %P\n' -delete
# strip scripts directory
echo -e "\n${TB}* STRIPPING${TN}"
echo "Stripping build tools..."
local file
while read -rd '' file; do
case "$(file -bi "$file")" in
@ -658,30 +637,28 @@ _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)
strip -v $STRIP_STATIC "${_builddir}/vmlinux"
echo "Stripping vmlinux..."
strip -v $STRIP_STATIC "$builddir/vmlinux"
echo -e "\n${TB}* SYMLINKING${TN}"
echo "Adding symlink..."
mkdir -p "$pkgdir/usr/src"
ln -sr "$_builddir" "$pkgdir/usr/src/$pkgbase"
ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
}
pkgname=("$pkgbase" "$pkgbase-headers")
for _p in "${pkgname[@]}"; do
eval "package_$_p() {
$(declare -f "_package${_p#$pkgbase}")
_package${_p#$pkgbase}
$(declare -f "_package${_p#$pkgbase}")
_package${_p#$pkgbase}
}"
done
md5sums=('121e4f65cf16ff76527020ea596fa431'
md5sums=('fd00badc3b53d42da3d84a7cf6f53f17'
'6048a8eb052a7b2a22b4ab159278b903'
'76b9d9fa00184d10e7949bb948ca846d'
'3d8d1eeebba7d038f6d890619233e605'
'd6feae0f2dd1b24a853d335da003cb51'
'194c8e20ad30973c32159cb23f3be4c9'
'2faaa79055263c1cdeeaa2896e641696'
'80e419d6847d4122a23a141fd3a40e52'
@ -689,19 +666,18 @@ md5sums=('121e4f65cf16ff76527020ea596fa431'
'b5b3d9d1cefc3955a82ec895f891abf3'
'e9dff9b551b8fa7c0b47ae5ac0b16365'
'9f86c3b9e6271cfc4440864a6857b256'
'0a353926bf4a790374e0f946a7039b40'
'd4c38ce51fb9a69aa92ad9b9e0199122'
'a687c26c262ccb9ad7cb54697a1476bc'
'2249b7ca0a7dfb0b2f835a8cc4058f1e'
'a35a6dea9bc12029b3a837d86d4b842a'
'80920e501b9b87bfe587edff445e6efe'
'231fa80a33e7a926ba832d3bd66d2ce6'
'bf010dff1d7a48191d491eba2dde1227'
'b7867c9203f9f1ec1e3d6648a4659624'
'34a583709ee18ad075f497a1733aa8db'
'be1e00d93e9c2ba91ee6017b82e64194'
'28dcc1fe3029c6c316773bbcbe82954d'
'0714c9817397ac7568afc3e327a20ddd'
'8fa4524671e6901bbdb47aaf8ecc0de8'
'12ad5085b7f01793980f137f2c9451cb'
'167a4267269e6a709c54e7b9ea8bf8d5'
'bf58290793d3a095ef95fb1fac2de89a'
'cb9384ce179d08be6c90df6d0a0977a1'
'1613d4689c58d19417a9cd7177f6454b'
'6bb03b7a1b9207aaf77fb886d42bab74'
'21c98f19e883879dd3336c1fa143fd31')