From 29a8193eb2f5dfc79b9b4baa8db2345dc93f91a5 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 27 Aug 2023 11:42:20 +0100 Subject: [PATCH] build/src/for: rename to handle/make/file Signed-off-by: Leah Rowe --- resources/scripts/build/boot/roms_helper | 2 +- resources/scripts/build/descriptors/ich9m | 2 +- resources/scripts/build/release/src | 10 +++++----- resources/scripts/handle/config/file | 2 +- resources/scripts/{build/src/for => handle/make/file} | 0 resources/scripts/update/blobs/download | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename resources/scripts/{build/src/for => handle/make/file} (100%) diff --git a/resources/scripts/build/boot/roms_helper b/resources/scripts/build/boot/roms_helper index 64cb9a71..afd0ce1f 100755 --- a/resources/scripts/build/boot/roms_helper +++ b/resources/scripts/build/boot/roms_helper @@ -165,7 +165,7 @@ fi memtest_bin="memtest86plus/build${arch#*_}/memtest.bin" [ "${payload_memtest}" != "y" ] || [ -f "${memtest_bin}" ] || \ - ./build src for -b ${memtest_bin%/*} || \ + ./handle make file -b ${memtest_bin%/*} || \ err "cannot build memtest86+" [ -d "${romdir}/" ] || mkdir -p "${romdir}/" || \ diff --git a/resources/scripts/build/descriptors/ich9m b/resources/scripts/build/descriptors/ich9m index 3bfed53c..d965aef8 100755 --- a/resources/scripts/build/descriptors/ich9m +++ b/resources/scripts/build/descriptors/ich9m @@ -25,7 +25,7 @@ ich9gen="util/ich9utils/ich9gen" main() { - [ -f "${ich9gen}" ] || ./build src for -b ich9utils || \ + [ -f "${ich9gen}" ] || ./handle make file -b ich9utils || \ err "ich9utils make" [ ! -f "${ich9gen}" ] && err "ich9gen doesn't exist" diff --git a/resources/scripts/build/release/src b/resources/scripts/build/release/src index 5d7e3498..fbea9308 100755 --- a/resources/scripts/build/release/src +++ b/resources/scripts/build/release/src @@ -139,21 +139,21 @@ purge_files() for p in coreboot/*; do [ -d "${p}" ] || continue - ./build src for -c "${p}" || \ + ./handle make file -c "${p}" || \ err "purge_files 1: ${p}: !make distclean" done - ./build src for -c coreboot/default/util/kbc1126 || \ + ./handle make file -c coreboot/default/util/kbc1126 || \ err "purge_files 1: default/util/kbc1126: ! make clean" ./build clean all || \ err "purge_files 1: ! ./build clean all" for p in bios_extract flashrom grub ich9utils uefitool; do - ./build src for -c "${p}" || \ - err "purge_files: !./build src for -c ${p}" + ./handle make file -c "${p}" || \ + err "purge_files: !./handle make file -c ${p}" done for p in 32 64; do - ./build src for -c "memtest86plus/build${p}" || \ + ./handle make file -c "memtest86plus/build${p}" || \ err "purge_files: cannot clean memtest86+ build${p}" done for p in "nvmutil" "ich9utils" "spkmodem_recv" "e6400-flash-unlock"; do diff --git a/resources/scripts/handle/config/file b/resources/scripts/handle/config/file index 13d65ad3..d8e217ce 100755 --- a/resources/scripts/handle/config/file +++ b/resources/scripts/handle/config/file @@ -223,7 +223,7 @@ check_config() run_make_command() { - ./build src for -c "${codedir}" + ./handle make file -c "${codedir}" fail "run_make_command: make distclean/clean failed" cp "${config}" "${codedir}/.config" || \ diff --git a/resources/scripts/build/src/for b/resources/scripts/handle/make/file similarity index 100% rename from resources/scripts/build/src/for rename to resources/scripts/handle/make/file diff --git a/resources/scripts/update/blobs/download b/resources/scripts/update/blobs/download index 13a4c29d..3df460d4 100755 --- a/resources/scripts/update/blobs/download +++ b/resources/scripts/update/blobs/download @@ -165,7 +165,7 @@ build_dependencies() err "build_dependencies: can't fetch ${d}" done [ -f uefitool/uefiextract ] || \ - ./build src for -b uefitool || \ + ./handle make file -b uefitool || \ err "build_dependencies: can't build uefitool" if [ ! -f "${cbdir}/util/kbc1126/kbc1126_ec_dump" ]; then make -BC "${cbdir}/util/kbc1126" || \