From db52282cd9c0ea928c4cc640a02c69863ece5b18 Mon Sep 17 00:00:00 2001 From: "4 of 7 (Leah Rowe) info@minifree.org" Date: Sun, 22 Jan 2017 03:38:38 +0000 Subject: make use of ./oldbuild, not ./build, in the old build system --- resources/scripts/helpers/build/clean/grub | 2 +- resources/scripts/helpers/build/module/grub | 2 +- resources/scripts/helpers/build/release/src | 2 +- resources/scripts/helpers/build/release/util | 4 ++-- resources/scripts/helpers/build/roms/withgrub | 2 +- resources/scripts/helpers/build/roms/withgrub_helper | 4 ++-- resources/scripts/helpers/build/roms/withseabios | 2 +- resources/scripts/helpers/build/roms/withseabios_helper | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) (limited to 'resources/scripts') diff --git a/resources/scripts/helpers/build/clean/grub b/resources/scripts/helpers/build/clean/grub index 2b2f6a5d..fb01d64b 100755 --- a/resources/scripts/helpers/build/clean/grub +++ b/resources/scripts/helpers/build/clean/grub @@ -30,6 +30,6 @@ printf "Cleaning the previous build of GRUB\n" [ -d grub/Makefile ] && make -C grub distclean # Also clean SeaBIOS -./build clean seabios +./oldbuild clean seabios printf "\n\n" diff --git a/resources/scripts/helpers/build/module/grub b/resources/scripts/helpers/build/module/grub index c663777c..f6c1657b 100755 --- a/resources/scripts/helpers/build/module/grub +++ b/resources/scripts/helpers/build/module/grub @@ -54,4 +54,4 @@ make -j${cores} ) # Also build SeaBIOS, which we use with GRUB to make SeaGRUB -./build module seabios +./oldbuild module seabios diff --git a/resources/scripts/helpers/build/release/src b/resources/scripts/helpers/build/release/src index c33f9b4b..69279070 100755 --- a/resources/scripts/helpers/build/release/src +++ b/resources/scripts/helpers/build/release/src @@ -80,7 +80,7 @@ printf '%s\n' "${versiondate}" >"${distdir}/versiondate" printf 'Cleaning files in %s/\n' "${distdir}" # Clean old builds. -(cd "${distdir}/" && ./build clean all) +(cd "${distdir}/" && ./oldbuild clean all) printf '\n' # Delete Git repositories and properties and Subversion administrative diff --git a/resources/scripts/helpers/build/release/util b/resources/scripts/helpers/build/release/util index 7dcfa28b..37a3f238 100755 --- a/resources/scripts/helpers/build/release/util +++ b/resources/scripts/helpers/build/release/util @@ -95,7 +95,7 @@ printf '%s\n' "${versiondate}" >"${distdir}/versiondate" # Include it statically compiled cp -R "bucts" "bucts_/" # make it statically compile -./build module bucts static +./oldbuild module bucts static mkdir -p "${distdir}/bucts/${arch}/" mv "bucts/bucts" "${distdir}/bucts/${arch}/" rm -Rf "bucts/" @@ -108,7 +108,7 @@ mv "bucts_/" "bucts/" # Include it statically compiled cp -R "flashrom/" "flashrom_/" # make it statically compile -./build module flashrom static +./oldbuild module flashrom static mkdir -p "${distdir}/flashrom/${arch}/" mv "flashrom/flashrom" "${distdir}/flashrom/${arch}/" mv "flashrom/flashrom_lenovobios_sst" "${distdir}/flashrom/${arch}/" diff --git a/resources/scripts/helpers/build/roms/withgrub b/resources/scripts/helpers/build/roms/withgrub index be2fbc49..d4b6529b 100755 --- a/resources/scripts/helpers/build/roms/withgrub +++ b/resources/scripts/helpers/build/roms/withgrub @@ -61,7 +61,7 @@ done buildrom() { board="$1" if [ -f "resources/libreboot/config/grub/${board}/config" ]; then - ./build roms withgrub_helper "${board}" + ./oldbuild roms withgrub_helper "${board}" fi } diff --git a/resources/scripts/helpers/build/roms/withgrub_helper b/resources/scripts/helpers/build/roms/withgrub_helper index 869410e9..8ee63146 100755 --- a/resources/scripts/helpers/build/roms/withgrub_helper +++ b/resources/scripts/helpers/build/roms/withgrub_helper @@ -37,8 +37,8 @@ else fi if (( $# != 1 )); then - printf "Usage: ./buildrom-withgrub boardname\n" - printf "Example: ./buildrom-withgrub x60\n" + printf "Usage: ./oldbuild rom withgrub boardname\n" + printf "Example: ./oldbuild rom withgrub x60\n" printf "You need to specify exactly 1 argument\n" exit 1 fi diff --git a/resources/scripts/helpers/build/roms/withseabios b/resources/scripts/helpers/build/roms/withseabios index 5b69c452..e43c642f 100755 --- a/resources/scripts/helpers/build/roms/withseabios +++ b/resources/scripts/helpers/build/roms/withseabios @@ -34,7 +34,7 @@ printf "Building ROM images with the SeaBIOS payload\n" buildrom() { board="$1" if [ -f "resources/libreboot/config/seabios/${board}/config" ]; then - ./build roms withseabios_helper "${board}" + ./oldbuild roms withseabios_helper "${board}" fi } diff --git a/resources/scripts/helpers/build/roms/withseabios_helper b/resources/scripts/helpers/build/roms/withseabios_helper index 56d03d65..f738e991 100755 --- a/resources/scripts/helpers/build/roms/withseabios_helper +++ b/resources/scripts/helpers/build/roms/withseabios_helper @@ -37,8 +37,8 @@ else fi if (( $# != 1 )); then - printf "Usage: ./buildrom-withseabios boardname\n" - printf "Example: ./buildrom-withseabios x60\n" + printf "Usage: ./oldbuild rom withseabios boardname\n" + printf "Example: ./oldbuild rom withseabios x60\n" printf "You need to specify exactly 1 argument\n" exit 1 fi -- cgit v1.2.3-70-g09d2