summaryrefslogtreecommitdiffstats
path: root/resources/scripts
diff options
context:
space:
mode:
authorLeah Woods <info@minifree.org>2016-05-19 04:41:18 (EDT)
committer Leah Woods <info@minifree.org>2016-05-19 04:41:18 (EDT)
commit08232a196b7383a0da9c66e75ab6ff2ad7f7a535 (patch)
tree6e580d3fb41e46ea10523c0b13d7a3f0acae609d /resources/scripts
parenta33099490113b82356bdc2a2b2339a48623fd27c (diff)
downloadlibreboot-08232a196b7383a0da9c66e75ab6ff2ad7f7a535.zip
libreboot-08232a196b7383a0da9c66e75ab6ff2ad7f7a535.tar.gz
libreboot-08232a196b7383a0da9c66e75ab6ff2ad7f7a535.tar.bz2
build/roms/withgrub: (buildfix) only delete ps2-keyboard-spinup if it exists
Diffstat (limited to 'resources/scripts')
-rwxr-xr-xresources/scripts/helpers/build/roms/withgrub_helper6
1 files changed, 4 insertions, 2 deletions
diff --git a/resources/scripts/helpers/build/roms/withgrub_helper b/resources/scripts/helpers/build/roms/withgrub_helper
index 9a20d64..cd4c3fc 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