From 0848622799b8c627cd650d848ffa7d592d80b26d Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Thu, 17 Aug 2023 11:41:58 +0100 Subject: 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 --- resources/scripts/build/module/bios_extract | 2 +- resources/scripts/build/module/flashrom | 2 +- resources/scripts/build/module/grub | 2 +- resources/scripts/build/module/memtest86plus | 2 +- resources/scripts/build/module/uefitool | 2 +- resources/scripts/build/payload/grub | 2 +- resources/scripts/build/payload/seabios | 2 +- resources/scripts/build/release/src | 18 +++++++++--------- 8 files changed, 16 insertions(+), 16 deletions(-) (limited to 'resources/scripts/build') diff --git a/resources/scripts/build/module/bios_extract b/resources/scripts/build/module/bios_extract index 77677fa1..8a40b5a0 100755 --- a/resources/scripts/build/module/bios_extract +++ b/resources/scripts/build/module/bios_extract @@ -25,7 +25,7 @@ set -u -e # -------------------------------------------------------------------- if [ ! -d "bios_extract/" ]; then - ./download bios_extract + ./fetch bios_extract fi printf "Building bios_extract\n" diff --git a/resources/scripts/build/module/flashrom b/resources/scripts/build/module/flashrom index 37f57ce0..a4dbe35d 100755 --- a/resources/scripts/build/module/flashrom +++ b/resources/scripts/build/module/flashrom @@ -29,7 +29,7 @@ set -u -e # -------------------------------------------------------------------- if [ ! -d "flashrom/" ]; then - ./download flashrom + ./fetch flashrom fi printf "Building flashrom\n" diff --git a/resources/scripts/build/module/grub b/resources/scripts/build/module/grub index 5cf58a67..edad6b2a 100755 --- a/resources/scripts/build/module/grub +++ b/resources/scripts/build/module/grub @@ -27,7 +27,7 @@ main() printf "Building GRUB\n" if [ ! -d "grub/" ]; then - ./download grub || exit 1 + ./fetch grub || exit 1 fi build_grub diff --git a/resources/scripts/build/module/memtest86plus b/resources/scripts/build/module/memtest86plus index 7fc46be9..45727b77 100755 --- a/resources/scripts/build/module/memtest86plus +++ b/resources/scripts/build/module/memtest86plus @@ -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 diff --git a/resources/scripts/build/module/uefitool b/resources/scripts/build/module/uefitool index 6adf1de2..891d8bf8 100755 --- a/resources/scripts/build/module/uefitool +++ b/resources/scripts/build/module/uefitool @@ -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" diff --git a/resources/scripts/build/payload/grub b/resources/scripts/build/payload/grub index 23765f47..0734f8a9 100755 --- a/resources/scripts/build/payload/grub +++ b/resources/scripts/build/payload/grub @@ -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/" ] && \ diff --git a/resources/scripts/build/payload/seabios b/resources/scripts/build/payload/seabios index f822a019..43973109 100755 --- a/resources/scripts/build/payload/seabios +++ b/resources/scripts/build/payload/seabios @@ -53,7 +53,7 @@ check_dependencies() rm -f ${payloaddir}/* || exit 1 if [ ! -d "seabios/" ]; then - ./download seabios || exit 1 + ./fetch seabios || exit 1 fi } diff --git a/resources/scripts/build/release/src b/resources/scripts/build/release/src index 95c0036f..2b985156 100755 --- a/resources/scripts/build/release/src +++ b/resources/scripts/build/release/src @@ -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 -- cgit v1.2.1