Compare commits
3 commits
e6c342ac2d
...
ba0ef2a3bc
| Author | SHA1 | Date | |
|---|---|---|---|
|
ba0ef2a3bc | ||
|
|
ccc6801753 | ||
|
|
7116b256b5 |
5 changed files with 29 additions and 29 deletions
|
|
@ -9,7 +9,7 @@
|
|||
"linux-xanmod-edge": {
|
||||
"url": "https://aur.archlinux.org/linux-xanmod-edge.git",
|
||||
"branch": "master",
|
||||
"revision": "4ebb83232bc4d7bc16399c5ae49c0a512dcdea95"
|
||||
"revision": "10e072fb41af151e1962a6606fb1376818b9e85c"
|
||||
},
|
||||
"proton-ge-custom": {
|
||||
"url": "https://aur.archlinux.org/proton-ge-custom.git",
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
"zfs-dkms-git": {
|
||||
"url": "https://aur.archlinux.org/zfs-dkms-git.git",
|
||||
"branch": "master",
|
||||
"revision": "80cc019ebf648aca56a4e9fbd273f575d2396465"
|
||||
"revision": "690ffb6138e2e9283abb5c8e3358ee7243955ff7"
|
||||
},
|
||||
"zfs-utils": {
|
||||
"url": "https://aur.archlinux.org/zfs-utils.git",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
pkgbase = linux-xanmod-edge
|
||||
pkgdesc = Linux Xanmod - Latest Mainline (EDGE)
|
||||
pkgver = 6.0.0
|
||||
pkgver = 6.0.5
|
||||
pkgrel = 1
|
||||
url = http://www.xanmod.org/
|
||||
arch = x86_64
|
||||
|
|
@ -15,13 +15,13 @@ pkgbase = linux-xanmod-edge
|
|||
options = !strip
|
||||
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.tar.xz
|
||||
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.tar.sign
|
||||
source = https://github.com/xanmod/linux/releases/download/6.0.0-xanmod1/patch-6.0.0-xanmod1.xz
|
||||
source = https://github.com/xanmod/linux/releases/download/6.0.5-xanmod1/patch-6.0.5-xanmod1.xz
|
||||
source = choose-gcc-optimization.sh
|
||||
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
|
||||
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
|
||||
sha256sums = 5c2443a5538de52688efb55c27ab0539c1f5eb58c0cfd16a2b9fbb08fd81788e
|
||||
sha256sums = SKIP
|
||||
sha256sums = c4c9ceae47e1809d2e32ef5980f4e9410777273eb6d1cae67788367a2a2d5cd4
|
||||
sha256sums = 267d9ad9422012e963a17666f8315186cd87b17e8d520597f6dc3ee4eb50ed7c
|
||||
sha256sums = dda2e928f3b02c28e71d4e99f90b499b4c99a265d30fceec7dc1dd7082afc285
|
||||
|
||||
pkgname = linux-xanmod-edge
|
||||
|
|
|
|||
|
|
@ -31,14 +31,15 @@ if [ -z ${use_tracers+x} ]; then
|
|||
use_tracers=y
|
||||
fi
|
||||
|
||||
## NOTICE: clang config is not ready yet in 5.17.x
|
||||
# Unique compiler supported upstream is GCC
|
||||
## Choose between GCC and CLANG config (default is GCC)
|
||||
if [ -z ${_compiler+x} ] || [ "$_compiler" = "clang" ]; then
|
||||
_compiler=gcc
|
||||
## Use the environment variable "_compiler=clang"
|
||||
if [ "${_compiler}" = "clang" ]; then
|
||||
_compiler_flags="CC=clang HOSTCC=clang LLVM=1 LLVM_IAS=1"
|
||||
fi
|
||||
|
||||
# Choose between the 3 main configs for EDGE branch. Default x86-64-v2 which use CONFIG_GENERIC_CPU2:
|
||||
# Possible values: config_x86-64 / config_x86-64-v2 (default) / config_x86-64-v3
|
||||
# Choose between the 4 main configs for EDGE branch. Default x86-64-v2 which use CONFIG_GENERIC_CPU2:
|
||||
# Possible values: config_x86-64 / config_x86-64-v2 (default) / config_x86-64-v3 / config_x86-64-v4
|
||||
# This will be overwritten by selecting any option in microarchitecture script
|
||||
# Source files: https://github.com/xanmod/linux/tree/5.17/CONFIGS/xanmod/gcc
|
||||
if [ -z ${_config+x} ]; then
|
||||
|
|
@ -71,7 +72,7 @@ fi
|
|||
|
||||
pkgbase=linux-xanmod-edge
|
||||
_major=6.0
|
||||
pkgver=${_major}.0
|
||||
pkgver=${_major}.5
|
||||
_branch=6.x
|
||||
xanmod=1
|
||||
pkgrel=${xanmod}
|
||||
|
|
@ -108,7 +109,7 @@ done
|
|||
|
||||
sha256sums=('5c2443a5538de52688efb55c27ab0539c1f5eb58c0cfd16a2b9fbb08fd81788e'
|
||||
'SKIP'
|
||||
'c4c9ceae47e1809d2e32ef5980f4e9410777273eb6d1cae67788367a2a2d5cd4'
|
||||
'267d9ad9422012e963a17666f8315186cd87b17e8d520597f6dc3ee4eb50ed7c'
|
||||
'dda2e928f3b02c28e71d4e99f90b499b4c99a265d30fceec7dc1dd7082afc285')
|
||||
|
||||
export KBUILD_BUILD_HOST=${KBUILD_BUILD_HOST:-archlinux}
|
||||
|
|
@ -137,12 +138,11 @@ prepare() {
|
|||
done
|
||||
|
||||
# Applying configuration
|
||||
cp -vf CONFIGS/xanmod/${_compiler}/${_config} .config
|
||||
cp -vf CONFIGS/xanmod/gcc/${_config} .config
|
||||
# enable LTO_CLANG_THIN
|
||||
if [ "${_compiler}" = "clang" ]; then
|
||||
scripts/config --disable LTO_CLANG_FULL
|
||||
scripts/config --enable LTO_CLANG_THIN
|
||||
_LLVM=1
|
||||
fi
|
||||
|
||||
# CONFIG_STACK_VALIDATION gives better stack traces. Also is enabled in all official kernel packages by Archlinux team
|
||||
|
|
@ -202,20 +202,20 @@ prepare() {
|
|||
if [ "$_localmodcfg" = "y" ]; then
|
||||
if [ -f $HOME/.config/modprobed.db ]; then
|
||||
msg2 "Running Steven Rostedt's make localmodconfig now"
|
||||
make LLVM=$_LLVM LLVM_IAS=$_LLVM LSMOD=$HOME/.config/modprobed.db localmodconfig
|
||||
make ${_compiler_flags} LSMOD=$HOME/.config/modprobed.db localmodconfig
|
||||
else
|
||||
msg2 "No modprobed.db data found"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
make LLVM=$_LLVM LLVM_IAS=$_LLVM olddefconfig
|
||||
make ${_compiler_flags} olddefconfig
|
||||
|
||||
make -s kernelrelease > version
|
||||
msg2 "Prepared %s version %s" "$pkgbase" "$(<version)"
|
||||
|
||||
if [ "$_makenconfig" = "y" ]; then
|
||||
make LLVM=$_LLVM LLVM_IAS=$_LLVM nconfig
|
||||
make ${_compiler_flags} nconfig
|
||||
fi
|
||||
|
||||
# save configuration for later reuse
|
||||
|
|
@ -224,7 +224,7 @@ prepare() {
|
|||
|
||||
build() {
|
||||
cd linux-${_major}
|
||||
make LLVM=$_LLVM LLVM_IAS=$_LLVM all
|
||||
make ${_compiler_flags} all
|
||||
}
|
||||
|
||||
_package() {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
pkgbase = zfs-dkms-git
|
||||
pkgdesc = Kernel modules for the Zettabyte File System.
|
||||
pkgver = 2.1.99.r1389.g48cf170d5a
|
||||
pkgver = 2.1.99.r1548.gc23738c70e
|
||||
pkgrel = 1
|
||||
epoch = 2
|
||||
url = https://zfsonlinux.org/
|
||||
|
|
@ -8,9 +8,9 @@ pkgbase = zfs-dkms-git
|
|||
groups = zfs-git
|
||||
license = CDDL
|
||||
makedepends = git
|
||||
provides = ZFS-MODULE=2.1.99.r1389.g48cf170d5a
|
||||
provides = SPL-MODULE=2.1.99.r1389.g48cf170d5a
|
||||
provides = zfs-dkms=2.1.99.r1389.g48cf170d5a
|
||||
provides = ZFS-MODULE=2.1.99.r1548.gc23738c70e
|
||||
provides = SPL-MODULE=2.1.99.r1548.gc23738c70e
|
||||
provides = zfs-dkms=2.1.99.r1548.gc23738c70e
|
||||
provides = spl-dkms
|
||||
conflicts = zfs-dkms
|
||||
conflicts = spl-dkms
|
||||
|
|
@ -19,9 +19,8 @@ pkgbase = zfs-dkms-git
|
|||
source = 0001-only-build-the-module-in-dkms.conf.patch
|
||||
sha256sums = SKIP
|
||||
sha256sums = 539f325e56443554f9b87baff33948b91a280ec1daadcb0c636b105252fcd0f5
|
||||
b2sums = SKIP
|
||||
b2sums = a8ab5da81d214e7801f0f8cdf77c076c714a3f17292df15ca35fcf7aef2c4d505348797e3b1da7590ea303ff488490ddba49e6f9e3f8a0bcc975894d51d97c2b
|
||||
|
||||
pkgname = zfs-dkms-git
|
||||
depends = zfs-utils-git=2:2.1.99.r1389.g48cf170d5a
|
||||
depends = zfs-utils-git=2:2.1.99.r1548.gc23738c70e
|
||||
depends = dkms
|
||||
depends = libcrypto.so=1.1
|
||||
|
|
|
|||
|
|
@ -2,9 +2,12 @@
|
|||
# Contributor: Yurii Kolesnykov <root@yurikoles.com>
|
||||
# Contributor: Eli Schwartz <eschwartz@archlinux.org>
|
||||
# Contributor: Iacopo Isimbaldi <isiachi@rhye.it>
|
||||
#
|
||||
# PRs are welcome: https://github.com/yurikoles-aur/zfs-dkms-git
|
||||
#
|
||||
|
||||
pkgname=zfs-dkms-git
|
||||
pkgver=2.1.99.r1452.ga6ccb36b94
|
||||
pkgver=2.1.99.r1577.gb0657a59ab
|
||||
pkgrel=1
|
||||
pkgdesc='Kernel modules for the Zettabyte File System.'
|
||||
arch=('x86_64')
|
||||
|
|
@ -19,8 +22,6 @@ source=("git+https://github.com/openzfs/zfs.git"
|
|||
"0001-only-build-the-module-in-dkms.conf.patch")
|
||||
sha256sums=('SKIP'
|
||||
'539f325e56443554f9b87baff33948b91a280ec1daadcb0c636b105252fcd0f5')
|
||||
b2sums=('SKIP'
|
||||
'a8ab5da81d214e7801f0f8cdf77c076c714a3f17292df15ca35fcf7aef2c4d505348797e3b1da7590ea303ff488490ddba49e6f9e3f8a0bcc975894d51d97c2b')
|
||||
|
||||
pkgver() {
|
||||
cd zfs
|
||||
|
|
@ -54,7 +55,7 @@ build() {
|
|||
}
|
||||
|
||||
package() {
|
||||
depends=("zfs-utils-git=${pkgver}" 'dkms')
|
||||
depends=("zfs-utils-git=${epoch}:${pkgver}" 'dkms' 'libcrypto.so=1.1')
|
||||
dkmsdir="${pkgdir}/usr/src/zfs-${pkgver}"
|
||||
install -d "${dkmsdir}"
|
||||
cp -a zfs/. "${dkmsdir}"
|
||||
|
|
|
|||
Loading…
Reference in a new issue