libreboot
/
lbmk
1
0
Fork 0
Code Packages Projects Releases Activity

unify build/clean into ./build release src 

handle it all in the 1 script

quite a few clean scripts are still present,
so resources/scripts/build/clean/ still exists.

23 sloc reduction.

Signed-off-by: Leah Rowe <leah@libreboot.org>
btrfsvols
Leah Rowe 2023-08-20 18:54:40 +01:00
parent f893a29b22
commit 023d6b6996
12 changed files with 27 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/scripts/build/boot/roms_helper
View File

@ -170,7 +170,7 @@ if [ ! -f "${seavgabiosrom}" ] \
fi fi
[ "${payload_memtest}" = "y" ] && [ ! -f "memtest86plus/memtest" ] && \ [ "${payload_memtest}" = "y" ] && [ ! -f "memtest86plus/memtest" ] && \
./build src for memtest86plus ./build src for -b memtest86plus
[ -d "${romdir}/" ] || mkdir -p "${romdir}/" [ -d "${romdir}/" ] || mkdir -p "${romdir}/"
rm -f "${romdir}"/* rm -f "${romdir}"/*

28
resources/scripts/build/clean/bios_extract
View File

@ -1,28 +0,0 @@
#!/usr/bin/env sh
# helper script: run make clean on bios_extract
#
# 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
printf "Cleaning the previous build of bios_extract\n"
[ ! -d "bios_extract/" ] && exit 0
make clean -BC bios_extract || exit 1

35
resources/scripts/build/clean/flashrom
View File

@ -1,35 +0,0 @@
#!/usr/bin/env sh
# helper script: clean the dependencies that were built in flashrom
#
# Copyright (C) 2014, 2015 Leah Rowe <info@minifree.org>
# Copyright (C) 2015 Klemens Nanni <contact@autoboot.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/>.
#
# This script assumes that the current working directory is the root
# of git or release archive
[ "x${DEBUG+set}" = 'xset' ] && set -v
set -u -e
printf "Cleaning the previous build of flashrom\n"
[ ! -d "flashrom/" ] && exit 0
# clean flashrom
make -C flashrom clean
printf "\n\n"

39
resources/scripts/build/clean/grub
View File

@ -1,39 +0,0 @@
#!/usr/bin/env sh
# helper script: clean the dependencies that were built in GRUB
#
# Copyright (C) 2014, 2015, 2016 Leah Rowe <info@minifree.org>
# Copyright (C) 2015 Klemens Nanni <contact@autoboot.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/>.
#
# This script assumes that the current working directory is the root
# of git or release archive
[ "x${DEBUG+set}" = 'xset' ] && set -v
set -u -e
printf "Cleaning the previous build of GRUB\n"
[ ! -d "grub/" ] && exit 0
(
cd grub/
if [ -f Makefile ]; then
make distclean
fi
)
printf "\n\n"

33
resources/scripts/build/clean/ich9utils
View File

@ -1,33 +0,0 @@
#!/usr/bin/env sh
# helper script: clean the previous build of ich9utils
#
# Copyright (C) 2014, 2015, 2020 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/>.
#
# This script assumes that the current working directory is the root
# of libreboot_src or libreboot git
[ "x${DEBUG+set}" = 'xset' ] && set -v
set -u -e
# clean ich9deblob utility
# --------------------------------------------------------------------
printf "Cleaning the previous build of ich9utils\n"
make clean -C util/ich9utils
rm -Rf descriptors/
printf "\n\n"

35
resources/scripts/build/clean/memtest86plus
View File

@ -1,35 +0,0 @@
#!/usr/bin/env sh
# helper script: clean the dependencies that were built in memtest86+
#
# Copyright (C) 2014, 2015 Leah Rowe <info@minifree.org>
# Copyright (C) 2015 Klemens Nanni <contact@autoboot.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/>.
#
# This script assumes that the current working directory is the root
# of git or release archive
[ "x${DEBUG+set}" = 'xset' ] && set -v
set -u -e
printf "Cleaning the previous build of MemTest86+\n"
[ ! -d "memtest86plus" ] && exit 0
# clean MemTest86+
make -C memtest86plus clean
printf "\n\n"

31
resources/scripts/build/clean/rom_images
View File

@ -1,31 +0,0 @@
#!/usr/bin/env sh
# helper script: delete the ROM images
#
# Copyright (C) 2014, 2015 Leah Rowe <info@minifree.org>
# Copyright (C) 2015 Klemens Nanni <contact@autoboot.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/>.
#
# This script assumes that the current working directory is the root
# of git or release archive
[ "x${DEBUG+set}" = 'xset' ] && set -v
set -u -e
# Delete the ROM images
rm -Rf "bin/"
printf "Deleted the bin/ directory containing the ROM images.\n\n"

28
resources/scripts/build/clean/uefitool
View File

@ -1,28 +0,0 @@
#!/usr/bin/env sh
# helper script: run make clean on bios_extract
#
# 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
printf "Cleaning the previous build of uefitool (UEFIExtract)\n"
[ ! -d "uefitool" ] && exit 0
make clean -BC uefitool || exit 1

2
resources/scripts/build/descriptors/ich9m
View File

@ -23,7 +23,7 @@ ich9gen="util/ich9utils/ich9gen"
main() main()
{ {
[ -f "${ich9gen}" ] || ./build src for ich9utils || err "ich9utils make" [ -f "${ich9gen}" ] || ./build src for -b ich9utils || err "ich9utils make"
[ ! -f "${ich9gen}" ] && \ [ ! -f "${ich9gen}" ] && \
err "ich9gen doesn't exist" err "ich9gen doesn't exist"

3
resources/scripts/build/release/src
View File

@ -138,6 +138,9 @@ purge_files()
( (
cd "${srcdir}/" || err "cd3" cd "${srcdir}/" || err "cd3"
./build clean all || err "build-clean1" ./build clean all || err "build-clean1"
for p in bios_extract flashrom grub ich9utils memtest86plus uefitool; do
./build src for -c "${p}"
done
make clean -BC util/nvmutil || err "make-clean2" make clean -BC util/nvmutil || err "make-clean2"
make clean -BC util/ich9utils || err "make-clean3" make clean -BC util/ich9utils || err "make-clean3"
make clean -BC util/spkmodem_recv || err "make-clean4" make clean -BC util/spkmodem_recv || err "make-clean4"

25
resources/scripts/build/src/for
View File

@ -21,14 +21,27 @@
[ "x${DEBUG+set}" = 'xset' ] && set -v [ "x${DEBUG+set}" = 'xset' ] && set -v
set -u -e set -u -e
mode=""
project="" project=""
main() main()
{ {
[ $# -lt 1 ] && err "project name not specified" while getopts b:c: option
project="${1}" do
shift 1 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" [ "${project}" = "ich9utils" ] && project="util/ich9utils"
[ -d "${project}" ] || ./fetch "${project}" \ [ -d "${project}" ] || ./fetch "${project}" \
@ -41,7 +54,11 @@ main()
cmake UEFIExtract/ || err "cannot cmake UEFIExtract" cmake UEFIExtract/ || err "cannot cmake UEFIExtract"
) )
fi fi
make -C "${project}" || err "Cannot build project, ${project}" [ ! -z "${mode}" ] || \
make -C "${project}" || err "'make' failed (${project})"
[ -z "${mode}" ] || \
make -C "${project}" distclean || make -C "${project}" clean \
|| err "cannot clean project src, ${project}"
} }
err() err()

2
resources/scripts/update/blobs/download
View File

@ -207,7 +207,7 @@ build_dependencies()
|| fail "could not download uefitool" || fail "could not download uefitool"
fi fi
if [ ! -f uefitool/uefiextract ]; then if [ ! -f uefitool/uefiextract ]; then
./build src for uefitool \ ./build src for -b uefitool \
|| fail "could not build uefitool" || fail "could not build uefitool"
fi fi
if [ ! -f ${cbdir}/util/kbc1126/kbc1126_ec_dump ]; then if [ ! -f ${cbdir}/util/kbc1126/kbc1126_ec_dump ]; then