summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoan Figueras2020-03-10 22:47:17 +0100
committerJoan Figueras2020-03-10 22:47:17 +0100
commit36474d13f5c24c583728587c2d53d98af0872fdc (patch)
tree8b70d58504d3ab4569b586699f02712063328068
parent8d62577de19bfa32304e0e273b9b37ad8b69229f (diff)
downloadaur-36474d13f5c24c583728587c2d53d98af0872fdc.tar.gz
5.4.24-rt15-xanmod1
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD50
-rwxr-xr-xchoose-gcc-optimization.sh110
3 files changed, 88 insertions, 80 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 302c32fa6bd..f144d837ed6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-xanmod-rt
pkgdesc = Linux Xanmod real-time version
- pkgver = 5.4.17
+ pkgver = 5.4.24
pkgrel = 1
url = http://www.xanmod.org/
arch = x86_64
@@ -16,11 +16,11 @@ pkgbase = linux-xanmod-rt
makedepends = graphviz
makedepends = imagemagick
options = !strip
- source = https://github.com/xanmod/linux/archive/5.4.17-rt9-xanmod.tar.gz
+ source = https://github.com/xanmod/linux/archive/5.4.24-rt15-xanmod1.tar.gz
source = choose-gcc-optimization.sh
source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-CLONE_NEWUSER.patch::https://aur.archlinux.org/cgit/aur.git/plain/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch?h=linux-ck&id=616ec1bb1f2c0fc42b6fb5c20995996897b4f43b
- sha256sums = 5b7591a7a8b0f453ffa4e4077b09bc7d423059a0496e6f3985456b908ace6fef
- sha256sums = 8b2629f6340d4807c113cd9fa308f50f0a8d85df5698bef083e151f06d58f748
+ sha256sums = 16777c5954140bb7a97d203a824b0ee846b8ff7d6d8b02ee1d8d2322ae472d94
+ sha256sums = 2c7369218e81dee86f8ac15bda741b9bb34fa9cefcb087760242277a8207d511
sha256sums = 9c507bdb0062b5b54c6969f7da9ec18b259e06cd26dbe900cfe79a7ffb2713ee
pkgname = linux-xanmod-rt
diff --git a/PKGBUILD b/PKGBUILD
index 895ed7f00ba..676ca03a592 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,13 +11,13 @@
## Example: env _microarchitecture=25 use_numa=n use_tracers=n use_pds=n makepkg -sc
##
## Look inside 'choose-gcc-optimization.sh' to choose your microarchitecture
-## Valid numbers between: 0 to 38
+## Valid numbers between: 0 to 42
## Default is: 0 => generic
-## Good option if your package is for one machine: 38 => native
+## Good option if your package is for one machine: 42 => native
if [ -z ${_microarchitecture+x} ]; then
_microarchitecture=0
fi
-##
+
## Disable NUMA since most users do not have multiple processors. Breaks CUDA/NvEnc.
## Archlinux and Xanmod enable it by default.
## Set variable "use_numa" to: n to disable (possibly increase performance)
@@ -25,7 +25,7 @@ fi
if [ -z ${use_numa+x} ]; then
use_numa=y
fi
-##
+
## For performance you can disable FUNCTION_TRACER/GRAPH_TRACER. Limits debugging and analyzing of the kernel.
## Stock Archlinux and Xanmod have this enabled.
## Set variable "use_tracers" to: n to disable (possibly increase performance)
@@ -33,21 +33,20 @@ fi
if [ -z ${use_tracers+x} ]; then
use_tracers=y
fi
-##
+
## Enable PDS CPU scheduler by default https://gitlab.com/alfredchen/linux-pds
## Set variable "use_pds" to: n to disable (stock Xanmod)
## y to enable
if [ -z ${use_pds+x} ]; then
use_pds=n
fi
-##
+
## Enable CONFIG_USER_NS_UNPRIVILEGED flag https://aur.archlinux.org/cgit/aur.git/tree/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch?h=linux-ck
## Set variable "use_ns" to: n to disable (stock Xanmod)
## y to enable (stock Archlinux)
if [ -z ${use_ns+x} ]; then
use_ns=n
fi
-##
# Compile ONLY used modules to VASTLYreduce the number of modules built
# and the build time.
@@ -64,10 +63,11 @@ fi
### IMPORTANT: Do no edit below this line unless you know what you're doing
pkgbase=linux-xanmod-rt
-pkgver=5.4.17
-xanmod=9
+pkgver=5.4.24
+xanmod=15
pkgrel=1
-_rev=
+_rev=1
+#_commit=129d48ad37bce913f6f5d6c767f997afc6be4c7d
pkgdesc='Linux Xanmod real-time version'
arch=(x86_64)
url="http://www.xanmod.org/"
@@ -79,21 +79,23 @@ makedepends=(
options=('!strip')
_srcname="linux-${pkgver}-rt${xanmod}-xanmod${_rev}"
+#source=(https://github.com/xanmod/linux/archive/${_commit}.zip
source=(https://github.com/xanmod/linux/archive/${pkgver}-rt${xanmod}-xanmod${_rev}.tar.gz
choose-gcc-optimization.sh
'0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-CLONE_NEWUSER.patch::https://aur.archlinux.org/cgit/aur.git/plain/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch?h=linux-ck&id=616ec1bb1f2c0fc42b6fb5c20995996897b4f43b'
)
-sha256sums=('5b7591a7a8b0f453ffa4e4077b09bc7d423059a0496e6f3985456b908ace6fef'
- '8b2629f6340d4807c113cd9fa308f50f0a8d85df5698bef083e151f06d58f748'
+sha256sums=('16777c5954140bb7a97d203a824b0ee846b8ff7d6d8b02ee1d8d2322ae472d94'
+ '2c7369218e81dee86f8ac15bda741b9bb34fa9cefcb087760242277a8207d511'
'9c507bdb0062b5b54c6969f7da9ec18b259e06cd26dbe900cfe79a7ffb2713ee')
-export KBUILD_BUILD_HOST=archlinux
-export KBUILD_BUILD_USER=$pkgbase
-export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
+export KBUILD_BUILD_HOST=${KBUILD_BUILD_HOST:-archlinux}
+export KBUILD_BUILD_USER=${KBUILD_BUILD_USER:-makepkg}
+export KBUILD_BUILD_TIMESTAMP=${KBUILD_BUILD_TIMESTAMP:-$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})}
prepare() {
- cd $_srcname
+ #cd linux-${_commit}
+ cd linux-${pkgver}-rt${xanmod}-xanmod${_rev}
msg2 "Setting version..."
scripts/setlocalversion --save-scmversion
@@ -139,11 +141,6 @@ prepare() {
scripts/config --disable CONFIG_USER_NS_UNPRIVILEGED
fi
- if [ "$use_ns" = "n" ]; then
- msg2 "Disabling CONFIG_USER_NS_UNPRIVILEGED"
- scripts/config --disable CONFIG_USER_NS_UNPRIVILEGED
- fi
-
# Let's user choose microarchitecture optimization in GCC
sh ${srcdir}/choose-gcc-optimization.sh $_microarchitecture
@@ -173,8 +170,9 @@ prepare() {
}
build() {
- cd $_srcname
- make bzImage modules
+ #cd linux-${_commit}
+ cd linux-${pkgver}-rt${xanmod}-xanmod${_rev}
+ make all
}
_package() {
@@ -183,7 +181,8 @@ _package() {
optdepends=('crda: to set the correct wireless channels of your country'
'linux-firmware: firmware images needed for some devices')
- cd $_srcname
+ #cd linux-${_commit}
+ cd linux-${pkgver}-rt${xanmod}-xanmod${_rev}
local kernver="$(<version)"
local modulesdir="$pkgdir/usr/lib/modules/$kernver"
@@ -208,7 +207,8 @@ _package() {
_package-headers() {
pkgdesc="Header files and scripts for building modules for Xanmod Linux kernel"
- cd $_srcname
+ #cd linux-${_commit}
+ cd linux-${pkgver}-rt${xanmod}-xanmod${_rev}
local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
msg2 "Installing build files..."
diff --git a/choose-gcc-optimization.sh b/choose-gcc-optimization.sh
index f5d6af8110e..ccf182e9119 100755
--- a/choose-gcc-optimization.sh
+++ b/choose-gcc-optimization.sh
@@ -3,7 +3,7 @@
. /usr/share/makepkg/util/message.sh
colorize
-Detect_CPU=$(gcc -c -Q -march=native --help=target | grep march | awk '{print $2}')
+Detect_CPU=$(gcc -c -Q -march=native --help=target | grep march | awk '{print $2}' | head -1)
msg "Detected CPU architecture: $Detect_CPU"
@@ -24,32 +24,36 @@ cat << EOF
11) AMD Family 15h (Steamroller)
12) AMD Family 15h (Excavator)
13) AMD Family 17h (Zen)
- 14) Transmeta Crusoe
- 15) Transmeta Efficeon
- 16) IDT Winchip C6
- 17) Winchip-2/Winchip-2A/Winchip-3
- 18) AMD Elan
- 19) Geode GX1 (Cyrix MediaGX)
- 20) AMD Geode GX and LX
- 21) Cyrix III or C3
- 22) VIA C3 "Nehemiah"
- 23) VIA C7
- 24) Intel Pentium 4, Pentium D and older Nocona/Dempsey Xeon CPUs with Intel 64bit
- 25) Intel Atom
- 26) Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and 53xx)
- 27) Intel 1st Gen Core i3/i5/i7-family (Nehalem)
- 28) Intel 1.5 Gen Core i3/i5/i7-family (Westmere)
- 29) Intel Silvermont
- 30) Intel 2nd Gen Core i3/i5/i7-family (Sandybridge)
- 31) Intel 3rd Gen Core i3/i5/i7-family (Ivybridge)
- 32) Intel 4th Gen Core i3/i5/i7-family (Haswell)
- 33) Intel 5th Gen Core i3/i5/i7-family (Broadwell)
- 34) Intel 6th Gen Core i3/i5/i7-family (Skylake)
- 35) Intel 6th Gen Core i7/i9-family (Skylake X)
- 36) Intel 8th Gen Core i3/i5/i7-family (Cannon Lake)
- 37) Intel 8th Gen Core i7/i9-family (Ice Lake)
+ 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
- 38) Native optimizations autodetected by GCC
+ 42) Native optimizations autodetected by GCC
0) Generic (default)
@@ -72,31 +76,35 @@ case $answer in
11) Microarchitecture=CONFIG_MSTEAMROLLER ;;
12) Microarchitecture=CONFIG_MEXCAVATOR ;;
13) Microarchitecture=CONFIG_MZEN ;;
- 14) Microarchitecture=CONFIG_MCRUSOE ;;
- 15) Microarchitecture=CONFIG_MEFFICEON ;;
- 16) Microarchitecture=CONFIG_MWINCHIPC6 ;;
- 17) Microarchitecture=CONFIG_MWINCHIP3D ;;
- 18) Microarchitecture=CONFIG_MELAN ;;
- 19) Microarchitecture=CONFIG_MGEODEGX1 ;;
- 20) Microarchitecture=CONFIG_MGEODE_LX ;;
- 21) Microarchitecture=CONFIG_MCYRIXIII ;;
- 22) Microarchitecture=CONFIG_MVIAC3_2 ;;
- 23) Microarchitecture=CONFIG_MVIAC7 ;;
- 24) Microarchitecture=CONFIG_MPSC ;;
- 25) Microarchitecture=CONFIG_MATOM ;;
- 26) Microarchitecture=CONFIG_MCORE2 ;;
- 27) Microarchitecture=CONFIG_MNEHALEM ;;
- 28) Microarchitecture=CONFIG_MWESTMERE ;;
- 29) Microarchitecture=CONFIG_MSILVERMONT ;;
- 30) Microarchitecture=CONFIG_MSANDYBRIDGE ;;
- 31) Microarchitecture=CONFIG_MIVYBRIDGE ;;
- 32) Microarchitecture=CONFIG_MHASWELL ;;
- 33) Microarchitecture=CONFIG_MBROADWELL ;;
- 34) Microarchitecture=CONFIG_MSKYLAKE ;;
- 35) Microarchitecture=CONFIG_MSKYLAKEX ;;
- 36) Microarchitecture=CONFIG_MCANNONLAKE ;;
- 37) Microarchitecture=CONFIG_MICELAKE ;;
- 38) Microarchitecture=CONFIG_MNATIVE ;;
+ 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_MNATIVE ;;
*) default=CONFIG_GENERIC_CPU ;;
esac