summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorANDRoid78902021-05-24 19:25:16 +0400
committerANDRoid78902021-05-24 19:25:16 +0400
commit0f200063d921d61cd1b06d74e6d95e87d4c187b2 (patch)
tree53b3e8da047758415db76256fb010fa20d882df5
parent55e3cb059559ec53eb25fbe2383fe6f046657418 (diff)
downloadaur-0f200063d921d61cd1b06d74e6d95e87d4c187b2.tar.gz
5.12.6
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD12
-rwxr-xr-xchoose-gcc-optimization.sh7
3 files changed, 19 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d67e86005f8..6badef8df37 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-manjaro-xanmod
pkgdesc = Linux Xanmod
- pkgver = 5.12.0
+ pkgver = 5.12.6
pkgrel = 1
url = http://www.xanmod.org/
arch = x86_64
@@ -19,17 +19,17 @@ pkgbase = linux-manjaro-xanmod
options = !strip
source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz
source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.sign
- source = https://github.com/xanmod/linux/releases/download/5.12.0-xanmod1/patch-5.12.0-xanmod1.xz
+ source = https://github.com/xanmod/linux/releases/download/5.12.6-xanmod1/patch-5.12.6-xanmod1.xz
source = choose-gcc-optimization.sh
- source = https://gitlab.manjaro.org/packages/core/linux512/-/archive/3153154c3de2123c20231c0a259cbc3a0c1f70e7/linux512-3153154c3de2123c20231c0a259cbc3a0c1f70e7.tar.gz
+ source = https://gitlab.manjaro.org/packages/core/linux512/-/archive/5e97ee4d5ba960c3bfd5d79a4b2fb509041f3440/linux512-5e97ee4d5ba960c3bfd5d79a4b2fb509041f3440.tar.gz
source = sphinx-workaround.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/sphinx-workaround.patch?h=packages/linux&id=be7d4710850020de55bce930c83fa80347c02fc3
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
sha256sums = 7d0df6f2bf2384d68d0bd8e1fe3e071d64364dcdc6002e7b5c87c92d48fac366
sha256sums = SKIP
- sha256sums = 690bd1fe99a57db8d6c3b94cdaf30d5f1a879e5cd879c1186a9919908a1c30e9
- sha256sums = 51742dee57cd15bece152d6527f48af87cb7930f0f6a356d5282f778e7c35b39
- sha256sums = 957d1338c9fda1e0fe7c282ad5fbca8bdaa91eb876d0a4c26ff93dd2c8b0bfe8
+ sha256sums = 2bb72c4ac95cfd63abd2890d23fc12a946874114ca1c48c5a75143866821953c
+ sha256sums = 1ac18cad2578df4a70f9346f7c6fccbb62f042a0ee0594817fdef9f2704904ee
+ sha256sums = b9c5aea1781f9caba4d3e0aa37155756c20a98676e4f1d146d3f9fae92b16f3e
sha256sums = 52fc0fcd806f34e774e36570b2a739dbdf337f7ff679b1c1139bee54d03301eb
pkgname = linux-manjaro-xanmod
diff --git a/PKGBUILD b/PKGBUILD
index d6d624a6ec0..def50b49909 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,7 +23,7 @@
## Look inside 'choose-gcc-optimization.sh' to choose your microarchitecture
## Valid numbers between: 0 to 99
## Default is: 0 => generic
-## Good option if your package is for one machine: 99 => native
+## Good option if your package is for one machine: 98 (Intel native) or 99 (AMD native)
if [ -z ${_microarchitecture+x} ]; then
_microarchitecture=0
fi
@@ -65,7 +65,7 @@ _makenconfig=
pkgbase=linux-manjaro-xanmod
pkgname=("${pkgbase}" "${pkgbase}-headers")
_major=5.12
-pkgver=${_major}.0
+pkgver=${_major}.6
_branch=5.x
xanmod=1
pkgrel=1
@@ -73,7 +73,7 @@ pkgdesc='Linux Xanmod'
url="http://www.xanmod.org/"
arch=(x86_64)
-__commit="3153154c3de2123c20231c0a259cbc3a0c1f70e7" # 5.12.0-1
+__commit="5e97ee4d5ba960c3bfd5d79a4b2fb509041f3440" # 5.12.6-1
license=(GPL2)
makedepends=(
@@ -97,9 +97,9 @@ done
sha256sums=('7d0df6f2bf2384d68d0bd8e1fe3e071d64364dcdc6002e7b5c87c92d48fac366' # kernel tar.xz
'SKIP' # tar.sign
- '690bd1fe99a57db8d6c3b94cdaf30d5f1a879e5cd879c1186a9919908a1c30e9' # xanmod
- '51742dee57cd15bece152d6527f48af87cb7930f0f6a356d5282f778e7c35b39' # choose-gcc-optimization.sh
- '957d1338c9fda1e0fe7c282ad5fbca8bdaa91eb876d0a4c26ff93dd2c8b0bfe8' # manjaro
+ '2bb72c4ac95cfd63abd2890d23fc12a946874114ca1c48c5a75143866821953c' # xanmod
+ '1ac18cad2578df4a70f9346f7c6fccbb62f042a0ee0594817fdef9f2704904ee' # choose-gcc-optimization.sh
+ 'b9c5aea1781f9caba4d3e0aa37155756c20a98676e4f1d146d3f9fae92b16f3e' # manjaro
'52fc0fcd806f34e774e36570b2a739dbdf337f7ff679b1c1139bee54d03301eb')
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linux Torvalds
diff --git a/choose-gcc-optimization.sh b/choose-gcc-optimization.sh
index e45a2108459..f10eec54b81 100755
--- a/choose-gcc-optimization.sh
+++ b/choose-gcc-optimization.sh
@@ -59,6 +59,10 @@ cat << EOF
46) Intel Rocket Lake
47) Intel Alder Lake
+ 92) Generic-x86-64-v2 (Nehalem and newer)
+ 93) Generic-x86-64-v3 (Haswell and newer)
+ 94) Generic-x86-64-v4 (AVX512 CPUs)
+
98) Intel-Native optimizations autodetected by GCC
99) AMD-Native optimizations autodetected by GCC
@@ -117,6 +121,9 @@ case $answer in
45) Microarchitecture=CONFIG_MSAPPHIRERAPIDS ;;
46) Microarchitecture=CONFIG_MROCKETLAKE ;;
47) Microarchitecture=CONFIG_MALDERLAKE ;;
+ 92) Microarchitecture=CONFIG_GENERIC_CPU2 ;;
+ 93) Microarchitecture=CONFIG_GENERIC_CPU3 ;;
+ 94) Microarchitecture=CONFIG_GENERIC_CPU4 ;;
98) Microarchitecture=CONFIG_MNATIVE_INTEL ;;
99) Microarchitecture=CONFIG_MNATIVE_AMD ;;
*) default=CONFIG_GENERIC_CPU ;;