diff options
| -rw-r--r-- | config/data/pico-serprog/mkhelper.cfg | 2 | ||||
| -rw-r--r-- | include/git.sh | 4 | ||||
| -rw-r--r-- | include/lib.sh | 14 | ||||
| -rw-r--r-- | include/vendor.sh | 20 | ||||
| -rwxr-xr-x | script/trees | 4 |
5 files changed, 22 insertions, 22 deletions
diff --git a/config/data/pico-serprog/mkhelper.cfg b/config/data/pico-serprog/mkhelper.cfg index f4733dd9..15f766b7 100644 --- a/config/data/pico-serprog/mkhelper.cfg +++ b/config/data/pico-serprog/mkhelper.cfg @@ -7,4 +7,4 @@ serx="$sersrc/build/pico_serprog.uf2" picosdk="src/pico-sdk" serdir="$picosdk/src/boards/include/boards" premake="mkserprog pico" -picotool="$PWD/src/picotool/xbmkbin" +picotool="`pwd`/src/picotool/xbmkbin" diff --git a/include/git.sh b/include/git.sh index 1933a4ec..31f8562d 100644 --- a/include/git.sh +++ b/include/git.sh @@ -12,7 +12,7 @@ fetch_targets() e "src/$project/$tree" d && return 0 printf "Creating %s tree %s\n" "$project" "$tree" - git_prep "$loc" "$loc" "$PWD/$configdir/$tree/patches" \ + git_prep "$loc" "$loc" "`pwd`/$configdir/$tree/patches" \ "src/$project/$tree" u nuke "$project/$tree" "$project/$tree" } @@ -43,7 +43,7 @@ clone_project() printf "Downloading project '%s' to '%s'\n" "$project" "$loc" e "$loc" d missing && remkdir "${tmpgit%/*}" && git_prep \ - "$url" "$bkup_url" "$PWD/config/$project/patches" "$loc"; : + "$url" "$bkup_url" "`pwd`/config/$project/patches" "$loc"; : } git_prep() diff --git a/include/lib.sh b/include/lib.sh index 31c9fd02..4e527845 100644 --- a/include/lib.sh +++ b/include/lib.sh @@ -11,7 +11,7 @@ _ua="Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0" ifdtool="elf/ifdtool/default/ifdtool" cbfstool="elf/cbfstool/default/cbfstool" rmodtool="elf/cbfstool/default/rmodtool" -tmpgit="$PWD/tmp/gitclone" +tmpgit="`pwd`/tmp/gitclone" grubdata="config/data/grub" err="err_" @@ -102,18 +102,18 @@ id -u 1>/dev/null 2>/dev/null || $err "suid check failed (id -u)" [ "$(id -u)" != "0" ] || $err "this command as root is not permitted" # XBMK_CACHE is a directory, for caching downloads and git repositories -[ -z "${XBMK_CACHE+x}" ] && export XBMK_CACHE="$PWD/cache" -[ -z "$XBMK_CACHE" ] && export XBMK_CACHE="$PWD/cache" -[ -L "$XBMK_CACHE" ] && [ "$XBMK_CACHE" = "$PWD/cache" ] && \ - $err "cachedir is default, $PWD/cache, but it exists and is a symlink" -[ -L "$XBMK_CACHE" ] && export XBMK_CACHE="$PWD/cache" +[ -z "${XBMK_CACHE+x}" ] && export XBMK_CACHE="`pwd`/cache" +[ -z "$XBMK_CACHE" ] && export XBMK_CACHE="`pwd`/cache" +[ -L "$XBMK_CACHE" ] && [ "$XBMK_CACHE" = "`pwd`/cache" ] && \ + $err "cachedir is default, `pwd`/cache, but it exists and is a symlink" +[ -L "$XBMK_CACHE" ] && export XBMK_CACHE="`pwd`/cache" [ -f "$XBMK_CACHE" ] && $err "cachedir '$XBMK_CACHE' exists but it's a file" # unify all temporary files/directories in a single TMPDIR [ -z "${TMPDIR+x}" ] || [ "${TMPDIR%_*}" = "/tmp/xbmk" ] || unset TMPDIR [ -n "${TMPDIR+x}" ] && export TMPDIR="$TMPDIR" if [ -z "${TMPDIR+x}" ]; then - [ -f "lock" ] && $err "$PWD/lock exists. Is a build running?" + [ -f "lock" ] && $err "`pwd`/lock exists. Is a build running?" export TMPDIR="/tmp" export TMPDIR="$(mktemp -d -t xbmk_XXXXXXXX)" touch lock || $err "cannot create 'lock' file" diff --git a/include/vendor.sh b/include/vendor.sh index 53fe5a27..9cb872a5 100644 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -3,10 +3,10 @@ # Copyright (c) 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com> # Copyright (c) 2023-2025 Leah Rowe <leah@libreboot.org> -e6400_unpack="$PWD/src/bios_extract/dell_inspiron_1100_unpacker.py" -me7updateparser="$PWD/util/me7_update_parser/me7_update_parser.py" -pfs_extract="$PWD/src/biosutilities/Dell_PFS_Extract.py" -uefiextract="$PWD/elf/uefitool/uefiextract" +e6400_unpack="`pwd`/src/bios_extract/dell_inspiron_1100_unpacker.py" +me7updateparser="`pwd`/util/me7_update_parser/me7_update_parser.py" +pfs_extract="`pwd`/src/biosutilities/Dell_PFS_Extract.py" +uefiextract="`pwd`/elf/uefitool/uefiextract" vendir="vendorfiles" appdir="$vendir/app" cbcfgsdir="config/coreboot" @@ -14,7 +14,7 @@ hashfiles="vendorhashes blobhashes" # blobhashes for backwards compatibility dontflash="!!! AN ERROR OCCURED! Please DO NOT flash if injection failed. !!!" vfix="DO_NOT_FLASH_YET._FIRST,_INJECT_FILES_VIA_INSTRUCTIONS_ON_LIBREBOOT.ORG_" vguide="https://libreboot.org/docs/install/ivy_has_common.html" -tmpromdel="$PWD/tmp/DO_NOT_FLASH" +tmpromdel="`pwd`/tmp/DO_NOT_FLASH" cv="CONFIG_HAVE_ME_BIN CONFIG_ME_BIN_PATH CONFIG_INCLUDE_SMSC_SCH5545_EC_FW \ CONFIG_SMSC_SCH5545_EC_FW_FILE CONFIG_KBC1126_FIRMWARE CONFIG_KBC1126_FW1 \ @@ -152,9 +152,9 @@ extract_intel_me() { e "$mecleaner" f not && $err "$cbdir: me_cleaner missing. $dontflash" - cdir="$PWD/$appdir" - _me="$PWD/$_dest" - _metmp="$PWD/tmp/me.bin" + cdir="`pwd`/$appdir" + _me="`pwd`/$_dest" + _metmp="`pwd`/tmp/me.bin" mfs="" && [ "$ME11bootguard" = "y" ] && mfs="--whitelist MFS" && \ chkvars ME11delta ME11version ME11sku ME11pch @@ -489,8 +489,8 @@ readcfg() cbdir="src/coreboot/$tree" cbfstool="elf/cbfstool/$tree/cbfstool" rmodtool="elf/cbfstool/$tree/rmodtool" - mecleaner="$PWD/$cbdir/util/me_cleaner/me_cleaner.py" - kbc1126_ec_dump="$PWD/$cbdir/util/kbc1126/kbc1126_ec_dump" + mecleaner="`pwd`/$cbdir/util/me_cleaner/me_cleaner.py" + kbc1126_ec_dump="`pwd`/$cbdir/util/kbc1126/kbc1126_ec_dump" cbfstool="elf/cbfstool/$tree/cbfstool" ifdtool="elf/ifdtool/$tree/ifdtool" [ -n "$IFD_platform" ] && ifdprefix="-p $IFD_platform"; : diff --git a/script/trees b/script/trees index 3eb9d054..8e53949b 100755 --- a/script/trees +++ b/script/trees @@ -176,7 +176,7 @@ configure_project() [ -z "$btype" ] || [ "${mode%config}" = "$mode" ] || return 1 [ -z "$mode" ] && build_dependencies - mdir="$PWD/config/submodule/$project" + mdir="`pwd`/config/submodule/$project" [ -n "$tree" ] && mdir="$mdir/$tree" [ -f "CHANGELOG" ] || check_project_hashes @@ -247,7 +247,7 @@ check_cross_compiler() x_ ./mk -f coreboot "${cbdir#src/coreboot/}" - export PATH="$PWD/$cbdir/util/crossgcc/xgcc/bin:$PATH" + export PATH="`pwd`/$cbdir/util/crossgcc/xgcc/bin:$PATH" export CROSS_COMPILE="${xarch% *}-" [ -n "$xlang" ] && export BUILD_LANGUAGES="$xlang" |