From f893a29b2214e9b6ebab7640ee25add2c334b5b6 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 20 Aug 2023 17:32:16 +0100 Subject: unify most module build scripts Some of them weren't even used at all, such as the flashrom build script. the bios_extract build script existed but was never used, because we only called (from blobutil) a python script from in there, without actually compiling anything! resources/script/build/src/for Usage, e.g.: ./build src for memtest86plus It also handles fetch. This script is intended largely for those codebases that are quite simple, requiring trivial or no intervention besides running "make". 37 sloc reduction. Not a lot, but the audit continues! These optimisations add up. I started at 3300 sloc in resources/scripts and me target is 2k (2000) sloc. Signed-off-by: Leah Rowe --- resources/scripts/build/module/bios_extract | 33 ------------ resources/scripts/build/module/cbutils | 76 ---------------------------- resources/scripts/build/module/flashrom | 40 --------------- resources/scripts/build/module/ich9utils | 36 ------------- resources/scripts/build/module/memtest86plus | 37 -------------- resources/scripts/build/module/uefitool | 44 ---------------- 6 files changed, 266 deletions(-) delete mode 100755 resources/scripts/build/module/bios_extract delete mode 100755 resources/scripts/build/module/cbutils delete mode 100755 resources/scripts/build/module/flashrom delete mode 100755 resources/scripts/build/module/ich9utils delete mode 100755 resources/scripts/build/module/memtest86plus delete mode 100755 resources/scripts/build/module/uefitool (limited to 'resources/scripts/build/module') diff --git a/resources/scripts/build/module/bios_extract b/resources/scripts/build/module/bios_extract deleted file mode 100755 index 8a40b5a0..00000000 --- a/resources/scripts/build/module/bios_extract +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env sh - -# helper script: builds bios_extract source code -# -# Copyright (C) 2023 Leah Rowe -# -# 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 . -# - -[ "x${DEBUG+set}" = 'xset' ] && set -v -set -u -e - -# Build "flashrom" (utility for flashing/dumping ROMs) -# -------------------------------------------------------------------- - -if [ ! -d "bios_extract/" ]; then - ./fetch bios_extract -fi - -printf "Building bios_extract\n" - -make -BC bios_extract diff --git a/resources/scripts/build/module/cbutils b/resources/scripts/build/module/cbutils deleted file mode 100755 index 45739e95..00000000 --- a/resources/scripts/build/module/cbutils +++ /dev/null @@ -1,76 +0,0 @@ -#!/usr/bin/env sh - -# helper script: build various coreboot utilities -# -# Copyright (C) 2014-2016,2020,2021,2023 Leah Rowe -# -# 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 . -# - -[ "x${DEBUG+set}" = 'xset' ] && set -v -set -u -e - -printf "Building coreboot utils\n" - -main() -{ - if [ $# -gt 0 ]; then - for board in "${@}"; do - build_for_mainboard ${board} || exit 1 - done - else - for boarddir in resources/coreboot/*; do - [ ! -d "${boarddir}" ] && continue - build_for_mainboard ${boarddir##*/} || exit 1 - done - fi -} - -build_for_mainboard() { - board="${1}" - [ ! -d "resources/coreboot/${board}" ] && \ - continue - [ ! -f "resources/coreboot/${board}/target.cfg" ] && \ - continue - tree="undefined" - . "resources/coreboot/${board}/target.cfg" # source - if [ "${tree}" = "undefined" ]; then - printf "build/cbutils: improper tree definition for '%s'" \ - "${board}" - return 1 - fi - buildutils "${tree}" || return 1 -} - -buildutils() { - tree="${1}" - if [ ! -d "coreboot/${tree}/" ]; then - ./fetch_trees coreboot $tree || return 1 - fi - for util in cbfstool ifdtool; do - [ -f "cbutils/${tree}/${util}" ] \ - && continue - if [ ! -d "cbutils/${tree}" ]; then - mkdir -p "cbutils/${tree}" || return 1 - fi - - utildir="coreboot/${tree}/util/${util}" - make distclean -C "${utildir}" || return 1 - make -j$(nproc) -C "${utildir}" || return 1 - mv "${utildir}/${util}" "cbutils/${tree}" || return 1 - make distclean -C "${utildir}" || return 1 - done -} - -main $@ diff --git a/resources/scripts/build/module/flashrom b/resources/scripts/build/module/flashrom deleted file mode 100755 index a4dbe35d..00000000 --- a/resources/scripts/build/module/flashrom +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env sh - -# helper script: builds flashrom source code -# -# Copyright (C) 2014, 2015 -# Copyright (C) 2015 Klemens Nanni -# -# 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 . -# - -# This script assumes that the working directory is the root -# of git or release archive - -[ "x${DEBUG+set}" = 'xset' ] && set -v -set -u -e - -# Build "flashrom" (utility for flashing/dumping ROMs) -# -------------------------------------------------------------------- - -if [ ! -d "flashrom/" ]; then - ./fetch flashrom -fi - -printf "Building flashrom\n" -( -cd "flashrom/" -make clean -make WARNERROR=no -j$(nproc) -) diff --git a/resources/scripts/build/module/ich9utils b/resources/scripts/build/module/ich9utils deleted file mode 100755 index 5473a513..00000000 --- a/resources/scripts/build/module/ich9utils +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env sh - -# helper script: build ich9utils -# -# Copyright (C) 2014, 2015, 2020, 2023 Leah Rowe -# -# 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 . -# - -[ "x${DEBUG+set}" = 'xset' ] && set -v -set -u -e - -main() -{ - printf "Build ich9utils\n" - make -j$(nproc) -C "util/ich9utils" || err "make" -} - -err() -{ - printf "%s: %s\n" $0 $1 - exit 1 -} - -main $@ diff --git a/resources/scripts/build/module/memtest86plus b/resources/scripts/build/module/memtest86plus deleted file mode 100755 index 45727b77..00000000 --- a/resources/scripts/build/module/memtest86plus +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env sh - -# helper script: builds memtest86+ source code -# -# Copyright (C) 2014, 2015, 2020 Leah Rowe -# Copyright (C) 2015 Klemens Nanni -# -# 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 . -# - -# This script assumes that the working directory is the root -# of git or release archive - -[ "x${DEBUG+set}" = 'xset' ] && set -v -set -u -e - -# Build MemTest86+ payload -# -------------------------------------------------------------------- - -printf "Building MemTest86+\n" - -if [ ! -d "memtest86plus/" ]; then - ./fetch memtest86plus -fi - -make -j$(nproc) -BC memtest86plus diff --git a/resources/scripts/build/module/uefitool b/resources/scripts/build/module/uefitool deleted file mode 100755 index 891d8bf8..00000000 --- a/resources/scripts/build/module/uefitool +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env sh - -# helper script: builds bios_extract source code -# -# Copyright (C) 2023 Leah Rowe -# -# 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 . -# - -[ "x${DEBUG+set}" = 'xset' ] && set -v -set -u -e - -main() -{ - if [ ! -d "uefitool" ]; then - ./fetch uefitool || fail "cannot download uefitool" - fi - - printf "Building uefitool (UEFIExtract)\n" - - ( - cd uefitool || fail "uefitool not downloaded" - cmake UEFIExtract/ || fail "cannot cmake UEFIExtract" - make || fail "error compiling UEFIExtract" - ) -} - -fail() -{ - printf "(uefitool build) %s\n" $1 1>&2 -} - -main $@ -- cgit v1.2.1