Commit graph

16442 commits

Author SHA1 Message Date
Joey Hess
bad9f6d926 Merge branch 'master' of ssh://git-annex.branchable.com 2013-12-18 17:50:48 -04:00
Joey Hess
29c807ae45 Merge remote-tracking branch 'orca/master' 2013-12-18 17:49:12 -04:00
Joey Hess
ccef06da41 allow building webapp with EvilSplicer for non-android arm
Was able to reuse many of the android patches, but several had to be
re-done. On Android, ghc is a stage2 build, so can compile, but not run TH
code. But debian's ghc on armel cannot even compile TH code, so it has
to be patched out.

Some haskell packages have been updated to new versions, including yesod
and DAV, and their patches had to be redone.

The Makefile now has 2 new targets. The first is run on a companion x86
system to do the build and get TH splices. Then the second target is run
the same source tree on the arm system to build without needing TH.

This commit was sponsored by Svenne Krap.
2013-12-18 21:41:17 +00:00
Joey Hess
0027cef395 improve EvilSplicer robustness 2013-12-18 21:39:09 +00:00
Richard Hartmann
246dc3622e doc/devblog/day_80__plumbing.mdwn: Trailing whitespace 2013-12-18 22:14:11 +01:00
Richard Hartmann
b11d88dd17 doc/: s/amoung/among/gi
Qouth ye olde [Wiktionary](http://en.wiktionary.org/wiki/amoung)

Archaic spelling of among.
2013-12-18 22:09:18 +01:00
https://www.google.com/accounts/o8/id?id=AItOawlVE8SthKoKKW--nFZW3_T6YXrdxNQPUe8
6be4a204bb update davfs2 method with new box.com dav url 2013-12-18 20:23:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmvi8Z-rUen8xIety5uiJitI5rnMrz8Jk
7bf42404b4 Added a comment: updated url for drive mount 2013-12-18 20:20:22 +00:00
http://joeyh.name/
4c5dc8df0e removed 2013-12-18 20:12:16 +00:00
Joey Hess
96a62dadd7 fix shimming code to detect executables like ssh that file(1) says are shared objects 2013-12-18 16:11:06 -04:00
Joey Hess
52283f0fb1 fixed 2013-12-18 15:35:24 -04:00
http://joeyh.name/
27af0b5c7c Added a comment 2013-12-18 19:32:06 +00:00
http://joeyh.name/
1045d901b9 Added a comment 2013-12-18 19:31:05 +00:00
Joey Hess
a106d1e96e Merge branch 'master' of ssh://git-annex.branchable.com 2013-12-18 15:21:36 -04:00
Joey Hess
6e3cc0a228 need to stat symlink 2013-12-18 15:20:26 -04:00
http://grossmeier.net/
3ec01dc553 2013-12-18 19:14:42 +00:00
Joey Hess
d088b37d75 Merge branch 'master' of ssh://git-annex.branchable.com 2013-12-18 15:06:12 -04:00
Joey Hess
c99d6a8151 assistant: Fix OSX-specific bug that caused the startup scan to try to follow symlinks to other directories, and add their contents to the annex. 2013-12-18 15:05:29 -04:00
http://joeyh.name/
3bac37c985 Added a comment 2013-12-18 18:27:04 +00:00
http://joeyh.name/
a30a044abe Added a comment 2013-12-18 18:22:49 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn9K-X-3utFUDft6edVd5HUt4XSjE5dngo
e0148a1aee 2013-12-18 18:17:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnN99WKdpXGRJD8xpJxfsoumA9ZVCBjxrE
5b0dcfc4f5 Added a comment: nice 2013-12-18 18:12:18 +00:00
http://joeyh.name/
f0f6c1b2da 2013-12-18 16:55:54 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkGCmVc5qIJaQQgG82Hc5zzBdAVdhe2JEM
911859580b 2013-12-18 15:28:31 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkGCmVc5qIJaQQgG82Hc5zzBdAVdhe2JEM
40598aa0b7 2013-12-18 15:27:35 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkGCmVc5qIJaQQgG82Hc5zzBdAVdhe2JEM
ae51b6419f 2013-12-18 15:09:52 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkGCmVc5qIJaQQgG82Hc5zzBdAVdhe2JEM
0bcadef40f added screen capture link 2013-12-18 15:08:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkGCmVc5qIJaQQgG82Hc5zzBdAVdhe2JEM
c32a8220f6 2013-12-18 15:04:41 +00:00
Joey Hess
fcf6384389 Merge branch 'master' of ssh://git-annex.branchable.com 2013-12-18 02:07:23 -04:00
Joey Hess
a168b8de12 switch define used, not android specific 2013-12-18 02:06:15 -04:00
Joey Hess
00052f4c84 dd lsof to build-depends 2013-12-18 01:50:18 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY
c5767e2770 Added a comment 2013-12-18 02:21:17 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY
86155c0ad5 Added a comment 2013-12-18 02:07:46 +00:00
Joey Hess
d60fa54d60 tested; fixed in current version 2013-12-17 21:53:39 -04:00
Joey Hess
6b00fb1bba Merge branch 'master' of ssh://git-annex.branchable.com 2013-12-17 21:40:10 -04:00
Joey Hess
19c3ecb289 file a bug 2013-12-17 21:38:09 -04:00
178.12.110.165
59f6cbdef6 poll vote (/sdcard/annex) 2013-12-18 01:06:53 +00:00
Joey Hess
7a2f7185ba Merge branch 'master' of ssh://git-annex.branchable.com 2013-12-17 20:14:16 -04:00
Joey Hess
1b3e2d8eb1 document schedule.log and transitions.log 2013-12-17 20:13:40 -04:00
http://joeyh.name/
c60286fd9e Added a comment 2013-12-17 23:51:33 +00:00
Joey Hess
8462e3787c Merge branch 'master' of ssh://git-annex.branchable.com 2013-12-17 19:40:18 -04:00
Joey Hess
14c688df09 devblog 2013-12-17 19:39:48 -04:00
Joey Hess
23de793f56 update for armel 2013-12-17 19:29:11 -04:00
Joey Hess
8f672e4b59 add NAS to platform list 2013-12-17 19:26:24 -04:00
http://id.clacke.se/
d69642b935 clarify which parts were added in the edit; strike the "lost URL" problem, which migrate probably takes care of 2013-12-17 22:09:35 +00:00
http://id.clacke.se/
db3cb5067e Added a comment: Re: git annex migrate 2013-12-17 22:04:09 +00:00
http://id.clacke.se/
e442aeb67b mention migrate and make what is hopefully some clarification 2013-12-17 21:59:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY
50fd8c8d9d 2013-12-17 21:33:57 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY
5e42aac261 2013-12-17 21:07:59 +00:00
Joey Hess
f833f92cd0 remove done todo about upgrading 2013-12-17 16:31:34 -04:00