diff options
-rw-r--r-- | .SRCINFO | 18 | ||||
-rw-r--r-- | PKGBUILD | 28 | ||||
-rwxr-xr-x | choose-gcc-optimization.sh | 130 |
3 files changed, 93 insertions, 83 deletions
@@ -1,6 +1,6 @@ pkgbase = linux-manjaro-xanmod pkgdesc = Linux Xanmod - pkgver = 5.11.15 + pkgver = 5.12.0 pkgrel = 1 url = http://www.xanmod.org/ arch = x86_64 @@ -17,19 +17,19 @@ pkgbase = linux-manjaro-xanmod makedepends = imagemagick makedepends = git options = !strip - source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz - source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.sign - source = https://github.com/xanmod/linux/releases/download/5.11.15-xanmod1/patch-5.11.15-xanmod1.xz + 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 = choose-gcc-optimization.sh - source = https://gitlab.manjaro.org/packages/core/linux511/-/archive/32a92e224750858e414016656a0e1c1e3e86b63c/linux59-32a92e224750858e414016656a0e1c1e3e86b63c.tar.gz + source = https://gitlab.manjaro.org/packages/core/linux512/-/archive/3153154c3de2123c20231c0a259cbc3a0c1f70e7/linux512-3153154c3de2123c20231c0a259cbc3a0c1f70e7.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 = 04f07b54f0d40adfab02ee6cbd2a942c96728d87c1ef9e120d0cb9ba3fe067b4 + sha256sums = 7d0df6f2bf2384d68d0bd8e1fe3e071d64364dcdc6002e7b5c87c92d48fac366 sha256sums = SKIP - sha256sums = c2b8554405d57c76a06c53196ace136213c2084ec34d6ceb4a20d3c25ba0deb6 - sha256sums = 03bb8b234a67b877a34a8212936ba69d8700c54c7877686cbd9742a536c87134 - sha256sums = 0559e5114de7c69a96eef725167c7891d776320caa683105bbfd2c91ef15386f + sha256sums = 690bd1fe99a57db8d6c3b94cdaf30d5f1a879e5cd879c1186a9919908a1c30e9 + sha256sums = 51742dee57cd15bece152d6527f48af87cb7930f0f6a356d5282f778e7c35b39 + sha256sums = 957d1338c9fda1e0fe7c282ad5fbca8bdaa91eb876d0a4c26ff93dd2c8b0bfe8 sha256sums = 52fc0fcd806f34e774e36570b2a739dbdf337f7ff679b1c1139bee54d03301eb pkgname = linux-manjaro-xanmod @@ -1,6 +1,6 @@ # Maintainer: ANDRoid7890 <andrey.android7890@gmail.com> -# https://gitlab.manjaro.org/packages/core/linux511 +# https://gitlab.manjaro.org/packages/core/linux512 # # Maintainer: Philip Müller # Maintainer: Bernhard Landauer @@ -64,8 +64,8 @@ _makenconfig= pkgbase=linux-manjaro-xanmod pkgname=("${pkgbase}" "${pkgbase}-headers") -_major=5.11 -pkgver=${_major}.15 +_major=5.12 +pkgver=${_major}.0 _branch=5.x xanmod=1 pkgrel=1 @@ -73,7 +73,7 @@ pkgdesc='Linux Xanmod' url="http://www.xanmod.org/" arch=(x86_64) -__commit="32a92e224750858e414016656a0e1c1e3e86b63c" # 5.11.15-1 +__commit="3153154c3de2123c20231c0a259cbc3a0c1f70e7" # 5.12.0-1 license=(GPL2) makedepends=( @@ -85,7 +85,7 @@ _srcname="linux-${pkgver}-xanmod${xanmod}" source=("https://cdn.kernel.org/pub/linux/kernel/v${_branch}/linux-${_major}.tar."{xz,sign} "https://github.com/xanmod/linux/releases/download/${pkgver}-xanmod${xanmod}/patch-${pkgver}-xanmod${xanmod}.xz" choose-gcc-optimization.sh - "https://gitlab.manjaro.org/packages/core/linux511/-/archive/${__commit}/linux59-${__commit}.tar.gz") + "https://gitlab.manjaro.org/packages/core/linux512/-/archive/${__commit}/linux512-${__commit}.tar.gz") #"patch-${pkgver}-xanmod${xanmod}.xz::https://sourceforge.net/projects/xanmod/files/releases/stable/${pkgver}-xanmod${xanmod}/patch-${pkgver}-xanmod${xanmod}.xz/download" # Archlinux patches @@ -95,11 +95,11 @@ for _patch in ${_patches[@]}; do source+=("${_patch}::https://git.archlinux.org/svntogit/packages.git/plain/trunk/${_patch}?h=packages/linux&id=${_commit}") done -sha256sums=('04f07b54f0d40adfab02ee6cbd2a942c96728d87c1ef9e120d0cb9ba3fe067b4' # kernel tar.xz +sha256sums=('7d0df6f2bf2384d68d0bd8e1fe3e071d64364dcdc6002e7b5c87c92d48fac366' # kernel tar.xz 'SKIP' # tar.sign - 'c2b8554405d57c76a06c53196ace136213c2084ec34d6ceb4a20d3c25ba0deb6' # xanmod - '03bb8b234a67b877a34a8212936ba69d8700c54c7877686cbd9742a536c87134' # choose-gcc-optimization.sh - '0559e5114de7c69a96eef725167c7891d776320caa683105bbfd2c91ef15386f' # manjaro + '690bd1fe99a57db8d6c3b94cdaf30d5f1a879e5cd879c1186a9919908a1c30e9' # xanmod + '51742dee57cd15bece152d6527f48af87cb7930f0f6a356d5282f778e7c35b39' # choose-gcc-optimization.sh + '957d1338c9fda1e0fe7c282ad5fbca8bdaa91eb876d0a4c26ff93dd2c8b0bfe8' # manjaro '52fc0fcd806f34e774e36570b2a739dbdf337f7ff679b1c1139bee54d03301eb') validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linux Torvalds @@ -139,15 +139,15 @@ prepare() { done # Manjaro patches - rm ../linux511-$__commit/0103-futex.patch # remove conflicting ones - rm ../linux511-$__commit/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-CLONE_NEWUSER.patch + rm ../linux512-$__commit/0103-futex.patch # remove conflicting ones + rm ../linux512-$__commit/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-CLONE_NEWUSER.patch local _patch - for _patch in ../linux511-$__commit/*; do + for _patch in ../linux512-$__commit/*; do [[ $_patch = *.patch ]] || continue msg2 "Applying patch: $_patch..." - patch -Np1 < "../linux511-$__commit/$_patch" + patch -Np1 < "../linux512-$__commit/$_patch" done - git apply -p1 < "../linux511-$__commit/0513-bootsplash.gitpatch" + git apply -p1 < "../linux512-$__commit/0513-bootsplash.gitpatch" scripts/config --enable CONFIG_BOOTSPLASH diff --git a/choose-gcc-optimization.sh b/choose-gcc-optimization.sh index 1a537df29334..e45a21084594 100755 --- a/choose-gcc-optimization.sh +++ b/choose-gcc-optimization.sh @@ -25,37 +25,42 @@ cat << EOF 12) AMD Family 15h (Excavator) 13) AMD Family 17h (Zen) 14) AMD Family 17h (Zen 2) - 15) Transmeta Crusoe - 16) Transmeta Efficeon - 17) IDT Winchip C6 - 18) Winchip-2/Winchip-2A/Winchip-3 - 19) AMD Elan - 20) Geode GX1 (Cyrix MediaGX) - 21) AMD Geode GX and LX - 22) Cyrix III or C3 - 23) VIA C3 "Nehemiah" - 24) VIA C7 - 25) Intel Pentium 4, Pentium D and older Nocona/Dempsey Xeon CPUs with Intel 64bit - 26) Intel Atom - 27) Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and 53xx) - 28) Intel 1st Gen Core i3/i5/i7-family (Nehalem) - 29) Intel 1.5 Gen Core i3/i5/i7-family (Westmere) - 30) Intel Silvermont - 31) Intel Goldmont (Apollo Lake and Denverton) - 32) Intel Goldmont Plus (Gemini Lake) - 33) Intel 2nd Gen Core i3/i5/i7-family (Sandybridge) - 34) Intel 3rd Gen Core i3/i5/i7-family (Ivybridge) - 35) Intel 4th Gen Core i3/i5/i7-family (Haswell) - 36) Intel 5th Gen Core i3/i5/i7-family (Broadwell) - 37) Intel 6th Gen Core i3/i5/i7-family (Skylake) - 38) Intel 6th Gen Core i7/i9-family (Skylake X) - 39) Intel 8th Gen Core i3/i5/i7-family (Cannon Lake) - 40) Intel 8th Gen Core i7/i9-family (Ice Lake) - 41) Xeon processors in the Cascade Lake family - 42) Intel Xeon (Cooper Lake) - 43) Intel 3rd Gen 10nm++ i3/i5/i7/i9-family (Tiger Lake) + 15) AMD Family 19h Zen 3 processors (Zen 3) + 16) Transmeta Crusoe + 17) Transmeta Efficeon + 18) IDT Winchip C6 + 19) Winchip-2/Winchip-2A/Winchip-3 + 20) AMD Elan + 21) Geode GX1 (Cyrix MediaGX) + 22) AMD Geode GX and LX + 23) Cyrix III or C3 + 24) VIA C3 "Nehemiah" + 25) VIA C7 + 26) Intel Pentium 4, Pentium D and older Nocona/Dempsey Xeon CPUs with Intel 64bit + 27) Intel Atom + 28) Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and 53xx) + 29) Intel 1st Gen Core i3/i5/i7-family (Nehalem) + 30) Intel 1.5 Gen Core i3/i5/i7-family (Westmere) + 31) Intel Silvermont + 32) Intel Goldmont (Apollo Lake and Denverton) + 33) Intel Goldmont Plus (Gemini Lake) + 34) Intel 2nd Gen Core i3/i5/i7-family (Sandybridge) + 35) Intel 3rd Gen Core i3/i5/i7-family (Ivybridge) + 36) Intel 4th Gen Core i3/i5/i7-family (Haswell) + 37) Intel 5th Gen Core i3/i5/i7-family (Broadwell) + 38) Intel 6th Gen Core i3/i5/i7-family (Skylake) + 39) Intel 6th Gen Core i7/i9-family (Skylake X) + 40) Intel 8th Gen Core i3/i5/i7-family (Cannon Lake) + 41) Intel 8th Gen Core i7/i9-family (Ice Lake) + 42) Xeon processors in the Cascade Lake family + 43) Intel Xeon (Cooper Lake) + 44) Intel 3rd Gen 10nm++ i3/i5/i7/i9-family (Tiger Lake) + 45) Intel Sapphire Rapids + 46) Intel Rocket Lake + 47) Intel Alder Lake - 99) Native optimizations autodetected by GCC + 98) Intel-Native optimizations autodetected by GCC + 99) AMD-Native optimizations autodetected by GCC 0) Generic (default) @@ -79,36 +84,41 @@ case $answer in 12) Microarchitecture=CONFIG_MEXCAVATOR ;; 13) Microarchitecture=CONFIG_MZEN ;; 14) Microarchitecture=CONFIG_MZEN2 ;; - 15) Microarchitecture=CONFIG_MCRUSOE ;; - 16) Microarchitecture=CONFIG_MEFFICEON ;; - 17) Microarchitecture=CONFIG_MWINCHIPC6 ;; - 18) Microarchitecture=CONFIG_MWINCHIP3D ;; - 19) Microarchitecture=CONFIG_MELAN ;; - 20) Microarchitecture=CONFIG_MGEODEGX1 ;; - 21) Microarchitecture=CONFIG_MGEODE_LX ;; - 22) Microarchitecture=CONFIG_MCYRIXIII ;; - 23) Microarchitecture=CONFIG_MVIAC3_2 ;; - 24) Microarchitecture=CONFIG_MVIAC7 ;; - 25) Microarchitecture=CONFIG_MPSC ;; - 26) Microarchitecture=CONFIG_MATOM ;; - 27) Microarchitecture=CONFIG_MCORE2 ;; - 28) Microarchitecture=CONFIG_MNEHALEM ;; - 29) Microarchitecture=CONFIG_MWESTMERE ;; - 30) Microarchitecture=CONFIG_MSILVERMONT ;; - 31) Microarchitecture=CONFIG_MGOLDMONT ;; - 32) Microarchitecture=CONFIG_MGOLDMONTPLUS ;; - 33) Microarchitecture=CONFIG_MSANDYBRIDGE ;; - 34) Microarchitecture=CONFIG_MIVYBRIDGE ;; - 35) Microarchitecture=CONFIG_MHASWELL ;; - 36) Microarchitecture=CONFIG_MBROADWELL ;; - 37) Microarchitecture=CONFIG_MSKYLAKE ;; - 38) Microarchitecture=CONFIG_MSKYLAKEX ;; - 39) Microarchitecture=CONFIG_MCANNONLAKE ;; - 40) Microarchitecture=CONFIG_MICELAKE ;; - 41) Microarchitecture=CONFIG_MCASCADELAKE ;; - 42) Microarchitecture=CONFIG_MCOOPERLAKE ;; - 43) Microarchitecture=CONFIG_MTIGERLAKE ;; - 99) Microarchitecture=CONFIG_MNATIVE ;; + 15) Microarchitecture=CONFIG_MZEN3 ;; + 16) Microarchitecture=CONFIG_MCRUSOE ;; + 17) Microarchitecture=CONFIG_MEFFICEON ;; + 18) Microarchitecture=CONFIG_MWINCHIPC6 ;; + 19) Microarchitecture=CONFIG_MWINCHIP3D ;; + 20) Microarchitecture=CONFIG_MELAN ;; + 21) Microarchitecture=CONFIG_MGEODEGX1 ;; + 22) Microarchitecture=CONFIG_MGEODE_LX ;; + 23) Microarchitecture=CONFIG_MCYRIXIII ;; + 24) Microarchitecture=CONFIG_MVIAC3_2 ;; + 25) Microarchitecture=CONFIG_MVIAC7 ;; + 26) Microarchitecture=CONFIG_MPSC ;; + 27) Microarchitecture=CONFIG_MATOM ;; + 28) Microarchitecture=CONFIG_MCORE2 ;; + 29) Microarchitecture=CONFIG_MNEHALEM ;; + 30) Microarchitecture=CONFIG_MWESTMERE ;; + 31) Microarchitecture=CONFIG_MSILVERMONT ;; + 32) Microarchitecture=CONFIG_MGOLDMONT ;; + 33) Microarchitecture=CONFIG_MGOLDMONTPLUS ;; + 34) Microarchitecture=CONFIG_MSANDYBRIDGE ;; + 35) Microarchitecture=CONFIG_MIVYBRIDGE ;; + 36) Microarchitecture=CONFIG_MHASWELL ;; + 37) Microarchitecture=CONFIG_MBROADWELL ;; + 38) Microarchitecture=CONFIG_MSKYLAKE ;; + 39) Microarchitecture=CONFIG_MSKYLAKEX ;; + 40) Microarchitecture=CONFIG_MCANNONLAKE ;; + 41) Microarchitecture=CONFIG_MICELAKE ;; + 42) Microarchitecture=CONFIG_MCASCADELAKE ;; + 43) Microarchitecture=CONFIG_MCOOPERLAKE ;; + 44) Microarchitecture=CONFIG_MTIGERLAKE ;; + 45) Microarchitecture=CONFIG_MSAPPHIRERAPIDS ;; + 46) Microarchitecture=CONFIG_MROCKETLAKE ;; + 47) Microarchitecture=CONFIG_MALDERLAKE ;; + 98) Microarchitecture=CONFIG_MNATIVE_INTEL ;; + 99) Microarchitecture=CONFIG_MNATIVE_AMD ;; *) default=CONFIG_GENERIC_CPU ;; esac |