From 8d9aeef3de28bcb908e33b804517bdeacce7be38 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Fri, 20 Oct 2023 00:17:30 +0100 Subject: lbmk: use 2-level directory structure in script/ as opposed to the current 3-level structure. recent build system simplifications have enabled this change, thus: ./build fw coreboot -> ./build roms ./build fw grub -> ./build grub ./build fw serprog -> ./build serprog ./update project release -> ./update release ./update project trees -> ./update trees ./update vendor download -> ./vendor download ./update vendor inject -> ./vendor inject alper criticised that the commands were too long, so i made them shorter! Signed-off-by: Leah Rowe --- include/git.sh | 2 +- include/option.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/git.sh b/include/git.sh index 9e6c60db..1c458f08 100755 --- a/include/git.sh +++ b/include/git.sh @@ -75,7 +75,7 @@ fetch_project_repo() clone_project [ "${depend}" = "" ] || for d in ${depend} ; do - x_ ./update project trees -f ${d} + x_ ./update trees -f ${d} done x_ rm -Rf "${tmp_git_dir}" } diff --git a/include/option.sh b/include/option.sh index 73a567bb..dd41e88c 100755 --- a/include/option.sh +++ b/include/option.sh @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2022 Ferass El Hafidi # SPDX-FileCopyrightText: 2023 Leah Rowe -vendir="vendor" +vendir="vendorfiles" appdir="${vendir}/app" cbdir="src/coreboot/default" cbcfgsdir="config/coreboot" @@ -62,7 +62,7 @@ check_defconfig() handle_coreboot_utils() { for util in cbfstool ifdtool; do - x_ ./update project trees ${_f} "src/coreboot/${1}/util/${util}" + x_ ./update trees ${_f} "src/coreboot/${1}/util/${util}" [ -z "${mode}" ] && [ ! -f "cbutils/${1}/${util}" ] && \ x_ mkdir -p "cbutils/${1}" && \ x_ cp "src/coreboot/${1}/util/${util}/${util}" \ -- cgit v1.2.1