libreboot

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README

commit 2ababd6422821e17ff28f84155e65ac81a160ca5
parent 04ac27a7d25ea7396b7b84d662bff063d2f56b47
Author: Francis Rowe <info@gluglug.org.uk>
Date:   Mon,  8 Jun 2015 12:35:13 +0100

build/external/source moved to build/release/tobuild

build/release/util no longer runs it

Diffstat:
docs/git/index.html | 2+-
resources/scripts/helpers/build/external/source | 73-------------------------------------------------------------------------
resources/scripts/helpers/build/release/tobuild | 76++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
resources/scripts/helpers/build/release/util | 11-----------
4 files changed, 77 insertions(+), 85 deletions(-)

diff --git a/docs/git/index.html b/docs/git/index.html @@ -821,7 +821,7 @@ <p> The command that you used for generating the release archives will also run the following command:<br/> - $ <b>./build external source</b><br/> + $ <b>./build release tobuild</b><br/> The archive <b>tobuild.tar.xz</b> will have been created under <b>release/</b>, containing bucts, flashrom and all other required resources for building them. </p> diff --git a/resources/scripts/helpers/build/external/source b/resources/scripts/helpers/build/external/source @@ -1,73 +0,0 @@ -#!/bin/bash - -# helper: prepare a small source archive for those utils -# that don't easily cross-compile. Then the tarball can be extracted -# on those machines with the target architecture, and compiled. -# -# Copyright (C) 2014, 2015 Francis Rowe <info@gluglug.org.uk> -# -# 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 "Creating source archive for flashrom and bucts\n" - -# delete the old data -rm -Rf tobuild -rm -f tobuild.tar.xz - -# this is where they will go -mkdir tobuild - -# flashrom -cp -R flashrom/ tobuild/ -cd tobuild/flashrom/ -rm -f flashrom_lenovobios_sst flashrom_lenovobios_macronix -make clean -cd ../../ -mkdir tobuild/resources/ -mkdir tobuild/resources/flashrom/ -cp -R resources/flashrom/patch/ tobuild/resources/flashrom/ - -# bucts -cp -R bucts tobuild/ -cd tobuild/bucts/ -make clean -cd ../../ -mkdir tobuild/resources/bucts/ -cp -R resources/bucts/patch/ tobuild/resources/bucts/ - -# the build script will be needed -cp build tobuild/ -# needed build scripts (helpers) -mkdir tobuild/resources/scripts/ -mkdir tobuild/resources/scripts/helpers/ -mkdir tobuild/resources/scripts/helpers/build/ -mkdir tobuild/resources/scripts/helpers/build/module/ -mkdir tobuild/resources/scripts/helpers/build/clean/ -cp resources/scripts/helpers/build/clean/bucts tobuild/resources/scripts/helpers/build/clean/ -cp resources/scripts/helpers/build/clean/flashrom tobuild/resources/scripts/helpers/build/clean/ -cp resources/scripts/helpers/build/module/bucts tobuild/resources/scripts/helpers/build/module/ -cp resources/scripts/helpers/build/module/flashrom tobuild/resources/scripts/helpers/build/module/ -cp resources/scripts/misc/powertop.trisquel7 tobuild/ - -# that is all. now tar it up -tar -c tobuild | xz -9e >tobuild.tar.xz - -# and delete the directory -rm -Rf tobuild/ - -printf "\n\n" diff --git a/resources/scripts/helpers/build/release/tobuild b/resources/scripts/helpers/build/release/tobuild @@ -0,0 +1,76 @@ +#!/bin/bash + +# helper: prepare a small source archive for those utils +# that don't easily cross-compile. Then the tarball can be extracted +# on those machines with the target architecture, and compiled. +# +# Copyright (C) 2014, 2015 Francis Rowe <info@gluglug.org.uk> +# +# 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 "Creating source archive for flashrom and bucts\n" + +# delete the old data +rm -Rf tobuild +rm -f tobuild.tar.xz + +# this is where they will go +mkdir tobuild + +# flashrom +cp -R flashrom/ tobuild/ +cd tobuild/flashrom/ +rm -f flashrom_lenovobios_sst flashrom_lenovobios_macronix +make clean +cd ../../ +mkdir tobuild/resources/ +mkdir tobuild/resources/flashrom/ +cp -R resources/flashrom/patch/ tobuild/resources/flashrom/ + +# bucts +cp -R bucts tobuild/ +cd tobuild/bucts/ +make clean +cd ../../ +mkdir tobuild/resources/bucts/ +cp -R resources/bucts/patch/ tobuild/resources/bucts/ + +# the build script will be needed +cp build tobuild/ +# needed build scripts (helpers) +mkdir tobuild/resources/scripts/ +mkdir tobuild/resources/scripts/helpers/ +mkdir tobuild/resources/scripts/helpers/build/ +mkdir tobuild/resources/scripts/helpers/build/module/ +mkdir tobuild/resources/scripts/helpers/build/clean/ +cp resources/scripts/helpers/build/clean/bucts tobuild/resources/scripts/helpers/build/clean/ +cp resources/scripts/helpers/build/clean/flashrom tobuild/resources/scripts/helpers/build/clean/ +cp resources/scripts/helpers/build/module/bucts tobuild/resources/scripts/helpers/build/module/ +cp resources/scripts/helpers/build/module/flashrom tobuild/resources/scripts/helpers/build/module/ +cp resources/scripts/misc/powertop.trisquel7 tobuild/ + +# that is all. now tar it up +tar -c tobuild | xz -9e >tobuild.tar.xz + +# and delete the directory +rm -Rf tobuild/ + +printf "Tar archives are stored in release/.\n" +printf "NOTE: don't forget to add ARM binaries for flashrom.\n" +printf "NOTE: don't forget to add i386 binaries for flashrom/bucts.\n" +printf "The archive tobuild.tar.xz has been created with everything needed to build these utilities.\n\n" diff --git a/resources/scripts/helpers/build/release/util b/resources/scripts/helpers/build/release/util @@ -273,17 +273,6 @@ printf "\n\n" # The uncompressed archives are no longer needed rm -Rf libreboot_util -# For those utilities that have to be built on the target -./build external source - -# Move the archive to the release directory -mv tobuild.tar.xz release/ - -printf "Tar archives are stored in release/.\n" -printf "NOTE: don't forget to add ARM binaries for flashrom.\n" -printf "NOTE: don't forget to add i386 binaries for flashrom/bucts.\n" -printf "The archive tobuild.tar.xz has been created with everything needed to build these utilities.\n\n" - # create sha512sum manifest cd release/ printf "Creating manifest of SHA512 sums in sha512sum.txt...\n"