diff options
author | Jumail Mundekkat <[email protected]> | 2019-02-19 05:00:33 +1100 |
---|---|---|
committer | MechMerlin <[email protected]> | 2019-02-18 10:00:33 -0800 |
commit | 149015e799b5d5df49f7e22aa7bce8f607afdd28 (patch) | |
tree | e95212c7f3534f0ceda29edddef2c6aa4aec0771 /tmk_core/avr.mk | |
parent | 0cee0764fd9d53d6bb835e2db2340f2541870386 (diff) | |
download | qmk_firmware-149015e799b5d5df49f7e22aa7bce8f607afdd28.tar.gz qmk_firmware-149015e799b5d5df49f7e22aa7bce8f607afdd28.zip |
Fixed grep issue in bootloader build target (#3848)0.6.297
* Changed use of '\s' in grep to '[ \t]' for portability
* Pushed DFU Keyboard.h into a shell script
* Fixed execution permissions on make_dfu_header,sh
Diffstat (limited to 'tmk_core/avr.mk')
-rw-r--r-- | tmk_core/avr.mk | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk index 0c3a9624cb..d22c3bbcad 100644 --- a/tmk_core/avr.mk +++ b/tmk_core/avr.mk @@ -292,14 +292,7 @@ extcoff: $(BUILD_DIR)/$(TARGET).elf bootloader: make -C lib/lufa/Bootloaders/DFU/ clean - printf "#ifndef QMK_KEYBOARD\n#define QMK_KEYBOARD\n\n" > lib/lufa/Bootloaders/DFU/Keyboard.h - printf "%s\n" "`$(GREP) "MANUFACTURER\s" $(ALL_CONFIGS) -h | tail -1`" >> lib/lufa/Bootloaders/DFU/Keyboard.h - printf "%s Bootloader\n" "`$(GREP) "PRODUCT\s" $(ALL_CONFIGS) -h | tail -1 | tr -d '\r'`" >> lib/lufa/Bootloaders/DFU/Keyboard.h - printf "%s\n" "`$(GREP) "QMK_ESC_OUTPUT\s" $(ALL_CONFIGS) -h | tail -1`" >> lib/lufa/Bootloaders/DFU/Keyboard.h - printf "%s\n" "`$(GREP) "QMK_ESC_INPUT\s" $(ALL_CONFIGS) -h | tail -1`" >> lib/lufa/Bootloaders/DFU/Keyboard.h - printf "%s\n" "`$(GREP) "QMK_LED\s" $(ALL_CONFIGS) -h | tail -1`" >> lib/lufa/Bootloaders/DFU/Keyboard.h - printf "%s\n" "`$(GREP) "QMK_SPEAKER\s" $(ALL_CONFIGS) -h | tail -1`" >> lib/lufa/Bootloaders/DFU/Keyboard.h - printf "\n#endif" >> lib/lufa/Bootloaders/DFU/Keyboard.h + $(TMK_DIR)/make_dfu_header.sh $(ALL_CONFIGS) make -C lib/lufa/Bootloaders/DFU/ printf "BootloaderDFU.hex copied to $(TARGET)_bootloader.hex\n" cp lib/lufa/Bootloaders/DFU/BootloaderDFU.hex $(TARGET)_bootloader.hex |