From 08232a196b7383a0da9c66e75ab6ff2ad7f7a535 Mon Sep 17 00:00:00 2001 From: Leah Woods Date: Thu, 19 May 2016 09:41:18 +0100 Subject: build/roms/withgrub: (buildfix) only delete ps2-keyboard-spinup if it exists --- resources/scripts/helpers/build/roms/withgrub_helper | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'resources') diff --git a/resources/scripts/helpers/build/roms/withgrub_helper b/resources/scripts/helpers/build/roms/withgrub_helper index 9a20d64a..cd4c3fca 100755 --- a/resources/scripts/helpers/build/roms/withgrub_helper +++ b/resources/scripts/helpers/build/roms/withgrub_helper @@ -137,8 +137,10 @@ do # SeaVGABIOS stuff ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add -f ../../../seabios/out/vgabios.bin -n vgaroms/vgabios.bin -t raw - # Remove default 3000ms timeout - ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" remove -n etc/ps2-keyboard-spinup + if ! $(./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" | grep -Fxq "etc\/ps2\-keyboard\-spinup"); then + # Remove default 3000ms timeout + ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" remove -n etc/ps2-keyboard-spinup + fi # 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 -- cgit v1.2.3-70-g09d2