From 9ac7fd64e13b4bee4168b614149d06267780a7d5 Mon Sep 17 00:00:00 2001 From: termac Date: Wed, 4 Nov 2020 17:25:44 +0100 Subject: [PATCH] source 'customization.cfg' earlier in 'install.sh' (#109) source 'customization.cfg' before '_tkg_initscript' is run in 'install.sh'. Otherwise some variables set in 'customization.cfg' are empty when '_tkg_initscript' is run and have to be supplied again on the prompt. --- install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index a8d89fe..e7c5813 100755 --- a/install.sh +++ b/install.sh @@ -22,6 +22,8 @@ set -e _where=`pwd` srcdir="$_where" +source customization.cfg + source linux-tkg-config/prepare # Run init script that is also run in PKGBUILD, it will define some env vars that we will use @@ -52,8 +54,6 @@ esac _cpu_opt_patch_link="https://raw.githubusercontent.com/graysky2/kernel_gcc_patch/master/enable_additional_cpu_optimizations_for_gcc_v10.1%2B_kernel_v${opt_ver}.patch" -source customization.cfg - if [ "$1" != "install" ] && [ "$1" != "config" ] && [ "$1" != "uninstall-help" ]; then msg2 "Argument not recognised, options are: - config : shallow clones the linux ${_basekernel}.x git tree into the folder linux-${_basekernel}, then applies on it the extra patches and prepares the .config file