From 6a7fb8753fb60d3c426cd4e61bbd895404519327 Mon Sep 17 00:00:00 2001 From: Tk-Glitch Date: Thu, 17 Jun 2021 13:46:24 +0200 Subject: [PATCH] Fix some _custom_pkgbase usages such as `_custom_pkgbase='linux-tkg-${_cpusched}'`, which require being passed as plain string *before* allowing variables later on. --- PKGBUILD | 4 ++-- linux-tkg-config/prepare | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index c40593a..6e6de1e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -39,10 +39,10 @@ fi # Make sure we're in a clean state if [ ! -e "$_where"/BIG_UGLY_FROGMINER ]; then _tkg_initscript -else - source "$_where"/BIG_UGLY_FROGMINER fi +source "$_where"/BIG_UGLY_FROGMINER + if [[ "$_sub" = rc* ]]; then _srcpath="linux-${_basekernel}-${_sub}" kernel_site="https://git.kernel.org/torvalds/t/linux-${_basekernel}-${_sub}.tar.gz" diff --git a/linux-tkg-config/prepare b/linux-tkg-config/prepare index 12f674c..01941e4 100644 --- a/linux-tkg-config/prepare +++ b/linux-tkg-config/prepare @@ -258,6 +258,10 @@ _tkg_initscript() { # Set compiler _set_compiler + + if [ -n "$_custom_pkgbase" ]; then + echo -e "_custom_pkgbase=\"$_custom_pkgbase\"" >> "$_where"/BIG_UGLY_FROGMINER + fi } user_patcher() {