mirror of
https://github.com/archlinux/aur.git
synced 2026-02-10 15:29:38 +01:00
Sync with CachyOS
Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
This commit is contained in:
Piotr Gorski
parent
003012f637
commit
aa4d04c04c
2 changed files with 8 additions and 50 deletions
8
.SRCINFO
8
.SRCINFO
|
|
@ -1,6 +1,6 @@
|
|||
pkgbase = linux-cachyos-eevdf
|
||||
pkgdesc = Linux EEVDF scheduler + Cachy Sauce Kernel by CachyOS with other patches and improvements
|
||||
pkgver = 6.18.1
|
||||
pkgver = 6.18.2
|
||||
pkgrel = 1
|
||||
url = https://github.com/CachyOS/linux-cachyos
|
||||
arch = x86_64
|
||||
|
|
@ -21,12 +21,12 @@ pkgbase = linux-cachyos-eevdf
|
|||
options = !strip
|
||||
options = !debug
|
||||
options = !lto
|
||||
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.18.1.tar.xz
|
||||
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.18.2.tar.xz
|
||||
source = config
|
||||
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.18/all/0001-cachyos-base-all.patch
|
||||
b2sums = 6ea6a7235ee59f876b015c6fda0f2772980c6ea58240689ce581182262387cbef3aed3c95ced66cdb56479cbd83961fbcbdfdff09f049941c3daf047710adb61
|
||||
b2sums = 2e5cae5fe963cf25344ccfe9426d2edab2583b1bb206f6551d60177777595d4c19200e5e3c35ca41b574d25e8fa49013ea086efe05078e7ec2203c77ea420d51
|
||||
b2sums = 4193034f32392fe6c551080b2afab61d7efbb3a7205daf73490a102d2649b1fa54e0e91dcd3b99afd29795dbf11c1d1a17e0f9b7fd9747b90d296977f2a7bb77
|
||||
b2sums = 7b839b9a94345b95a782c380394536e492de16716649e6913ddde6cf82b857873994f88aecb78d3164c87684519fbda69c1a49ce76449baee36c50e9071e0feb
|
||||
b2sums = 7443c57ef50b9f1d17da82cd22cb913d6536c9a37bfb8d4a64771bebf519cb3414a2bd925f47bb02930fe06f7e853a855387eddab9987dfa3bacd6c8f0e895ae
|
||||
|
||||
pkgname = linux-cachyos-eevdf
|
||||
pkgdesc = The Linux EEVDF scheduler + Cachy Sauce Kernel by CachyOS with other patches and improvements kernel and modules
|
||||
|
|
|
|||
50
PKGBUILD
50
PKGBUILD
|
|
@ -112,10 +112,6 @@
|
|||
# If you use ZFS, refrain from building the RT kernel
|
||||
: "${_build_zfs:=no}"
|
||||
|
||||
# Builds the nvidia module and package it into a own base
|
||||
# This does replace the requirement of nvidia-dkms
|
||||
: "${_build_nvidia:=no}"
|
||||
|
||||
# Builds the open nvidia module and package it into a own base
|
||||
# This does replace the requirement of nvidia-open-dkms
|
||||
# Use this only if you have Turing+ GPU
|
||||
|
|
@ -145,7 +141,7 @@ fi
|
|||
|
||||
pkgbase="linux-$_pkgsuffix"
|
||||
_major=6.18
|
||||
_minor=1
|
||||
_minor=2
|
||||
#_minorc=$((_minor+1))
|
||||
#_rcver=rc8
|
||||
pkgver=${_major}.${_minor}
|
||||
|
|
@ -179,7 +175,7 @@ makedepends=(
|
|||
)
|
||||
|
||||
_patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}"
|
||||
_nv_ver=580.119.02
|
||||
_nv_ver=590.48.01
|
||||
_nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}"
|
||||
_nv_open_pkg="NVIDIA-kernel-module-source-${_nv_ver}"
|
||||
source=(
|
||||
|
|
@ -210,11 +206,6 @@ if [ "$_build_zfs" = "yes" ]; then
|
|||
source+=("git+https://github.com/cachyos/zfs.git#commit=7de9800e5ce45d03c797be57a3e959fc914b2adb")
|
||||
fi
|
||||
|
||||
# NVIDIA pre-build module support
|
||||
if [ "$_build_nvidia" = "yes" ]; then
|
||||
source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
|
||||
"${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch")
|
||||
fi
|
||||
|
||||
if [ "$_build_nvidia_open" = "yes" ]; then
|
||||
source+=("https://download.nvidia.com/XFree86/${_nv_open_pkg%"-$_nv_ver"}/${_nv_open_pkg}.tar.xz"
|
||||
|
|
@ -453,14 +444,6 @@ prepare() {
|
|||
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
|
||||
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
|
||||
|
||||
if [ "$_build_nvidia" = "yes" ]; then
|
||||
cd "${srcdir}"
|
||||
sh "${_nv_pkg}.run" --extract-only
|
||||
|
||||
# Use fbdev and modeset as default
|
||||
patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_pkg}/kernel"
|
||||
fi
|
||||
|
||||
if [ "$_build_nvidia_open" = "yes" ]; then
|
||||
patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open"
|
||||
patch -Np1 -i "${srcdir}/0002-Add-IBT-support.patch" -d "${srcdir}/${_nv_open_pkg}/"
|
||||
|
|
@ -495,11 +478,6 @@ build() {
|
|||
SYSSRC="${srcdir}/${_srcname}"
|
||||
SYSOUT="${srcdir}/${_srcname}"
|
||||
)
|
||||
if [ "$_build_nvidia" = "yes" ]; then
|
||||
MODULE_FLAGS+=(NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES')
|
||||
cd "${srcdir}/${_nv_pkg}/kernel"
|
||||
make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules
|
||||
fi
|
||||
|
||||
if [ "$_build_nvidia_open" = "yes" ]; then
|
||||
cd "${srcdir}/${_nv_open_pkg}"
|
||||
|
|
@ -684,25 +662,6 @@ _package-zfs(){
|
|||
# sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${pkgver}-${pkgbase}'/" "$startdir/zfs.install"
|
||||
}
|
||||
|
||||
_package-nvidia(){
|
||||
pkgdesc="nvidia module of ${_nv_ver} driver for the ${pkgbase} kernel"
|
||||
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
|
||||
provides=('NVIDIA-MODULE')
|
||||
conflicts=("$pkgbase-nvidia-open")
|
||||
license=('custom')
|
||||
|
||||
cd "$_srcname"
|
||||
local modulesdir="$pkgdir/usr/lib/modules/$(<version)/extramodules"
|
||||
|
||||
cd "${srcdir}/${_nv_pkg}"
|
||||
install -dm755 "${modulesdir}"
|
||||
install -m644 kernel/*.ko "${modulesdir}"
|
||||
install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 LICENSE
|
||||
|
||||
_sign_modules "${modulesdir}"
|
||||
find "$pkgdir" -name '*.ko' -exec zstd --rm -19 -T0 {} +
|
||||
}
|
||||
|
||||
_package-nvidia-open(){
|
||||
pkgdesc="nvidia open modules of ${_nv_ver} driver for the ${pkgbase} kernel"
|
||||
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
|
||||
|
|
@ -726,7 +685,6 @@ pkgname=("$pkgbase")
|
|||
[ "$_build_debug" = "yes" ] && pkgname+=("$pkgbase-dbg")
|
||||
pkgname+=("$pkgbase-headers")
|
||||
[ "$_build_zfs" = "yes" ] && pkgname+=("$pkgbase-zfs")
|
||||
[ "$_build_nvidia" = "yes" ] && pkgname+=("$pkgbase-nvidia")
|
||||
[ "$_build_nvidia_open" = "yes" ] && pkgname+=("$pkgbase-nvidia-open")
|
||||
for _p in "${pkgname[@]}"; do
|
||||
eval "package_$_p() {
|
||||
|
|
@ -735,6 +693,6 @@ for _p in "${pkgname[@]}"; do
|
|||
}"
|
||||
done
|
||||
|
||||
b2sums=('6ea6a7235ee59f876b015c6fda0f2772980c6ea58240689ce581182262387cbef3aed3c95ced66cdb56479cbd83961fbcbdfdff09f049941c3daf047710adb61'
|
||||
b2sums=('2e5cae5fe963cf25344ccfe9426d2edab2583b1bb206f6551d60177777595d4c19200e5e3c35ca41b574d25e8fa49013ea086efe05078e7ec2203c77ea420d51'
|
||||
'4193034f32392fe6c551080b2afab61d7efbb3a7205daf73490a102d2649b1fa54e0e91dcd3b99afd29795dbf11c1d1a17e0f9b7fd9747b90d296977f2a7bb77'
|
||||
'7b839b9a94345b95a782c380394536e492de16716649e6913ddde6cf82b857873994f88aecb78d3164c87684519fbda69c1a49ce76449baee36c50e9071e0feb')
|
||||
'7443c57ef50b9f1d17da82cd22cb913d6536c9a37bfb8d4a64771bebf519cb3414a2bd925f47bb02930fe06f7e853a855387eddab9987dfa3bacd6c8f0e895ae')
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue