Merge branch 'master' of ssh://git-annex.branchable.com
This commit is contained in:
Joey Hess
commit
e96b8c4774
8 changed files with 224 additions and 0 deletions
|
|
@ -0,0 +1,53 @@
|
||||||
|
### Please describe the problem.
|
||||||
|
|
||||||
|
git-annex can't compile on FreeBSD; specifically, the build fails due to issues with System.Posix.Files.
|
||||||
|
|
||||||
|
### What steps will reproduce the problem?
|
||||||
|
|
||||||
|
1. git clone git://git-annex.branchable.com/ git-annex
|
||||||
|
2. cd git-annex
|
||||||
|
3. stack setup
|
||||||
|
4. stack install
|
||||||
|
|
||||||
|
### What version of git-annex are you using? On what operating system?
|
||||||
|
|
||||||
|
git-annex HEAD.
|
||||||
|
|
||||||
|
FreeBSD 11.1-RELEASE r321309 GENERIC amd64
|
||||||
|
|
||||||
|
### Please provide any additional information below.
|
||||||
|
|
||||||
|
Let me know if you'd like me to set up a FreeBSD development environment for you to SSH into - happy to do that if it helps you in any way.
|
||||||
|
|
||||||
|
Compilation failure is as follows:
|
||||||
|
|
||||||
|
Configuring git-annex-6.20180807...
|
||||||
|
git-annex-6.20180807: build (exe)
|
||||||
|
Preprocessing executable 'git-annex' for git-annex-6.20180807...
|
||||||
|
[124 of 586] Compiling Utility.DirWatcher.Kqueue ( Utility/DirWatcher/Kqueue.hs, .stack-work/dist/x86_64-freebsd/Cabal-1.24.2.0/build/git-annex/git-annex-tmp/Utility/Di
|
||||||
|
rWatcher/Kqueue.o )
|
||||||
|
|
||||||
|
/usr/home/duncan/code/git-annex/Utility/DirWatcher/Kqueue.hs:112:49: error:
|
||||||
|
Not in scope: ‘Files.openFd’
|
||||||
|
Module ‘System.Posix.Files’ does not export ‘openFd’.
|
||||||
|
|
||||||
|
/usr/home/duncan/code/git-annex/Utility/DirWatcher/Kqueue.hs:112:66: error:
|
||||||
|
Not in scope: data constructor ‘Files.ReadOnly’
|
||||||
|
Module ‘System.Posix.Files’ does not export ‘ReadOnly’.
|
||||||
|
|
||||||
|
/usr/home/duncan/code/git-annex/Utility/DirWatcher/Kqueue.hs:112:89: error:
|
||||||
|
Not in scope: ‘Files.defaultFileFlags’
|
||||||
|
Module ‘System.Posix.Files’ does not export ‘defaultFileFlags’.
|
||||||
|
|
||||||
|
/usr/home/duncan/code/git-annex/Utility/DirWatcher/Kqueue.hs:132:15: error:
|
||||||
|
Not in scope: ‘Files.closeFd’
|
||||||
|
Module ‘System.Posix.Files’ does not export ‘closeFd’.
|
||||||
|
|
||||||
|
/usr/home/duncan/code/git-annex/Utility/DirWatcher/Kqueue.hs:170:14: error:
|
||||||
|
Not in scope: ‘Files.closeFd’
|
||||||
|
Module ‘System.Posix.Files’ does not export ‘closeFd’.
|
||||||
|
|
||||||
|
-- While building custom Setup.hs for package git-annex-6.20180807 using:
|
||||||
|
/usr/home/duncan/code/git-annex/.stack-work/dist/x86_64-freebsd/Cabal-1.24.2.0/setup/setup --builddir=.stack-work/dist/x86_64-freebsd/Cabal-1.24.2.0 build exe:git
|
||||||
|
-annex --ghc-options " -ddump-hi -ddump-to-file"
|
||||||
|
Process exited with code: ExitFailure 1
|
||||||
|
|
@ -0,0 +1,58 @@
|
||||||
|
### Please describe the problem.
|
||||||
|
|
||||||
|
After updating my Synology DS216+ NAS from [6.2-23739-1](https://www.synology.com/en-uk/releaseNote/DS216+II#ver_23739-1) to [6.2-23739-2](https://www.synology.com/en-uk/releaseNote/DS216+II#ver_23739-2), running `git-annex` with any non-trivial command, locally on the NAS or remotely on the NAS results in:
|
||||||
|
|
||||||
|
git-annex: timer_create: Bad address
|
||||||
|
|
||||||
|
I'm guessing that this means that a library function the standalone binary needs is no longer present, but I'm unsure why. The `-1` to `-2` update seems to only have two security fixes ([SA 18-36](https://www.synology.com/en-uk/support/security/Synology_SA_18_36), and [SA 18-01](https://www.synology.com/en-uk/support/security/Synology_SA_18_01) -- the latter being a Spectre/Meltdown bug).
|
||||||
|
|
||||||
|
Do you know if `timer_create` is a kernel system call? Or a libc (etc) library function?
|
||||||
|
|
||||||
|
### What steps will reproduce the problem?
|
||||||
|
|
||||||
|
Update Synology NAS to [6.2-23739-2](https://www.synology.com/en-uk/releaseNote/DS216+II#ver_23739-2), run `git annex sync`, `git annex version` or similar (remotely or locally).
|
||||||
|
|
||||||
|
### What version of git-annex are you using? On what operating system?
|
||||||
|
|
||||||
|
`x86-32`, stand alone build, for ancient-kernels, as that the 64-bit stand alone build [no longer seemed to work due to locale issues](https://ewen.mcneill.gen.nz/blog/entry/2017-05-28-git-annex-on-synology-ds216+/) (see note added at the end).
|
||||||
|
|
||||||
|
I believe it is `6.20180626`, but `git annex version` currently also fails...
|
||||||
|
|
||||||
|
### Please provide any additional information below.
|
||||||
|
|
||||||
|
ewen@nas01:/volume1/music/podcasts$ hostname --fqdn
|
||||||
|
nas01
|
||||||
|
ewen@nas01:/volume1/music/podcasts$ git annex sync
|
||||||
|
git-annex: timer_create: Bad address
|
||||||
|
ewen@nas01:/volume1/music/podcasts$
|
||||||
|
ewen@nas01:/volume1/music/podcasts$ git annex version
|
||||||
|
git-annex: timer_create: Bad address
|
||||||
|
ewen@nas01:/volume1/music/podcasts$
|
||||||
|
ewen@nas01:/volume1/music/podcasts$ uname -mr
|
||||||
|
3.10.105 x86_64
|
||||||
|
ewen@nas01:/volume1/music/podcasts$
|
||||||
|
|
||||||
|
There is a [6.2.1 firmware release](https://www.synology.com/en-uk/releaseNote/DS216+) for the Synology NAS released a couple of days ago, but it does not yet seem to be visible to my NAS. I can try that one if it'd help.
|
||||||
|
|
||||||
|
I can also try switching back to one of the more modern `x86-64` / `x86-32` stand alone builds if that'd help. But then I'd need some assistance with working around the:
|
||||||
|
|
||||||
|
sh: loadlocale.c:129: _nl_intern_locale_data: Assertion `cnt < (sizeof (_nl_value_type_LC_TIME) / sizeof (_nl_value_type_LC_TIME[0]))' failed.
|
||||||
|
error: git-annex died of signal 6
|
||||||
|
|
||||||
|
error I was seeing on those builds. (From other work elsewhere it feels a lot like the LC_TIME structure changed in size in some libc definition somewhere in the last 6-12 months; in another project we had a similar break on Ubuntu 18.04 issues which didn't affect Ubuntu 16.04 and earlier.)
|
||||||
|
|
||||||
|
In case it helps, out of the box defaults give:
|
||||||
|
|
||||||
|
ewen@nas01:/volume1/music/podcasts$ echo $LANG
|
||||||
|
en_US.utf8
|
||||||
|
ewen@nas01:/volume1/music/podcasts$ ls /volume1/thirdparty/git-annex.linux/locales/en_US.utf8/
|
||||||
|
LC_ADDRESS LC_IDENTIFICATION LC_MONETARY LC_PAPER
|
||||||
|
LC_COLLATE LC_MEASUREMENT LC_NAME LC_TELEPHONE
|
||||||
|
LC_CTYPE LC_MESSAGES LC_NUMERIC LC_TIME
|
||||||
|
ewen@nas01:/volume1/music/podcasts$
|
||||||
|
|
||||||
|
(although those files are currently generated with the now broken x86-32 legacy standalone build).
|
||||||
|
|
||||||
|
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
|
||||||
|
|
||||||
|
Definitely. It was working until I updated the NAS firmware image this afternoon... for this repository holding years of podcasts and many others.
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
[[!comment format=mdwn
|
||||||
|
username="ewen"
|
||||||
|
avatar="http://cdn.libravatar.org/avatar/605b2981cb52b4af268455dee7a4f64e"
|
||||||
|
subject="timer_create"
|
||||||
|
date="2018-09-03T22:06:00Z"
|
||||||
|
content="""
|
||||||
|
From some digging around it looks like [`timer_create`](http://man7.org/linux/man-pages/man2/timer_create.2.html) is a Linux system call. So presumably the issue with the Synology NAS is being caused by the kernel being updated.
|
||||||
|
|
||||||
|
Of note, it appears that [Microsoft Windows System for Linux does not support `timer_create` either](https://github.com/Microsoft/WSL/issues/307). And that [system call is apparently required for Haskell binaries](https://github.com/Microsoft/WSL/issues/307#issuecomment-217051052)... Apparently (from this thread) other people have hit this issue trying to run `git-annex` too.
|
||||||
|
|
||||||
|
There's a [suggestion of some work around flags](https://github.com/Microsoft/WSL/issues/307#issuecomment-239617836), but they do not seem to work with the `git-annex` stand alone binary as it is currently built:
|
||||||
|
|
||||||
|
ewen@nas01:~$ git-annex +RTS -V0 -RTS help
|
||||||
|
git-annex: Most RTS options are disabled. Link with -rtsopts to enable them.
|
||||||
|
ewen@nas01:~$ export GHCRTS=-V0
|
||||||
|
ewen@nas01:~$ git annex help
|
||||||
|
git-annex: Most RTS options are disabled. Link with -rtsopts to enable them.
|
||||||
|
ewen@nas01:~$
|
||||||
|
|
||||||
|
Possibly it'll be necessary to try to persuade Synology to re-enable the `timer_create` system call. But my guess is maybe they turned it off as a Spectre/Meltdown fix, so it may be non-trivial to persuade them to change it back.
|
||||||
|
|
||||||
|
Ewen
|
||||||
|
"""]]
|
||||||
|
|
@ -0,0 +1,12 @@
|
||||||
|
[[!comment format=mdwn
|
||||||
|
username="ewen"
|
||||||
|
avatar="http://cdn.libravatar.org/avatar/605b2981cb52b4af268455dee7a4f64e"
|
||||||
|
subject="Synology bug report"
|
||||||
|
date="2018-09-03T22:36:07Z"
|
||||||
|
content="""
|
||||||
|
FWIW, I've created a Synology Account, to create a Synology Support Request, [#2082132](https://account.synology.com/en-global/support/2082132/detail) for the missing timer_create system call on DSM 6.2-23739-2. I'm not holding out a lot of hope given it's a third party application running on the NAS, and not even one in their app store, but maybe there's a chance it'll get the system call turned back on again. That Synology support request includes a link to this bug report.
|
||||||
|
|
||||||
|
Ewen
|
||||||
|
|
||||||
|
PS: I expect that bug report will only be visible if you're logged in with my Synology account. But at least someone else reporting it can reference the same issue to Synology Support.
|
||||||
|
"""]]
|
||||||
32
doc/bugs/can__39__t_build_without_assistant.mdwn
Normal file
32
doc/bugs/can__39__t_build_without_assistant.mdwn
Normal file
|
|
@ -0,0 +1,32 @@
|
||||||
|
### Please describe the problem.
|
||||||
|
1. Building minimal variant of git-annex failed.
|
||||||
|
1. Seems, that instructions about [minimal building from source](https://git-annex.branchable.com/install/fromsource/) are out-of-date, at least because options 'xmpp' and 'dns' don't exist in git-annex.cabal.
|
||||||
|
1. Also seems, that file Utility/SRV.hs unused, may be remove it?
|
||||||
|
|
||||||
|
In git-annex.cabal 'Assistant' flag doesn't influence on list of modules, only on compile flags and dependencies. 'Assistant/\*' modules includes into base variant of building (and some 'Assistant/\*' modules turn on with WebApp flag).
|
||||||
|
|
||||||
|
### What steps will reproduce the problem?
|
||||||
|
Try to build as in [archlinux package](https://git.archlinux.org/svntogit/community.git/tree/repos/community-x86_64/PKGBUILD?h=packages/git-annex), but turn off assistant:
|
||||||
|
|
||||||
|
`runhaskell Setup configure -O --prefix=/usr --enable-executable-dynamic --disable-library-vanilla --docdir="/usr/share/doc/git-annex" -fconcurrentoutput -ftorrentparser -f-androidsplice -f-android -fproduction -fpairing -fwebapp -f-assistant -fwebdav -fs3 -f-benchmark -fdbus -fmagicmime`
|
||||||
|
|
||||||
|
`runhaskell Setup.hs build`
|
||||||
|
|
||||||
|
After that I got error:
|
||||||
|
|
||||||
|
`Utility/Mounts.hs:13:1: error:`
|
||||||
|
|
||||||
|
` Could not find module ‘System.MountPoints’`
|
||||||
|
|
||||||
|
haskell-mountpoints package is instaled.
|
||||||
|
If turn on assistant flag, building is ok.
|
||||||
|
|
||||||
|
### Please provide any additional information below.
|
||||||
|
I don't know haskell, but try to make optional building of Assistant, see [patch](https://github.com/fftmp/git-annex-min-pkgbuild/blob/master/0002-optional-build-assistant-and-other-small-cabal-refin.patch). Seems, that it works for minimal building, but may be incomplete.
|
||||||
|
### What version of git-annex are you using? On what operating system?
|
||||||
|
6.20180807, Archlinux
|
||||||
|
|
||||||
|
|
||||||
|
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
|
||||||
|
Yes, use it for several years and have approx 100G repo with 10k+ files. Works fine.
|
||||||
|
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
[[!comment format=mdwn
|
||||||
|
username="duncan_bayne"
|
||||||
|
avatar="http://cdn.libravatar.org/avatar/2fc23e2009234ad965f9d5d796400417"
|
||||||
|
subject="Thanks :)"
|
||||||
|
date="2018-09-03T00:39:08Z"
|
||||||
|
content="""
|
||||||
|
Thanks :) Will open further bugs if necessary.
|
||||||
|
"""]]
|
||||||
25
doc/forum/Error__58___failed_to_push_some_refs.mdwn
Normal file
25
doc/forum/Error__58___failed_to_push_some_refs.mdwn
Normal file
|
|
@ -0,0 +1,25 @@
|
||||||
|
Hello all, my situation is I have two laptops, one for work and one for home use. I have a lot of simple text files that I use in v6 unlocked mode (used to use direct mode, but recently switched). I run the assistant to sync between these hosts using an intermediate server which is an always-on VPS (visarend.solasistim.net in this example).
|
||||||
|
|
||||||
|
At some point, these files will start to be desynced, and I'll see messages like these in the log files.
|
||||||
|
|
||||||
|
[2018-09-03 11:34:04.062717904] NetWatcherFallback: Syncing with origin
|
||||||
|
|
||||||
|
error: Your local changes to the following files would be overwritten by merge:
|
||||||
|
howto/c++.md
|
||||||
|
howto/emacs.mkd
|
||||||
|
howto/git-annex.mkd
|
||||||
|
howto/windows.mkd
|
||||||
|
org/kanban.org
|
||||||
|
Please commit your changes or stash them before you merge.
|
||||||
|
Aborting
|
||||||
|
To visarend.solasistim.net:annex
|
||||||
|
! [rejected] master -> synced/master (non-fast-forward)
|
||||||
|
error: failed to push some refs to 'visarend.solasistim.net:annex'
|
||||||
|
hint: Updates were rejected because a pushed branch tip is behind its remote
|
||||||
|
hint: counterpart. Check out this branch and integrate the remote changes
|
||||||
|
hint: (e.g. 'git pull ...') before pushing again.
|
||||||
|
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
|
||||||
|
|
||||||
|
Using git-annex 6.20170101.1 on all hosts.
|
||||||
|
|
||||||
|
What exactly does this error mean? How can I get rid of it? I solve it by rm'ing the repository and re-cloning from visarend.solasistim.net, and integrating any changes manually, but I'm wondering why it's happening.
|
||||||
|
|
@ -0,0 +1,13 @@
|
||||||
|
Hello,
|
||||||
|
|
||||||
|
using git-annex 6.20180807-23 on Arch I get this message from time to time:
|
||||||
|
|
||||||
|
copy archive/Studium/Diplomarbeit/Daten/Vortrag/vortrag.snm (to xgm...)
|
||||||
|
git-annex-shell: <stdin>: hGetChar: illegal operation (handle is closed)ok
|
||||||
|
copy archive/Studium/Diplomarbeit/Daten/Wheels/SingleWheelCalcs/5SpokeWheel/5Spoke_MRF/6000/Lambda2.gz
|
||||||
|
Lost connection (fd:21: hFlush: resource vanished (Broken pipe))
|
||||||
|
(fd:21: hClose: resource vanished (Broken pipe)) failed
|
||||||
|
|
||||||
|
The peer is git-annex, downloaded at Aug 7 at Debian Stable. Repeating the file transfer makes the message goes away, but I have to initiate the transfer multiple times, to be able to transfer all files without this error message.
|
||||||
|
|
||||||
|
Best Thanks!
|
||||||
Loading…
Add table
Add a link
Reference in a new issue