diff options
Diffstat (limited to 'resources/scripts/build')
| -rwxr-xr-x | resources/scripts/build/boot/roms_helper | 2 | ||||
| -rwxr-xr-x | resources/scripts/build/descriptors/ich9m | 2 | ||||
| -rwxr-xr-x | resources/scripts/build/release/src | 10 | ||||
| -rwxr-xr-x | resources/scripts/build/src/for | 80 |
4 files changed, 7 insertions, 87 deletions
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/build/src/for b/resources/scripts/build/src/for deleted file mode 100755 index 855ea1c4..00000000 --- a/resources/scripts/build/src/for +++ /dev/null @@ -1,80 +0,0 @@ -#!/usr/bin/env sh - -# helper script: build utils used by lbmk -# -# Copyright (C) 2023 Leah Rowe <info@minifree.org> -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# - -[ "x${DEBUG+set}" = 'xset' ] && set -v -set -u -e - -. "include/err.sh" - -mode="" -project="" - -main() -{ - while getopts b:c: option - do - case "${1}" in - -b) - shift ;; - -c) - mode="distclean" - shift ;; - *) - err "Invalid option" ;; - esac - project="${OPTARG}" - shift - done - - [ -z "${project}" ] && err "project name not specified" - [ "${project}" = "ich9utils" ] && project="util/ich9utils" - - handle_dependencies - run_make_command -} - -handle_dependencies() -{ - [ -d "${project}" ] || ./fetch "${project%/*}" || \ - err "handle_dependencies: can't fetch ${project%/*}" - [ -d "${project}" ] || \ - err "handle_dependencies: ${project%/*} not downloaded" - - if [ "${project}" = "uefitool" ]; then - ( - cd uefitool || err "handle_dependencies: !cd uefitool" - cmake UEFIExtract/ || \ - err "handle_dependencies: !cmake UEFIExtract/" - ) - fi -} - -run_make_command() -{ - if [ -z "${mode}" ]; then - make -C "${project}" -j$(nproc) || \ - err "run_make_command: !make -C ${project}" - else - make -C "${project}" distclean || make -C "${project}" clean \ - || err "run_make_command: ${project}: make-clean failed" - fi -} - -main $@ |