diff options
| author | Leah Rowe <info@minifree.org> | 2016-07-18 04:02:34 (EDT) |
|---|---|---|
| committer | Leah Rowe <info@minifree.org> | 2016-07-18 04:02:34 (EDT) |
| commit | 0373acaa3ea20b4f93dd25309a7e98173db5f3e3 (patch) | |
| tree | 2f8079185d5910eca6f251698fd7fbf106599e98 | |
| parent | 7cb691f8a1025653687e698f840a6ce6920cb6f2 (diff) | |
| download | libreboot-0373acaa3ea20b4f93dd25309a7e98173db5f3e3.zip libreboot-0373acaa3ea20b4f93dd25309a7e98173db5f3e3.tar.gz libreboot-0373acaa3ea20b4f93dd25309a7e98173db5f3e3.tar.bz2 | |
build/roms/withgrub: don't add grub a 2nd time if not using seagrub
| -rwxr-xr-x | resources/scripts/helpers/build/roms/withgrub_helper | 41 |
1 files changed, 23 insertions, 18 deletions
diff --git a/resources/scripts/helpers/build/roms/withgrub_helper b/resources/scripts/helpers/build/roms/withgrub_helper index 88be03a..1d47648 100755 --- a/resources/scripts/helpers/build/roms/withgrub_helper +++ b/resources/scripts/helpers/build/roms/withgrub_helper @@ -102,32 +102,37 @@ do cp "../../grub_${romtype}.elf" "grub.elf" if [ "${boardtarget}" = "d510mo" ] || [ "${boardtarget}" = "ga-g41m-es2l" ]; then # Do not use SeaGRUB - cp grub.elf payload.elf + cp grub.elf payload.elf + make -j${cores} + mv "build/coreboot.rom" "${boardtarget}_${romtype}.rom" + + # We dont need seabios.elf anymore + rm -f "payload.elf" else # Use SeaGRUB cp "../../../seabios/out/bios.bin.elf" "payload.elf" - fi - make -j${cores} - mv "build/coreboot.rom" "${boardtarget}_${romtype}.rom" + make -j${cores} - # We dont need seabios.elf anymore - rm -f "payload.elf" + mv "build/coreboot.rom" "${boardtarget}_${romtype}.rom" - # Add the grub.elf to CBFS - ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add-payload -c lzma -f grub.elf -n img/grub2 + # We dont need seabios.elf anymore + rm -f "payload.elf" + # Add the grub.elf to CBFS + ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add-payload -c lzma -f grub.elf -n img/grub2 - # Set bootorder so that seabios loads grub by default - printf "/rom@img/grub2\n" > bootorder - ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add -f bootorder -n bootorder -t raw - rm -f bootorder + # Set bootorder so that seabios loads grub by default + printf "/rom@img/grub2\n" > bootorder + ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add -f bootorder -n bootorder -t raw + rm -f bootorder - # Add 0s delay to seabios, so that the user is not burdened by seeing - # that horrible interface that seabios has - ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add-int -i 0 -n etc/show-boot-menu || "already exists" + # Add 0s delay to seabios, so that the user is not burdened by seeing + # that horrible interface that seabios has + ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add-int -i 0 -n etc/show-boot-menu || "already exists" - # keyboard spinup timeout - ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" remove -n etc/ps2-keyboard-spinup || printf "does not exist" - ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add-int -i 3000 -n etc/ps2-keyboard-spinup || printf "already exists" + # keyboard spinup timeout + ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" remove -n etc/ps2-keyboard-spinup || printf "does not exist" + ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add-int -i 3000 -n etc/ps2-keyboard-spinup || printf "already exists" + fi # we dont need that grub.elf now rm -f "grub.elf" |