From fbad77d3f0915e75daa2bfb5df100d6d1077dc5d Mon Sep 17 00:00:00 2001 From: xiota Date: Sat, 20 Jan 2024 11:01:19 -0800 Subject: [PATCH] 6.7.1 --- .SRCINFO | 14 +++++++------- PKGBUILD | 26 +++++++++++++++++++------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 6e063e7..673c3cd 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-vfio pkgdesc = Linux - pkgver = 6.7 - pkgrel = 2 + pkgver = 6.7.1 + pkgrel = 1 url = https://www.kernel.org arch = x86_64 license = GPL-2.0-or-later @@ -19,17 +19,17 @@ pkgbase = linux-vfio makedepends = python-sphinx makedepends = texlive-latexextra options = !strip - source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.7.tar.xz - source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.7.tar.sign + source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.7.1.tar.xz + source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.7.1.tar.sign source = config source = 1001-add-acs-overrides.patch source = 1002-i915-vga-arbiter.patch - source = https://github.com/archlinux/linux/releases/download/v6.7-arch1/linux-v6.7-arch1.patch.zst - source = https://github.com/archlinux/linux/releases/download/v6.7-arch1/linux-v6.7-arch1.patch.zst.sig + source = https://github.com/archlinux/linux/releases/download/v6.7-arch3/linux-v6.7-arch3.patch.zst + source = https://github.com/archlinux/linux/releases/download/v6.7-arch3/linux-v6.7-arch3.patch.zst.sig validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E validpgpkeys = 83BC8889351B5DEBBB68416EB8AC08600F108CDF - sha256sums = ef31144a2576d080d8c31698e83ec9f66bf97c677fa2aaf0d5bbb9f3345b1069 + sha256sums = 1ecffa568e86a2202ba5533ad9034bc263a9aa14e189597a94f09b3854ad68c3 sha256sums = SKIP sha256sums = 45a44ff0e957cd562d2ceb60c1c90fc19c19e808209cebb46bfacfccfb56ad96 sha256sums = f342986bd27980c96c952b0dd8103d3e21a942d87f18df1308fab370e20010fb diff --git a/PKGBUILD b/PKGBUILD index abf5799..0d6f320 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -23,8 +23,8 @@ _gitname="linux" _pkgname="$_gitname${_pkgtype:-}" pkgbase="$_pkgname" -pkgver=6.7 -pkgrel=2 +pkgver=6.7.1 +pkgrel=1 pkgdesc='Linux' url='https://www.kernel.org' arch=(x86_64) @@ -53,7 +53,7 @@ source+=( config # the main kernel config file ) sha256sums+=( - 'ef31144a2576d080d8c31698e83ec9f66bf97c677fa2aaf0d5bbb9f3345b1069' + '1ecffa568e86a2202ba5533ad9034bc263a9aa14e189597a94f09b3854ad68c3' 'SKIP' '45a44ff0e957cd562d2ceb60c1c90fc19c19e808209cebb46bfacfccfb56ad96' ) @@ -86,7 +86,7 @@ if [[ ${_build_arch_patch::1} == "t" ]] ; then '2f23be91455e529d16aa2bbf5f2c7fe3d10812749828fc752240c21b2b845849' ) else - _srctag=v$pkgver-arch1 + _srctag=v${pkgver::3}-arch3 _dl_url_arch='https://github.com/archlinux/linux' source+=( $_dl_url_arch/releases/download/$_srctag/linux-$_srctag.patch.zst{,.sig} @@ -102,17 +102,29 @@ if [[ ${_build_clang::1} == "t" ]] ; then makedepends+=(clang llvm lld) export CC=clang - export CXX=clang++ - export LDFLAGS+=" -fuse-ld=lld" - + export LD=ld.lld + export AR=llvm-ar + export NM=llvm-nm + export STRIP=llvm-strip + export OBJCOPY=llvm-objcopy + export OBJDUMP=llvm-objdump + export READELF=llvm-readelf export HOSTCC=clang + export HOSTCXX=clang++ + export HOSTAR=llvm-ar + export HOSTLD=ld.lld export LLVM=1 export LLVM_IAS=1 + + export CXX=clang++ + export LDFLAGS+=" -fuse-ld=lld" fi if [[ "${_build_v3::1}" == "t" ]] ; then export CFLAGS="$(echo "$CFLAGS" | sed -E 's@(\s*-(march|mtune)=\S+\s*)@ @g;s@\s*-O[0-9]\s*@ @g;s@\s+@ @g') -march=x86-64-v3 -mtune=generic -O3" export CXXFLAGS="$(echo "$CXXFLAGS" | sed -E 's@(\s*-(march|mtune)=\S+\s*)@ @g;s@\s*-O[0-9]\s*@ @g;s@\s+@ @g') -march=x86-64-v3 -mtune=generic -O3"} + + export RUSTFLAGS+=" -Ctarget-cpu=x86-64-v3" fi export KBUILD_BUILD_HOST=archlinux