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

Default to Arch target when _distro is empty or when using the PKGBUILD

Browse Source 
Fixes https://github.com/Frogging-Family/linux-tkg/issues/104
This commit is contained in:
Tk-Glitch 2020-10-28 20:49:02 +01:00
parent 86199567fe
commit f7618cf272
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PKGBUILD
View File

@ -13,8 +13,8 @@ plain ' :syNNdhNNhssssssssssssssshNNhdNNys:'
plain ' /ssyhhhysssssssssssssssssyhhhyss/' plain ' /ssyhhhysssssssssssssssssyhhhyss/'
plain ' .ossssssssssssssssssssssssssssso.' plain ' .ossssssssssssssssssssssssssssso.'
plain ' :sssssssssssssssssssssssssssssssss:' plain ' :sssssssssssssssssssssssssssssssss:'
plain ' /sssssssssssssssssssssssssssssssssss/' plain ' /sssssssssssssssssssssssssssssssssss/ Linux-tkg'
plain ' :sssssssssssssoosssssssoosssssssssssss:' plain ' :sssssssssssssoosssssssoosssssssssssss: kernels'
plain ' osssssssssssssoosssssssoossssssssssssso' plain ' osssssssssssssoosssssssoossssssssssssso'
plain ' osssssssssssyyyyhhhhhhhyyyyssssssssssso' plain ' osssssssssssyyyyhhhhhhhyyyyssssssssssso'
plain ' /yyyyyyhhdmmmmNNNNNNNNNNNmmmmdhhyyyyyy/' plain ' /yyyyyyhhdmmmmNNNNNNNNNNNmmmmdhhyyyyyy/'
@ -25,12 +25,11 @@ plain ' `-+shdNNNNNNNNNNNNNNNdhs+-`'
plain ' `.-:///////:-.`' plain ' `.-:///////:-.`'
_where="$PWD" # track basedir as different Arch based distros are moving srcdir around _where="$PWD" # track basedir as different Arch based distros are moving srcdir around
_ispkgbuild="true"
source "$_where"/customization.cfg # load default configuration from file source "$_where"/customization.cfg # load default configuration from file
source "$_where"/linux-tkg-config/prepare source "$_where"/linux-tkg-config/prepare
_distro="Arch"
_tkg_initscript _tkg_initscript
if [[ "$_sub" = rc* ]]; then if [[ "$_sub" = rc* ]]; then

8
linux-tkg-config/prepare
View File

@ -9,7 +9,13 @@ ver510=rc1
_tkg_initscript() { _tkg_initscript() {
# Load external configuration file if present. Available variable values will overwrite customization.cfg ones. # Load external configuration file if present. Available variable values will overwrite customization.cfg ones.
if [ -e "$_EXT_CONFIG_PATH" ]; then if [ -e "$_EXT_CONFIG_PATH" ]; then
source "$_EXT_CONFIG_PATH" && msg2 "External configuration file $_EXT_CONFIG_PATH will be used to override customization.cfg values." && msg2 "" source "$_EXT_CONFIG_PATH" && msg2 "External configuration file $_EXT_CONFIG_PATH will be used to override customization.cfg values.\n"
fi
# Default to Arch
if [ -z "$_distro" ] || [ "$_ispkgbuild" = "true" ]; then
msg2 "Defaulting to Archlinux target\n"
_distro="Arch"
fi fi
# create build dir early # create build dir early