diff options
| -rw-r--r-- | docs/git/index.html | 4 | ||||
| -rwxr-xr-x | resources/scripts/helpers/build/roms/withgrub | 2 | ||||
| -rwxr-xr-x | resources/scripts/helpers/build/roms/withgrub_helper (renamed from resources/scripts/helpers/build/roms/helper) | 7 |
3 files changed, 8 insertions, 5 deletions
diff --git a/docs/git/index.html b/docs/git/index.html index 620af0c..447a364 100644 --- a/docs/git/index.html +++ b/docs/git/index.html @@ -818,7 +818,9 @@ </p> <p> - The ROM images will be stored under <b>bin/</b>. + The ROM images will be stored under <b>bin/<i>payload</i>/</b>, + where <i>payload</i> could be <i>grub</i>, <i>seabios</i>, or + whatever other payload those images were built for. </p> <div class="subsection"> diff --git a/resources/scripts/helpers/build/roms/withgrub b/resources/scripts/helpers/build/roms/withgrub index dbd89e1..cb205d2 100755 --- a/resources/scripts/helpers/build/roms/withgrub +++ b/resources/scripts/helpers/build/roms/withgrub @@ -71,7 +71,7 @@ cd ../ for board in ${boards} do if [ -f "resources/libreboot/config/grub/${board}/config" ]; then - ./build roms helper ${board} + ./build roms withgrub_helper ${board} fi done diff --git a/resources/scripts/helpers/build/roms/helper b/resources/scripts/helpers/build/roms/withgrub_helper index 236b8da..72ea451 100755 --- a/resources/scripts/helpers/build/roms/helper +++ b/resources/scripts/helpers/build/roms/withgrub_helper @@ -31,7 +31,7 @@ if (( $# != 1 )); then exit 1 fi -printf "Helper script: build ROM images for '%s'\n" "${1}" +printf "GRUB Helper script: build ROM images for '%s'\n" "${1}" cd "coreboot/" @@ -122,8 +122,9 @@ mv "${1}"*.rom "${1}/" # delete the old ROM's from ../bin rm -Rf "../bin/${1}/" -# now put the new ROM's in ./bin -mv "${1}/" "../bin" +# now put the new ROM's in ./bin/grub/ +[ ! -d "../bin/grub/" ] && mkdir -p "../bin/grub/" +mv "${1}/" "../bin/grub/" # libreboot version file no longer needed rm -f "lbversion" |