summaryrefslogtreecommitdiffstats
path: root/util
Commit message (Collapse)AuthorAgeFilesLines
* adjust install_avr function to use unzip for broader compatibility (#4596)Peter K. Cawley2018-12-101-2/+3
| | | | | | | | | | | | | | | | | | | | On a laptop with god knows what mandatory security software (Cylance?), running up-to-date Windows 10 with msys2 mingw-64, attempting to install the AVR toolkit results in the following error: ``` 1 [main] 7z (13316) C:\msys32\usr\lib\p7zip\7z.exe: *** fatal error - cygheap base mismatch detected - 0x612A5410/0x2375410. This problem is probably due to using incompatible versions of the cygwin DLL. Search for cygwin1.dll using the Windows Start->Find/Search facility and delete all but the most recent version. The most recent version *should* reside in x:\cygwin\bin, where 'x' is the drive on which you have installed the cygwin distribution. Rebooting is also suggested if you are unable to find another cygwin DLL. ``` This appears to be related in some way, based on my research, to ASLR functionality in security software. Since I'm unable to override whatever is enforcing ASLR on my system, after trying several other approaches (removing other copies of msys-2.0.dll, which is what this is apparently actually referencing, rebasing that file in Windows to address 0x61000000, a few other things) I simply edited the installation shell script to use `unzip` instead of 7zip; `unzip`'s binary does not provoke a mismatch error and the installation proceeds as it should. I'm not aware of the reason why some parts of the install script use `unzip` (e.g. `install_arm`) and others use 7zip, but it seems that for broader compatibility and sparing users on locked down machines the 120 minutes or so of futzing this took me to fix, it might be better to just use `unzip` in all cases. Note: There is another function that uses 7zip, `extract_flip`. The line is `7z -oflip x FlipInstaller.exe`. I'm not sure what this is doing, or whether it's possible to do it with `unzip`, but it produces the same error. I haven't attempted to fix that in this PR, but it might be good to fix it for the same reason.
* Add a better Docker build script + update Dockerfile (#4222)Konstantin Đorđević2018-12-081-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add a Docker build script * Add usage and error messages * Add -r to reads Thanks mechmerlin * Add keyboard:keymap form, improve script * Add target argument, change usage forms in script * Add check for more than 3 args in keyboard:keymap:target form * Change Docker base image to debian, use community repo This matches what qmk_compiler uses (https://github.com/qmk/qmk_compiler/blob/master/Dockerfile#L1). I've removed the maintainer as we now have a community build on Docker Hub (https://hub.docker.com/r/qmkfm/qmk_firmware). This Dockerfile will also be maintained by the community. * Change build command format to keyboard:keymap * Call make directly in container run command * Simplify script, remove 3-arg form * Add COPY to Dockerfile so images are usable in and of themselves Also change WORKDIR from /qmk to /qmk_firmware * Add USB pass-through for Linux and docker-machine hosts * Read directly into variables instead of array * Alphabetically sort dependencies in Dockerfile * Set executable bit on util/docker_build.sh * Update Docker docs * Add warning about Docker on Windows * Expand comment in docs * Check docker-machine exit code instead of string * Only match --help with whole arguments * Make script POSIX-compliant * Convert script indentation to tabs
* Update MSYS to use the 5.4.0 toolchain (#4106)Drashna Jaelre2018-11-271-3/+5
|
* fix diffutils arch package name (#4470)André Silva2018-11-241-2/+2
|
* convert to unix line-endings [skip ci]QMK Bot2018-11-121-253/+253
|
* Change hex file permission to 644 from 755Junya Ogura2018-11-121-0/+0
|
* Make sure that avr-gcc@7 gets linked into the path on MacOS.Michael Kaylan2018-11-121-0/+1
|
* Add missing arm gcc compiler for openSUSE 15.0 and Tumbleweed.Daniel Shields2018-11-121-0/+3
|
* Add support for slackware distribution (linux_install.sh) (#4369)Paco2018-11-121-0/+22
| | | | | | | | | | | | | | | * Add support for slackware distribution (linux_install.sh) The required packages are not provided by the official repository. The packages need to be installed from slackbuilds.org either manually or with the help of third party tools like sbotools. * Modify linux_install.sh according to code review Modifies the Slackware section of the linux_install.sh script based on the suggestions from the code review. * Modify utils/linux_install.sh according to suggestions
* Improve new_project script (#4373)Yan-Fa Li2018-11-111-15/+36
| | | | | | | | | | | | | | | | | | | | * Improve new_project script - use git user.name if available to replace the boilerplate name in files we generate - fix shellshock warnings * Test for git repo Suggestion by @skullydazed * Fix shellshock warning * Incorporate feedback from reviewers - thanks @vomindoraan - use a heredoc instead of echo for console - factor out common paths
* Add distro support for sabayon (#4320)BK2018-11-031-2/+15
| | | | | | | | | | | | | * Add distro support for sabayon Sabayon is a gentoo based distro with a different package manager. Does not need any use flags or masking for the required packages. * Add missing backslash * Put echo string in quotes, remove extra newline * Order gentoo/sabayon packages alphabetically.
* Set the executable bit for sh scripts under util.Fredric Silberberg2018-11-0211-0/+0
|
* Make linux_install.sh work with openSUSE Leap 15.0 (#4218)Daniel Shields2018-10-291-1/+5
|
* fixed broken linebreak in fedora part, and indentation in arch-partR4WBIT2018-10-291-2/+2
|
* Bug: Users had to be in the /util directory to run the script (#4228)MechMerlin2018-10-241-1/+1
|
* adds 'dfu-util' to macos_install.shColin T.A. Gray2018-10-221-1/+1
|
* Fixup the WSL installskullY2018-10-222-9/+1
|
* Add opensuse packages provided by @isolatedvirusskullY2018-10-221-0/+14
|
* Fold install_dependencies.sh into linux_install.sh and freebsd_install.shskullY2018-10-224-151/+114
|
* Enable support for Linux Mint 18 with linux_install.sh (#4042)Chris Johnston2018-10-021-2/+2
| | | | | | | | Enable support for ubuntu-derived linux-es in installer Checks /etc/os-release for mention of ubuntu and debian. Linux Mint uses ID_LIKE=ubuntu, not ID_LIKE=debian (as seen in Ubuntu 16.04, unsure about others)
* Pin avr-gcc in shell.nix pending release of 8.3.0 (#3922)Jack Henahan2018-09-251-1/+3
| | | | | | | | * Pin avr-gcc in shell.nix pending release of 8.3.0 There's apparently a critical bug in 8.2.0, which is now the nixpkgs default. This change overrides that default in favor of the known good version. Once 8.3.0 is the default, the override can be dropped. * Arch/Manjaro fix
* Add an easy way to create new keymaps for your favorite keyboard (#3868)MechMerlin2018-09-131-0/+40
| | | | | | | | | | | | | | | | | | | | * initial commit of keymap creation script * create default keymap * pass shellcheck * provide a better usage message * change printf string to more accurately reflect the path * make it more easily understood * found another typo * add documentation regarding the new_keymap script * enforce lowercase for userinputs
* Fix installation for linux finding ID:fedora in os_releaseMiguel Garcia Rodriguez2018-09-101-1/+1
|
* Add manjaro asn arch-based distroThomas Vandaele2018-09-101-1/+1
|
* Fix Typos in echoDrashna Jaelre2018-08-111-1/+2
|
* Add WSL support to scriptDrashna Jaelre2018-08-111-3/+6
|
* Add error message if config not detectedDrashna Jaelre2018-08-111-0/+2
|
* Add 32 bit MINGW support ....Drashna Jaelre2018-08-111-1/+1
|
* Fix minor typo in qmk_install.sh for MSYS/MINGW64 detectionDrashna Jaelre2018-08-111-1/+1
|
* Update ISP flashing guide with pre-compiled binary (#3217)Jack Humbert2018-08-021-0/+362
| | | | | | | | | | | | * update flashing guide with pre-compiled binary * Add files via upload * Update isp_flashing_guide.md * update file and instructions * update instructions
* Fix qmk_install.sh to properly target MSYS (#3455)Taylor Gonzalez2018-08-021-1/+1
| | | | | | | | * qmk_install fix for windows users. * Updated wildcard to caputre both MSYS and MINGW64 in qmk_install * added OR to windows qmk_install
* Added gentoo to installer (#3272)zjpxshade2018-07-151-3/+17
| | | | | | | | | | | | | | | | | | | | * Added gentoo installer * Remove comments * Remove comments * Updating the layout * Revert "Remove comments" This reverts commit e348afa41a470d4b8f1865d92b85acd32ab14074. * Revert "Updating the layout" This reverts commit 181822d195f722f4981825ded7dd85fa268c3c56. * Undo erroneous revert
* Instruct macos users to use avr-gcc@7 (#3337)Evan Travers2018-07-071-1/+1
| | | | | | | If you run `brew install avr-gcc`, you get a version that has compatibility issues with LUFA. I updated the getting started guide for osx, the qmk_install setup script, and added a section to the FAQ for folks like me who accidentally updated avr-gcc past 7.
* Support both AVR and ps2avrGB targets for new_project script (#2811)MechMerlin2018-05-101-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | * Stopping point at creating targets for new_project script * Add second argument for target * Add the ps2avrgb target * consider the case where the firmware type target is not valid * fix template files to be more generic * Code cleanup * Change variable name to be more descriptive * make avr the default * forgot to put the template files in * Take out useless comments * add usage info
* Added propper support for Lets split vitamins (#2559)Mikkel Jeppesen2018-05-092-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added support for the upcomming Lets_split vitamins included * Updated readme * Corrected header of readme * Enabled RGB * Broke everything * broke some more shit * Revert "broke some more shit" This reverts commit 6ad68e6269cc0d04c16564ce9598dfd3db1e23c1. * Revert "Broke everything" This reverts commit feeee4e40db15a726f2292b6a9406ef45c1e54a7. * Fixed USB detection, and RGB on slave * started modifying readme, to use msys2 * Added support for the upcomming Lets_split vitamins included * Updated readme * Corrected header of readme * Enabled RGB * Broke everything * broke some more shit * Revert "broke some more shit" This reverts commit 6ad68e6269cc0d04c16564ce9598dfd3db1e23c1. * Revert "Broke everything" This reverts commit feeee4e40db15a726f2292b6a9406ef45c1e54a7. * Fixed USB detection, and RGB on slave * started modifying readme, to use msys2 * Updated readme to reflect use of msys2 Added avrdude to msys path * added avrdude option to msys installer * Removed extra installation of avrdude * Renamed to vitamins_included and implemented drashnas changes * Fixed include guard * Fixed some includes, and added avrdude target to docs. * Fixed default keyboard
* Added archlinux support to linux_install.shFlorens Pauwels2018-05-021-0/+9
|
* Updated personal keymaps, fixed Let's Split default keymap, updated JJ40 ↵Kenneth Aloysius2018-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | README (#2704) * Add M6-A keymap * Update XD60 keymap * Update XD60 keymap readme * Update JJ40 and Let's Split keymaps * Add readme for M6-A * Fix typo, update JJ40 README * Update jj40 readme * Cleanup jj40 keymap * Revert Let's Split QWERTY layer to default before #2010 * Update numpad layers * Fix: Let's Split keymap getting stuck mods due to having keycodes assigned on the Raise layer * Keep ASCII art consistent with keymap
* Hopefully fix Travis Auto-IncrementationU-LANDSRAAD\drashna2018-03-291-12/+29
| | | | | This reverts the changes in #2491, so that Travis will hopefully return to automatic incrementing. But this includes the layout and userspace excepts, as well.
* rename api docs to internalsJack Humbert2018-03-262-6/+6
|
* make new_project.sh work correctly on osx tooskullY2018-03-251-4/+11
|
* Add Layouts to exclusionU-LANDSRAAD\drashna2018-03-251-1/+1
|
* Ignore users folder for Travis taggingU-LANDSRAAD\drashna2018-03-251-4/+4
|
* fix the moxygen invocationskullY2018-03-231-1/+1
|
* Generate API docs from source code comments (#2491)skullydazed2018-03-224-26/+71
| | | | | | | | | | | | | | | | | | * Generate api docs from source code * Add a bunch of doxygen comments * more doxygen comments * Add the in-progress api docs * script to generate docs from travis * Add doc generation to the travis job * make travis_docs.sh commit the work it does * make sure the docs script exits cleanly
* Fix logic in macos installShayne Holmes2018-03-161-1/+1
| | | | Also fix mixed spaces/tabs
* Fixed exit status check for brewJon Nall2018-03-091-1/+1
|
* Add a newbie guide for people completely new to QMK (#2480)skullydazed2018-03-063-0/+58
|
* Remap msys2 usb, fix USB port detection (#2301)Danny2018-02-281-0/+1
| | | | | | * Add AVRDUDE to MSYS2 setup * Remap detected USB port in MSYS2 to COM port
* Re-add Flip Installer (#2355)Drashna Jaelre2018-02-061-3/+5
| | | | | | | | | * Re-add Flip Installer Found the update URL for it. http://www.microchip.com/developmenttools/productdetails.aspx?partno=flip * Comment out JRE installer version
* Add stm32 to drivers.txtskullydazed2018-02-051-1/+2
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 15:06:34 +0000