diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/init.sh | 4 | ||||
| -rw-r--r-- | include/inject.sh | 4 | ||||
| -rw-r--r-- | include/lib.sh | 4 | ||||
| -rw-r--r-- | include/rom.sh | 19 | ||||
| -rw-r--r-- | include/tree.sh | 4 | ||||
| -rw-r--r-- | include/vendor.sh | 9 |
6 files changed, 25 insertions, 19 deletions
diff --git a/include/init.sh b/include/init.sh index bc5a62b6..2202e156 100644 --- a/include/init.sh +++ b/include/init.sh @@ -90,11 +90,15 @@ xbmk_set_env() xbtmp="$TMPDIR" export XBMK_CACHE="$xbmkpwd/cache" + [ -L "$XBMK_CACHE" ] && [ "$XBMK_CACHE" = "$xbmkpwd/cache" ] && \ err "cachedir '$xbmkpwd/cache' is a symlink" [ ! -e "$XBMK_CACHE" ] || \ [ -d "$XBMK_CACHE" ] || err "cachedir '$XBMK_CACHE' is a file"; : + cbfstool="$XBMK_CACHE/elf/coreboot/default/cbfstool" + rmodtool="$XBMK_CACHE/elf/coreboot/default/rmodtool" + export PATH="$XBMK_CACHE/xbmkpath:$XBMK_CACHE/gnupath:$PATH" xbmkpath="$PATH" diff --git a/include/inject.sh b/include/inject.sh index 795b2c70..cac08357 100644 --- a/include/inject.sh +++ b/include/inject.sh @@ -6,7 +6,7 @@ cbcfgsdir="config/coreboot" tmpromdel="$XBMK_CACHE/DO_NOT_FLASH" nvm="util/nvmutil/nvm" -ifdtool="elf/coreboot/default/ifdtool" +ifdtool="$XBMK_CACHE/elf/coreboot/default/ifdtool" cv="CONFIG_GBE_BIN_PATH" [ -n "$cvxbmk" ] && cv="$cv $cvxbmk" @@ -77,7 +77,7 @@ check_target() eval "`setcfg "$boarddir/target.cfg"`" chkvars tree && x_ ./mk -d coreboot "$tree" - ifdtool="elf/coreboot/$tree/ifdtool" + ifdtool="$XBMK_CACHE/elf/coreboot/$tree/ifdtool" [ -n "$IFD_platform" ] && ifdprefix="-p $IFD_platform"; : } diff --git a/include/lib.sh b/include/lib.sh index 6fc3bd1e..8a5542bd 100644 --- a/include/lib.sh +++ b/include/lib.sh @@ -4,8 +4,8 @@ # Copyright (c) 2020-2025 Leah Rowe <leah@libreboot.org> # Copyright (c) 2025 Alper Nebi Yasak <alpernebiyasak@gmail.com> -cbfstool="elf/coreboot/default/cbfstool" -rmodtool="elf/coreboot/default/rmodtool" +cbfstool="" +rmodtool="" remkdir() { diff --git a/include/rom.sh b/include/rom.sh index 57948ec4..e85ff887 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -56,10 +56,10 @@ corebootpremake() check_coreboot_util() { - [ "$badhash" = "y" ] && x_ rm -f "elf/coreboot/$tree/$1" - e "elf/coreboot/$tree/$1" f && return 0 + [ "$badhash" = "y" ] && x_ rm -f "$XBMK_CACHE/elf/coreboot/$tree/$1" + e "$XBMK_CACHE/elf/coreboot/$tree/$1" f && return 0 - utilelfdir="elf/coreboot/$tree" + utilelfdir="$XBMK_CACHE/elf/coreboot/$tree" utilsrcdir="src/coreboot/$tree/util/$1" utilmode="" && [ -n "$mode" ] && utilmode="clean" @@ -101,9 +101,9 @@ mkcorebootbin_real() displaymode="${initmode##*_}" [ "$displaymode" = "$initmode" ] && displaymode="" # "normal" config initmode="${initmode%%_*}" - cbfstool="elf/coreboot/$tree/cbfstool" + cbfstool="$XBMK_CACHE/elf/coreboot/$tree/cbfstool" - elfrom="elf/coreboot/$tree/$target/$initmode" + elfrom="$XBMK_CACHE/elf/coreboot/$tree/$target/$initmode" [ -n "$displaymode" ] && elfrom="${elfrom}_$displaymode" elfrom="$elfrom/coreboot.rom" @@ -125,7 +125,7 @@ mkcorebootbin_real() [ -z "$grub_scan_disk" ] && grub_scan_disk="nvme ahci ata" [ -n "$grubtree" ] || grubtree="default" - grubelf="elf/grub/$grubtree/$grubtree/payload/grub.elf" + grubelf="$XBMK_CACHE/elf/grub/$grubtree/$grubtree/payload/grub.elf" [ "$payload_memtest" = "y" ] || payload_memtest="n" [ "$(uname -m)" = "x86_64" ] || payload_memtest="n" @@ -150,7 +150,8 @@ add_seabios() [ -z "$payload_uboot" ] || [ "$payload_uboot" = "arm64" ] || \ $dry add_uboot - _seabioself="elf/seabios/default/default/$initmode/bios.bin.elf" + _seabioself="$XBMK_CACHE/elf/seabios/default/default/$initmode" + _seabioself="$_seabioself/bios.bin.elf" _seaname="fallback/payload" && [ "$payload_grubsea" = "y" ] && \ _seaname="seabios.elf" @@ -164,7 +165,7 @@ add_seabios() cbfs "$tmprom" "$seavgabiosrom" vgaroms/seavgabios.bin raw [ "$payload_memtest" = "y" ] && cbfs "$tmprom" \ - "elf/memtest86plus/memtest.bin" img/memtest + "$XBMK_CACHE/elf/memtest86plus/memtest.bin" img/memtest [ "$payload_grub" = "y" ] && add_grub @@ -228,7 +229,7 @@ add_uboot() [ "$payload_uboot" = "i386" ] && ubtarget="i386coreboot"; : fi - ubdir="elf/u-boot/$ubtree/$ubtarget/$uboot_config" + ubdir="$XBMK_CACHE/elf/u-boot/$ubtree/$ubtarget/$uboot_config" # aarch64 targets: ubootelf="$ubdir/u-boot.elf" && [ ! -f "$ubootelf" ] && \ diff --git a/include/tree.sh b/include/tree.sh index 1f635e23..77699fdf 100644 --- a/include/tree.sh +++ b/include/tree.sh @@ -199,7 +199,7 @@ check_project_hashes() err "!mk $XBMK_CACHE/hash/$project$tree" [ "$badhash" != "y" ] || x_ rm -Rf "src/$project/$tree" \ - "elf/$project/$tree"; : + "$XBMK_CACHE/elf/$project/$tree"; : singletree "$project" || check_target_hash; : } @@ -233,7 +233,7 @@ check_target_hash() err "!mk $XBMK_CACHE/tghash/$project$target" [ "$badtghash" != "y" ] || \ - x_ rm -Rf "elf/$project/$tree/$target"; : + x_ rm -Rf "$XBMK_CACHE/elf/$project/$tree/$target"; : } check_cross_compiler() diff --git a/include/vendor.sh b/include/vendor.sh index 55373913..4aad7532 100644 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -15,7 +15,7 @@ e6400_unpack="$xbmkpwd/src/bios_extract/dell_inspiron_1100_unpacker.py" me7updateparser="$xbmkpwd/util/me7_update_parser/me7_update_parser.py" pfs_extract="$xbmkpwd/src/biosutilities/Dell_PFS_Extract.py" -uefiextract="$xbmkpwd/elf/uefitool/uefiextract" +uefiextract="$XBMK_CACHE/elf/uefitool/uefiextract" vendir="vendorfiles" appdir="$vendir/app" vfix="DO_NOT_FLASH_YET._FIRST,_INJECT_FILES_VIA_INSTRUCTIONS_ON_LIBREBOOT.ORG_" @@ -270,14 +270,15 @@ bootstrap() cbdir="src/coreboot/$tree" mecleaner="$xbmkpwd/$cbdir/util/me_cleaner/me_cleaner.py" kbc1126_ec_dump="$xbmkpwd/$cbdir/util/kbc1126/kbc1126_ec_dump" - cbfstool="elf/coreboot/$tree/cbfstool" - rmodtool="elf/coreboot/$tree/rmodtool" + cbfstool="$XBMK_CACHE/elf/coreboot/$tree/cbfstool" + rmodtool="$XBMK_CACHE/elf/coreboot/$tree/rmodtool" x_ ./mk -f coreboot "${cbdir##*/}" fx_ "x_ ./mk -b" printf "uefitool\nbiosutilities\nbios_extract\n" [ -d "${kbc1126_ec_dump%/*}" ] && x_ make -C "$cbdir/util/kbc1126" [ -n "$MRC_refcode_cbtree" ] && \ - cbfstoolref="elf/coreboot/$MRC_refcode_cbtree/cbfstool" && \ + cbfstoolref="$XBMK_CACHE/elf/coreboot/$MRC_refcode_cbtree" && \ + cbfstoolref="$cbfstoolref/cbfstool" && \ x_ ./mk -d coreboot "$MRC_refcode_cbtree"; : } |