diff options
| author | Leah Woods <info@minifree.org> | 2016-05-19 05:52:53 (EDT) |
|---|---|---|
| committer | Leah Woods <info@minifree.org> | 2016-05-19 05:52:53 (EDT) |
| commit | d48086382951072039226a8cbde1d9d009cfad12 (patch) | |
| tree | 62e66c12c43dd08ee0d950aa89b46c562af6c238 | |
| parent | 3afa15f89f998cdafaf86f949ea370943f1aaf84 (diff) | |
| download | libreboot-d48086382951072039226a8cbde1d9d009cfad12.zip libreboot-d48086382951072039226a8cbde1d9d009cfad12.tar.gz libreboot-d48086382951072039226a8cbde1d9d009cfad12.tar.bz2 | |
build/roms/withgrub: fix broken build (use bash properly. grep is not needed)
| -rwxr-xr-x | resources/scripts/helpers/build/roms/withgrub_helper | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/resources/scripts/helpers/build/roms/withgrub_helper b/resources/scripts/helpers/build/roms/withgrub_helper index 5969e2f..9ef67ff 100755 --- a/resources/scripts/helpers/build/roms/withgrub_helper +++ b/resources/scripts/helpers/build/roms/withgrub_helper @@ -137,15 +137,9 @@ do # SeaVGABIOS stuff ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add -f ../../../seabios/out/vgabios.bin -n vgaroms/vgabios.bin -t raw - if $(./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" print | grep -Fxq "etc\/ps2\-keyboard\-spinup"); then - # Remove default 3000ms timeout - ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" remove -n etc/ps2-keyboard-spinup - fi - - if ! $(./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" print | grep -Fxq "etc\/ps2\-keyboard\-spinup"); then - # Add keyboard startup delay timeout. Needed on some boards. 60s, just to play it safe. - ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add-int -i 60000 -n etc/ps2-keyboard-spinup - fi + # 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 60000 -n etc/ps2-keyboard-spinup || printf "already exists" # .config no longer needed rm -f ".config" |