CCF_100/linux-tkg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

unified-builder: Minor adjustments

Browse Source
This commit is contained in:
Tk-Glitch 2020-10-26 22:27:14 +01:00
parent 5caf303428
commit 608c24a1e3
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
linux-tkg/PKGBUILD
View File

@ -285,9 +285,8 @@ case $_basever in
;; ;;
510) 510)
opt_ver="5.8%2B" opt_ver="5.8%2B"
source=("https://git.kernel.org/torvalds/t/linux-${_basekernel}-${_sub}.tar.gz" source=("$kernel_site"
#"https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${_basekernel}.tar.xz" #"$patch_site"
#"https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz"
"https://raw.githubusercontent.com/graysky2/kernel_gcc_patch/master/enable_additional_cpu_optimizations_for_gcc_v10.1%2B_kernel_v5.8%2B.patch" "https://raw.githubusercontent.com/graysky2/kernel_gcc_patch/master/enable_additional_cpu_optimizations_for_gcc_v10.1%2B_kernel_v5.8%2B.patch"
'config.x86_64' # stock Arch config 'config.x86_64' # stock Arch config
#'config_hardened.x86_64' # hardened Arch config #'config_hardened.x86_64' # hardened Arch config

34
linux-tkg/linux-tkg-config/prepare
View File

@ -119,36 +119,36 @@ _tkg_initscript() {
# CPU SCHED selector # CPU SCHED selector
if [ -z "$_cpusched" ] && [ ! -e "${_path}"/cpuschedset ]; then if [ -z "$_cpusched" ] && [ ! -e "${_path}"/cpuschedset ]; then
plain "What CPU sched variant do you want to build/install?" plain "What CPU sched variant do you want to build/install?"
if [ "$_basever" = "58" ]; then if [ "$_basever" = "54" ] || [ "$_basever" = "57" ]; then
prompt="`echo $' > 1.PDS\n 2.MuQSS\n 3.BMQ\n 4.CFS\nchoice[1-4?]: '`"
elif [ "$_basever" = "58" ]; then
prompt="`echo $' > 1.Undead PDS (TkG)\n 2.Project C / PDS\n 3.Project C / BMQ\n 4.CFS\nchoice[1-4?]: '`" prompt="`echo $' > 1.Undead PDS (TkG)\n 2.Project C / PDS\n 3.Project C / BMQ\n 4.CFS\nchoice[1-4?]: '`"
elif [ "$_basever" = "59" ]; then
prompt="`echo $' > 1.Project C / PDS\n 2.Project C / BMQ\n 3.MuQSS\n 4.CFS\nchoice[1-3?]: '`"
else else
prompt="`echo $' > 1.PDS\n 2.MuQSS\n 3.BMQ\n 4.CFS\nchoice[1-4?]: '`" prompt="`echo $' > 1.Project C / PDS\n 2.Project C / BMQ\n 3.MuQSS\n 4.CFS\nchoice[1-4?]: '`"
fi fi
read -rp "$prompt" CONDITION; read -rp "$prompt" CONDITION;
if [ "$CONDITION" = "2" ];then if [ "$CONDITION" = "2" ];then
if [ "$_basever" = "58" ]; then if [ "$_basever" = "54" ] || [ "$_basever" = "57" ]; then
echo "_cpusched=\"MuQSS\"" > "${_path}"/cpuschedset
elif [ "$_basever" = "58" ]; then
echo "_cpusched=\"pds\"" > "${_path}"/cpuschedset echo "_cpusched=\"pds\"" > "${_path}"/cpuschedset
elif [ "$_basever" = "59" ]; then else [ "$_basever" = "59" ]; then
echo "_cpusched=\"bmq\"" > "${_path}"/cpuschedset echo "_cpusched=\"bmq\"" > "${_path}"/cpuschedset
else
echo "_cpusched=\"MuQSS\"" > "${_path}"/cpuschedset
fi fi
elif [ "$CONDITION" = "3" ]; then elif [ "$CONDITION" = "3" ]; then
if [ "$_basever" != "59" ]; then if [ "$_basever" = "54" ] || [ "$_basever" = "57" ] || [ "$_basever" = "58" ]; then
echo "_cpusched=\"bmq\"" > "${_path}"/cpuschedset echo "_cpusched=\"bmq\"" > "${_path}"/cpuschedset
else else
echo "_cpusched=\"MuQSS\"" > "${_path}"/cpuschedset echo "_cpusched=\"MuQSS\"" > "${_path}"/cpuschedset
fi fi
elif [ "$CONDITION" = "4" ]; then elif [ "$CONDITION" = "4" ]; then
echo "_cpusched=\"cfs\"" > "${_path}"/cpuschedset echo "_cpusched=\"cfs\"" > "${_path}"/cpuschedset
else else
if [ "$_basever" = "58" ]; then if [ "$_basever" = "58" ]; then
echo "_cpusched=\"upds\"" > "${_path}"/cpuschedset echo "_cpusched=\"upds\"" > "${_path}"/cpuschedset
else else
echo "_cpusched=\"pds\"" > "${_path}"/cpuschedset echo "_cpusched=\"pds\"" > "${_path}"/cpuschedset
fi fi
fi fi
if [ -n "$_custom_pkgbase" ]; then if [ -n "$_custom_pkgbase" ]; then
echo "_custom_pkgbase=\"${_custom_pkgbase}\"" >> "${_path}"/cpuschedset echo "_custom_pkgbase=\"${_custom_pkgbase}\"" >> "${_path}"/cpuschedset