From 023d6b69968b44e296caee308c173cb617b89497 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 20 Aug 2023 18:54:40 +0100 Subject: 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 --- resources/scripts/build/clean/bios_extract | 28 --------------------- resources/scripts/build/clean/flashrom | 35 -------------------------- resources/scripts/build/clean/grub | 39 ----------------------------- resources/scripts/build/clean/ich9utils | 33 ------------------------ resources/scripts/build/clean/memtest86plus | 35 -------------------------- resources/scripts/build/clean/rom_images | 31 ----------------------- resources/scripts/build/clean/uefitool | 28 --------------------- 7 files changed, 229 deletions(-) delete mode 100755 resources/scripts/build/clean/bios_extract delete mode 100755 resources/scripts/build/clean/flashrom delete mode 100755 resources/scripts/build/clean/grub delete mode 100755 resources/scripts/build/clean/ich9utils delete mode 100755 resources/scripts/build/clean/memtest86plus delete mode 100755 resources/scripts/build/clean/rom_images delete mode 100755 resources/scripts/build/clean/uefitool (limited to 'resources/scripts/build/clean') diff --git a/resources/scripts/build/clean/bios_extract b/resources/scripts/build/clean/bios_extract deleted file mode 100755 index 65493f78..00000000 --- a/resources/scripts/build/clean/bios_extract +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env sh - -# helper script: run make clean on bios_extract -# -# 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 - -printf "Cleaning the previous build of bios_extract\n" - -[ ! -d "bios_extract/" ] && exit 0 - -make clean -BC bios_extract || exit 1 diff --git a/resources/scripts/build/clean/flashrom b/resources/scripts/build/clean/flashrom deleted file mode 100755 index 744052fc..00000000 --- a/resources/scripts/build/clean/flashrom +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env sh - -# helper script: clean the dependencies that were built in flashrom -# -# Copyright (C) 2014, 2015 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 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" diff --git a/resources/scripts/build/clean/grub b/resources/scripts/build/clean/grub deleted file mode 100755 index dea2c2dd..00000000 --- a/resources/scripts/build/clean/grub +++ /dev/null @@ -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 -# 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 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" diff --git a/resources/scripts/build/clean/ich9utils b/resources/scripts/build/clean/ich9utils deleted file mode 100755 index 38ad439f..00000000 --- a/resources/scripts/build/clean/ich9utils +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env sh - -# helper script: clean the previous build of ich9utils -# -# Copyright (C) 2014, 2015, 2020 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 . -# - -# 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" diff --git a/resources/scripts/build/clean/memtest86plus b/resources/scripts/build/clean/memtest86plus deleted file mode 100755 index 807b20a7..00000000 --- a/resources/scripts/build/clean/memtest86plus +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env sh - -# helper script: clean the dependencies that were built in memtest86+ -# -# Copyright (C) 2014, 2015 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 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" diff --git a/resources/scripts/build/clean/rom_images b/resources/scripts/build/clean/rom_images deleted file mode 100755 index cd41d499..00000000 --- a/resources/scripts/build/clean/rom_images +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env sh - -# helper script: delete the ROM images -# -# Copyright (C) 2014, 2015 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 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" diff --git a/resources/scripts/build/clean/uefitool b/resources/scripts/build/clean/uefitool deleted file mode 100755 index ad8aa56e..00000000 --- a/resources/scripts/build/clean/uefitool +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env sh - -# helper script: run make clean on bios_extract -# -# 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 - -printf "Cleaning the previous build of uefitool (UEFIExtract)\n" - -[ ! -d "uefitool" ] && exit 0 - -make clean -BC uefitool || exit 1 -- cgit v1.2.1