From d48086382951072039226a8cbde1d9d009cfad12 Mon Sep 17 00:00:00 2001 From: Leah Woods Date: Thu, 19 May 2016 10:52:53 +0100 Subject: build/roms/withgrub: fix broken build (use bash properly. grep is not needed) --- resources/scripts/helpers/build/roms/withgrub_helper | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'resources/scripts/helpers/build/roms/withgrub_helper') diff --git a/resources/scripts/helpers/build/roms/withgrub_helper b/resources/scripts/helpers/build/roms/withgrub_helper index 5969e2f5..9ef67ff7 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" -- cgit v1.2.3-70-g09d2