diff options
| author | Francis Rowe <info@gluglug.org.uk> | 2014-12-13 11:41:12 (EST) |
|---|---|---|
| committer | Francis Rowe <info@gluglug.org.uk> | 2014-12-13 11:41:12 (EST) |
| commit | 37176cdddf98c8884a39179560d5caa07ceddd0f (patch) | |
| tree | 3f12efef9b27f8920a1df582416e095d6b751750 | |
| parent | 1bec251023a6e43e6cbe4cba153b3e706df25d38 (diff) | |
| download | libreboot-37176cdddf98c8884a39179560d5caa07ceddd0f.zip libreboot-37176cdddf98c8884a39179560d5caa07ceddd0f.tar.gz libreboot-37176cdddf98c8884a39179560d5caa07ceddd0f.tar.bz2 | |
docs/git/index.html#build: fix build-release instructions
Tell the user how to properly build flashrom/bucts with static
linking. Update build-release.
| -rwxr-xr-x | build-release | 16 | ||||
| -rwxr-xr-x | builddeps-bucts | 9 | ||||
| -rw-r--r-- | docs/git/index.html | 3 |
3 files changed, 16 insertions, 12 deletions
diff --git a/build-release b/build-release index 5b4d713..b903b3f 100755 --- a/build-release +++ b/build-release @@ -146,22 +146,18 @@ cp resources/grub/config/seabios.cfg libreboot_bin/ # X60/T60: BUC.TS utility is needed to flash libreboot while Lenovo BIOS is running # Include it statically compiled cp -r bucts bucts_ -cd bucts/ # make it statically compile -git apply ../resources/bucts/patch/staticlink.diff -make clean -make -mkdir ../libreboot_bin/bucts +./builddeps-bucts static +mkdir libreboot_bin/bucts if [ $(uname -i) = "i686" ] || [ $(uname -m) = "i686" ] then - mkdir ../libreboot_bin/bucts/i686 - mv bucts ../libreboot_bin/bucts/i686 + mkdir libreboot_bin/bucts/i686 + mv bucts/bucts libreboot_bin/bucts/i686 elif [ $(uname -i) = "x86_64" ] || [ $(uname -m) = "x86_64" ] then - mkdir ../libreboot_bin/bucts/x86_64 - mv bucts ../libreboot_bin/bucts/x86_64 + mkdir libreboot_bin/bucts/x86_64 + mv bucts/bucts libreboot_bin/bucts/x86_64 fi -cd ../ rm -rf bucts mv bucts_ bucts diff --git a/builddeps-bucts b/builddeps-bucts index ead751b..7125e83 100755 --- a/builddeps-bucts +++ b/builddeps-bucts @@ -32,7 +32,14 @@ cd bucts make clean # build bucts -make +if (( $# != 1 )); then + # build it dynamically linked + make +else + git apply ../resources/bucts/patch/staticlink.diff + # build it statically linked + make +fi # done. go back to main directory cd ../ diff --git a/docs/git/index.html b/docs/git/index.html index c3286b9..f306a2c 100644 --- a/docs/git/index.html +++ b/docs/git/index.html @@ -529,7 +529,8 @@ <p> If you are building 32-bit binaries on a live system or chroot (for flashrom/bucts), you can use the following to statically link them:<br/> - $ <b>make SHARED=0 CC='gcc -static'</b> + $ <b>./builddeps-flashrom static</b><br/> + $ <b>./builddeps-bucts static</b> </p> <p> |