[Jenkins]Jenkins

FailedChanges

Summary

  1. Merged cleaner-lvapp-hack into dm-spy-experiments
  2. Merged new-dryos-task-hooks into cleaner-lvapp-hack
  3. Merged patchmgr into cleaner-lvapp-hack
  4. Merged unified into patchmgr
  5. Makefile: drop unused SUPPORTED_MODELS / SUPPORTED_UNIFIED_MODELS
  6. Merged in makefile-updates (pull request #873) Makefile updates to use any valid ARM toolchain
  7. Makefile: fix 7D build_fir
  8. Makefile: fix building Lua with gcc 4.7.3
  9. Makefile: only attempt to build/install/check ML-SETUP.FIR if there is a valid installer directory (some platforms may not have have one - 7D_MASTER, new ports)
  10. Card LED: always use CARD_LED_ADDRESS, LEDON and LEDOFF (backed out 5bfab05 to fix installer on 7D - 0x800c00 not mandatory?)
  11. Makefile: moved 7D-specific tweaks (FIR etc) into main target (7D.203) for consistency with other platforms, including 7D2 to build the regular FIR: make build_fir to build the installer FIR: make ML-SETUP.FIR -B
  12. Makefile: FIR building updates - always install ML-SETUP.FIR (zip, install, install_qemu) - build_fir for regular ML (not installer) now gives AUTOEXEC.FIR - to recompile ML-SETUP.FIR: "make ML-SETUP.FIR -B" from platform directory - "make zip" will also compile the installer from source, without replacing the precompiled ML-SETUP.FIR (just to make sure the source code changes do not interfere with building the installer)
  13. Makefile: fix building xor_chk from its own directory
  14. Makefile: more .NOTPARALLEL fixes
  15. Makefile: fix 7D FIR path (just for consistency)
  16. Makefile: use .NOTPARALLEL in top-level Makefiles, rather than double-colon rules ML platforms/modules are built sequentially, but within each platform/module, parallel build is used to be tested on Mac with -j8 (on Make 3.81, double-colon are executed in parallel, while in 4.2.1 they are sequential)
  17. Makefile: fix README.rst generation with POSIX shells to reproduce: cd modules/filepref; make clean; rm -f README.rst; make SHELL=dash
  18. Makefile: serialize "make install", fix some related dependencies parallel copying could lock up WIFI_SD cards to reproduce: "WIFI_SD=y make install ML_MODULES=" from platform/CAM directory
  19. Makefile: monitor wifi connection when using WIFI_SD=y (experimental, helps troubleshooting connectivity issues)
  20. Makefile: minor refactors for WIFI_SD (coding style) also fixed a typo
  21. Modules: better error handling for missing rst2html http://www.magiclantern.fm/forum/index.php?topic=17099
  22. Makefile: speed optimizations - helper to evaluate only once, only if used - modules hgstamp: only evaluate if used - CF_CARD, VERSION: only evaluate once if used - PWD is special? renamed to avoid unneeded shell calls Profiling tips: - perf record make; perf report --sort comm - make SHELL="sh -x" - make clean SHELL="sh -x" |& grep "^+" | sort | uniq -c
  23. Makefile: enable parallel compilation for modules, but compile them sequentially huge modules like Lua will compile much faster compiling everything in parallel is not 100% safe (some dependency checks may fail)
  24. Makefile: do not print toolchain info on recursive calls
  25. Makefile: reworked global targets install: doesn't make sense, as we no longer have a "one size fits all" build capable of running on all models (alternative: 5D3.113_install, 60D_install etc) zip: build zip for each camera model, sequentially (parallel build still used within each zip) all: similar to zip (build camera models sequentially, but use parallel compilation within each platform) clean, check: these can run in parallel (no restrictions)
  26. Makefile: fix module dependency checking on "make zip" by default, a module succeeds if it can be loaded on any camera model, from those compiled (doesn't matter which one) when using "make zip", we only want to include the modules compatible with current camera model, without considering other models (fixme: not the cleanest way to implement this)
  27. Makefile: fix module_strings dependency rule (previously, there was an error with make -j)
  28. Makefile: dropped ML_MODULES_STATIC (unused) and renamed ML_MODULES_DYNAMIC to ML_MODULES note: if you have customized the module list in Makefile.modules.user, just rename ML_MODULES_DYNAMIC to ML_MODULES to compile without modules: make 5D3 ML_MODULES=
  29. Makefile: fix "make clean" from modules directory with stale modules from other branches https://bitbucket.org/hudson/magic-lantern/pull-requests/873/makefile-updates-to-use-any-valid-arm/diff#comment-48250675
  30. Makefile: fix running from other directory e.g. from qemu: make -C ../magic-lantern/ 500D_install_qemu
  31. Makefile: model-specific install targets for the root directory examples: make 500D_install; make 500D_install_qemu
  32. 7D: fix compiling with FEATURE_VIDEO_HACKS
  33. Makefile: fix building 7D_MASTER
  34. disable ASSERT for 7D_MASTER
  35. Feature matrix: updated links
  36. Merged in daniel_fort/magic-lantern/unified-6D-sf_dump (pull request #876) Add 6D.116 to sf_dump module
  37. Added 6D.116 to sf_dump module.
  38. Merged in daniel_fort/magic-lantern/unified-600D-audio_meters_fix (pull request #877) 600D audio meters fix
  39. 600D also needs Audio IC turned on at boot.
  40. Re-enabled the DebugMsg hack on 5D3 and 6D (they need it for other functionality)
  41. Moved bottom bar hacking code to liveview.c and cleaned it up a bit
  42. Disabled CONFIG_LVAPP_HACK_DEBUGMSG and replaced it with CONFIG_LVAPP_HACK_PATCH. 6D, 650D, 700D and EOSM will need a new stub. TBD on 70D/100D as well.
  43. Enabled CONFIG_LVAPP_HACK_PATCH for 5D3 1.1.3
  44. Refactored LV bottom bar hack using the patch manager - fixes ERR80 in LiveView on 60D RscMgr_memory - should be easier to port to other cameras - had to include reloc.o for CONFIG_ALLOCATE_MEMORY_POOL
  45. Merged patchmgr into cleaner-lvapp-hack
Changeset 13991:1743bdc017ef by alex@thinkpad:
Merged cleaner-lvapp-hack into dm-spy-experiments
Changeset 13990:cc8d0855871c by alex@thinkpad:
Merged new-dryos-task-hooks into cleaner-lvapp-hack
Changeset 13989:3c595c1a881c by alex@thinkpad:
Merged patchmgr into cleaner-lvapp-hack
Changeset 13988:ac33688aae07 by alex@thinkpad:
Merged unified into patchmgr
Changeset 13987:97b73e7a781e by alex@thinkpad:
Makefile: drop unused SUPPORTED_MODELS / SUPPORTED_UNIFIED_MODELS
The file was modifiedMakefile.user.default (diff)
Changeset 13986:82126d84f311 by alex@thinkpad:
Merged in makefile-updates (pull request #873)<br><br>Makefile updates to use any valid ARM toolchain
Changeset 13985:6cef1ea3d9bf by alex@thinkpad:
Makefile: fix 7D build_fir
The file was modifiedplatform/7D.203/Makefile (diff)
Changeset 13984:52bccf5762ee by alex@thinkpad:
Makefile: fix building Lua with gcc 4.7.3
The file was modifiedsrc/Makefile.src.config (diff)
Changeset 13983:a28936719d11 by alex@thinkpad:
Makefile: only attempt to build/install/check ML-SETUP.FIR if there is a valid installer directory<br>(some platforms may not have have one - 7D_MASTER, new ports)
The file was modifiedplatform/Makefile.platform.extras (diff)
Changeset 13982:5b81f34b425a by alex@thinkpad:
Card LED: always use CARD_LED_ADDRESS, LEDON and LEDOFF<br>(backed out 5bfab05 to fix installer on 7D - 0x800c00 not mandatory?)
The file was modifiedplatform/7D.203/consts.h (diff)
The file was modifiedsrc/debug.c (diff)
The file was modifiedsrc/installer.c (diff)
Changeset 13981:1d98a0736cb8 by alex@thinkpad:
Makefile: moved 7D-specific tweaks (FIR etc) into main target (7D.203)<br>for consistency with other platforms, including 7D2<br>to build the regular FIR: make build_fir<br>to build the installer FIR: make ML-SETUP.FIR -B
The file was modifiedplatform/7D.203/Makefile (diff)
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 13980:f8beef0ca833 by alex@thinkpad:
Makefile: FIR building updates<br>- always install ML-SETUP.FIR (zip, install, install_qemu)<br>- build_fir for regular ML (not installer) now gives AUTOEXEC.FIR<br>- to recompile ML-SETUP.FIR: &quot;make ML-SETUP.FIR -B&quot; from platform directory<br>- &quot;make zip&quot; will also compile the installer from source, without replacing the precompiled ML-SETUP.FIR<br>&nbsp; (just to make sure the source code changes do not interfere with building the installer)
The file was modifiedMakefile.inc (diff)
The file was modifiedMakefile.top (diff)
The file was modifiedplatform/Makefile.platform.base (diff)
The file was modifiedplatform/Makefile.platform.extras (diff)
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 13979:47f3108811c3 by alex@thinkpad:
Makefile: fix building xor_chk from its own directory
The file was modifiedbuild_tools/Makefile (diff)
Changeset 13978:59a6d0a40c7f by alex@thinkpad:
Makefile: more .NOTPARALLEL fixes
The file was modifiedMakefile (diff)
The file was modifiedinstaller/Makefile (diff)
Changeset 13977:5249a4ab74fa by alex@thinkpad:
Makefile: fix 7D FIR path<br>(just for consistency)
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 13976:2c627b19c8df by alex@thinkpad:
Makefile: use .NOTPARALLEL in top-level Makefiles, rather than double-colon rules<br>ML platforms/modules are built sequentially, but within each platform/module, parallel build is used<br>to be tested on Mac with -j8<br>(on Make 3.81, double-colon are executed in parallel, while in 4.2.1 they are sequential)
The file was modifiedMakefile (diff)
The file was modifiedmodules/Makefile (diff)
The file was modifiedplatform/Makefile (diff)
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 13975:36d3ec245c1f by alex@thinkpad:
Makefile: fix README.rst generation with POSIX shells<br>to reproduce: cd modules/filepref; make clean; rm -f README.rst; make SHELL=dash
The file was modifiedmodules/Makefile.modules (diff)
Changeset 13974:01953d31029b by alex@thinkpad:
Makefile: serialize &quot;make install&quot;, fix some related dependencies<br>parallel copying could lock up WIFI_SD cards<br>to reproduce: &quot;WIFI_SD=y make install ML_MODULES=&quot; from platform/CAM directory
The file was modifiedMakefile.inc (diff)
The file was modifiedmodules/Makefile (diff)
The file was modifiedmodules/Makefile.modules (diff)
Changeset 13973:e592e31c3b41 by alex@thinkpad:
Makefile: monitor wifi connection when using WIFI_SD=y<br>(experimental, helps troubleshooting connectivity issues)
The file was modifiedMakefile.user.default (diff)
Changeset 13972:84d6ed453e7a by alex@thinkpad:
Makefile: minor refactors for WIFI_SD (coding style)<br>also fixed a typo
The file was modifiedMakefile.user.default (diff)
Changeset 13971:26fe70cea745 by alex@thinkpad:
Modules: better error handling for missing rst2html<br>http://www.magiclantern.fm/forum/index.php?topic=17099
The file was modifiedmodules/Makefile.modules (diff)
The file was modifiedmodules/readme2modulestrings.py (diff)
Changeset 13970:5ea430b1fb60 by alex@thinkpad:
Makefile: speed optimizations<br>- helper to evaluate only once, only if used<br>- modules hgstamp: only evaluate if used<br>- CF_CARD, VERSION: only evaluate once if used<br>- PWD is special? renamed to avoid unneeded shell calls<br>Profiling tips:<br>- perf record make; perf report --sort comm<br>- make SHELL=&quot;sh -x&quot;<br>- make clean SHELL=&quot;sh -x&quot; |&amp; grep &quot;^+&quot; | sort | uniq -c
The file was modifiedMakefile.inc (diff)
The file was modifiedMakefile.top (diff)
The file was modifiedMakefile.user.default (diff)
The file was modifiedmodules/Makefile.modules (diff)
Changeset 13969:f2ed3dc0790a by alex@thinkpad:
Makefile: enable parallel compilation for modules, but compile them sequentially<br>huge modules like Lua will compile much faster<br>compiling everything in parallel is not 100% safe (some dependency checks may fail)
The file was modifiedmodules/Makefile (diff)
The file was modifiedmodules/Makefile.modules (diff)
Changeset 13968:4d93c8f7bca3 by alex@thinkpad:
Makefile: do not print toolchain info on recursive calls
The file was modifiedMakefile.setup.toolchain (diff)
Changeset 13967:d20616702840 by alex@thinkpad:
Makefile: reworked global targets<br>install: doesn&#039;t make sense, as we no longer have a &quot;one size fits all&quot; build capable of running on all models<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; (alternative: 5D3.113_install, 60D_install etc)<br>zip: build zip for each camera model, sequentially (parallel build still used within each zip)<br>all: similar to zip (build camera models sequentially, but use parallel compilation within each platform)<br>clean, check: these can run in parallel (no restrictions)
The file was modifiedMakefile (diff)
The file was modifiedplatform/Makefile (diff)
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 13966:aa050618c27f by alex@thinkpad:
Makefile: fix module dependency checking on &quot;make zip&quot;<br>by default, a module succeeds if it can be loaded on any camera model, from those compiled (doesn&#039;t matter which one)<br>when using &quot;make zip&quot;, we only want to include the modules compatible with current camera model, without considering other models<br>(fixme: not the cleanest way to implement this)
The file was modifiedMakefile.inc (diff)
Changeset 13965:718e285e224d by alex@thinkpad:
Makefile: fix module_strings dependency rule<br>(previously, there was an error with make -j)
The file was modifiedmodules/Makefile.modules (diff)
Changeset 13964:2db4026d348a by alex@thinkpad:
Makefile: dropped ML_MODULES_STATIC (unused) and renamed ML_MODULES_DYNAMIC to ML_MODULES<br>note: if you have customized the module list in Makefile.modules.user, just rename ML_MODULES_DYNAMIC to ML_MODULES<br>to compile without modules: make 5D3 ML_MODULES=
The file was modifiedmodules/Makefile (diff)
The file was modifiedmodules/Makefile.modules.default (diff)
Changeset 13963:ff1401e9fc1c by alex@thinkpad:
Makefile: fix &quot;make clean&quot; from modules directory with stale modules from other branches<br>https://bitbucket.org/hudson/magic-lantern/pull-requests/873/makefile-updates-to-use-any-valid-arm/diff#comment-48250675
The file was modifiedmodules/Makefile (diff)
Changeset 13962:3ca10bd65cbf by alex@thinkpad:
Makefile: fix running from other directory<br>e.g. from qemu: make -C ../magic-lantern/ 500D_install_qemu
The file was modifiedMakefile (diff)
Changeset 13961:919971999199 by alex@thinkpad:
Makefile: model-specific install targets for the root directory<br>examples: make 500D_install; make 500D_install_qemu
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 13960:871f759a2ada by alex@thinkpad:
7D: fix compiling with FEATURE_VIDEO_HACKS
The file was modifiedsrc/ml_rpc.h (diff)
Changeset 13959:6a08a65fe077 by alex@thinkpad:
Makefile: fix building 7D_MASTER
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 13958:dcc15836c1f3 by g3gg0:
disable ASSERT for 7D_MASTER
The file was modifiedsrc/dryos.h (diff)
Changeset 13957:a494258984e1 by alex@thinkpad:
Feature matrix: updated links
The file was modifiedfeatures/features-html.py (diff)
Changeset 13956:3f85e3402fe5 by alex _broscutamaker@gmail.com_:
Merged in daniel_fort/magic-lantern/unified-6D-sf_dump (pull request #876)<br><br>Add 6D.116 to sf_dump module
Changeset 13955:c326fdc91130 by daniel fort _dan@digiola.com_:
Added 6D.116 to sf_dump module.
The file was modifiedmodules/sf_dump/sf_dump.c (diff)
Changeset 13954:75a085c2d38c by alex _broscutamaker@gmail.com_:
Merged in daniel_fort/magic-lantern/unified-600D-audio_meters_fix (pull request #877)<br><br>600D audio meters fix
Changeset 13953:c82a97f50486 by daniel fort _dan@digiola.com_:
600D also needs Audio IC turned on at boot.
The file was modifiedsrc/audio-common.c (diff)
Changeset 13952:23f4915d938d by alex@thinkpad:
Re-enabled the DebugMsg hack on 5D3 and 6D (they need it for other functionality)
The file was modifiedplatform/5D3.113/internals.h (diff)
The file was modifiedplatform/6D.116/internals.h (diff)
Changeset 13951:b1f779caade6 by alex@thinkpad:
Moved bottom bar hacking code to liveview.c and cleaned it up a bit
The file was modifiedplatform/1100D.105/Makefile.setup.default (diff)
The file was modifiedplatform/550D.109/Makefile.setup.default (diff)
The file was modifiedplatform/5D3.113/Makefile.setup.default (diff)
The file was modifiedplatform/600D.102/Makefile.setup.default (diff)
The file was modifiedplatform/60D.111/Makefile.setup.default (diff)
The file was modifiedsrc/Makefile.src (diff)
The file was modifiedsrc/Makefile.src.config (diff)
The file was modifiedsrc/gui-common.c (diff)
The file was modifiedsrc/liveview.c (diff)
Changeset 13950:6b83ca04841b by alex@thinkpad:
Disabled CONFIG_LVAPP_HACK_DEBUGMSG and replaced it with CONFIG_LVAPP_HACK_PATCH. 6D, 650D, 700D and EOSM will need a new stub. TBD on 70D/100D as well.
The file was modifiedplatform/5D3.113/consts.h (diff)
The file was modifiedplatform/650D.104/consts.h (diff)
The file was modifiedplatform/650D.104/internals.h (diff)
The file was modifiedplatform/6D.116/consts.h (diff)
The file was modifiedplatform/6D.116/internals.h (diff)
The file was modifiedplatform/700D.114/consts.h (diff)
The file was modifiedplatform/700D.114/internals.h (diff)
The file was modifiedplatform/EOSM.202/consts.h (diff)
The file was modifiedplatform/EOSM.202/internals.h (diff)
Changeset 13949:d9295d7f025b by alex@thinkpad:
Enabled CONFIG_LVAPP_HACK_PATCH for 5D3 1.1.3
The file was modifiedplatform/5D3.113/Makefile.setup.default (diff)
The file was modifiedplatform/5D3.113/internals.h (diff)
The file was modifiedplatform/5D3.113/stubs.S (diff)
Changeset 13948:80009613a1f1 by alex@thinkpad:
Refactored LV bottom bar hack using the patch manager<br>- fixes ERR80 in LiveView on 60D RscMgr_memory<br>- should be easier to port to other cameras<br>- had to include reloc.o for CONFIG_ALLOCATE_MEMORY_POOL
The file was modifiedplatform/1100D.105/Makefile.setup.default (diff)
The file was modifiedplatform/1100D.105/internals.h (diff)
The file was modifiedplatform/550D.109/Makefile.setup.default (diff)
The file was modifiedplatform/550D.109/internals.h (diff)
The file was modifiedplatform/600D.102/Makefile.setup.default (diff)
The file was modifiedplatform/600D.102/internals.h (diff)
The file was modifiedplatform/60D.111/Makefile.setup.default (diff)
The file was modifiedplatform/60D.111/internals.h (diff)
The file was modifiedsrc/Makefile.src.config (diff)
The file was modifiedsrc/gui-common.c (diff)
The file was modifiedsrc/liveview.c (diff)
The file was modifiedsrc/zebra.c (diff)
Changeset 13947:9f9d086e1b2a by alex@thinkpad:
Merged patchmgr into cleaner-lvapp-hack