remove download scripts, consolidate into script

most of them were just calling the gitclone script,
so remove them.

the grub script was treating gnulib as a dependency.
i've now added the ability to grab 1 dependency, in
the gitclone script (it should be expanded later to
support multiple dependencies)

the gitclone script has been renamed to "fetch".
the "fetch_trees" script does more or less the same
thing, but calls "fetch" and handles multiple revisions
if a project needs that

this is more efficient, and slightly reduces the code
size of lbmk!

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2023-08-17 11:41:58 +01:00
parent 8459e33bbc
commit 0848622799
27 changed files with 44 additions and 247 deletions
+1 -1
View File
@@ -25,7 +25,7 @@ set -u -e
# --------------------------------------------------------------------
if [ ! -d "bios_extract/" ]; then
./download bios_extract
./fetch bios_extract
fi
printf "Building bios_extract\n"
+1 -1
View File
@@ -29,7 +29,7 @@ set -u -e
# --------------------------------------------------------------------
if [ ! -d "flashrom/" ]; then
./download flashrom
./fetch flashrom
fi
printf "Building flashrom\n"
+1 -1
View File
@@ -27,7 +27,7 @@ main()
printf "Building GRUB\n"
if [ ! -d "grub/" ]; then
./download grub || exit 1
./fetch grub || exit 1
fi
build_grub
+1 -1
View File
@@ -31,7 +31,7 @@ set -u -e
printf "Building MemTest86+\n"
if [ ! -d "memtest86plus/" ]; then
./download memtest86plus
./fetch memtest86plus
fi
make -j$(nproc) -BC memtest86plus
+1 -1
View File
@@ -24,7 +24,7 @@ set -u -e
main()
{
if [ ! -d "uefitool" ]; then
./download uefitool || fail "cannot download uefitool"
./fetch uefitool || fail "cannot download uefitool"
fi
printf "Building uefitool (UEFIExtract)\n"
+1 -1
View File
@@ -31,7 +31,7 @@ main()
printf "Creating GRUB payloads and configuration files\n"
[ ! -d "grub/" ] && \
./download grub
./fetch grub
[ ! -f "grub/grub-mkstandalone" ] && \
./build module grub
[ ! -d "payload/" ] && \
+1 -1
View File
@@ -53,7 +53,7 @@ check_dependencies()
rm -f ${payloaddir}/* || exit 1
if [ ! -d "seabios/" ]; then
./download seabios || exit 1
./fetch seabios || exit 1
fi
}
+9 -9
View File
@@ -23,14 +23,14 @@ set -u -e
projectname="$(cat projectname)"
trees_gitclone_list="coreboot u-boot"
simple_gitclone_list="flashrom grub memtest86plus seabios me_cleaner uefitool"
simple_gitclone_list="${simple_gitclone_list} bios_extract biosutilities"
trees_fetch_list="coreboot u-boot"
simple_fetch_list="flashrom grub memtest86plus seabios me_cleaner uefitool"
simple_fetch_list="${simple_fetch_list} bios_extract biosutilities"
dirlist="resources util" # do not add blobs directory here. it's handled below
filelist="lbmk blobutil modify download build README.md COPYING Makefile update"
filelist="${filelist} version versiondate projectname .gitcheck gitclone"
filelist="lbmk blobutil modify build README.md COPYING Makefile update"
filelist="${filelist} version versiondate projectname .gitcheck fetch"
filelist="${filelist} fetch_trees"
version="version-unknown"
@@ -77,19 +77,19 @@ create_release_directory()
download_modules()
{
for modname in ${trees_gitclone_list}; do
for modname in ${trees_fetch_list}; do
[ ! -d "${modname}" ] && \
./fetch_trees ${modname}
done
for modname in ${simple_gitclone_list}; do
for modname in ${simple_fetch_list}; do
[ ! -d "${modname}/" ] && \
./download ${modname}
./fetch ${modname}
done
}
copy_files()
{
for dir in ${simple_gitclone_list} ${dirlist}; do
for dir in ${simple_fetch_list} ${dirlist}; do
cp -R "${dir}/" "${srcdir}/"
done