diff options
6 files changed, 27 insertions, 3 deletions
@@ -1,6 +1,8 @@ git-annex (6.20180228) UNRELEASED; urgency=medium * Support exporttree=yes for rsync special remotes. + * Dial back optimisation when building on arm, which prevents + ghc and llc from running out of memory when optimising some files. -- Joey Hess <id@joeyh.name> Wed, 28 Feb 2018 11:53:03 -0400 @@ -6,8 +6,6 @@ -} {-# LANGUAGE CPP #-} -{- Avoid optimising this file much, since it's large and does not need it._-} -{-# OPTIONS_GHC -O1 -optlo-O2 #-} module Test where diff --git a/doc/forum/Adding_public_key_to_hybrid_encrypted_repo_causes___34__remote_already_exists__34___error/comment_1_fe2f0e7a4688865faf21c2c0467852b7._comment b/doc/forum/Adding_public_key_to_hybrid_encrypted_repo_causes___34__remote_already_exists__34___error/comment_1_fe2f0e7a4688865faf21c2c0467852b7._comment new file mode 100644 index 000000000..be3a21314 --- /dev/null +++ b/doc/forum/Adding_public_key_to_hybrid_encrypted_repo_causes___34__remote_already_exists__34___error/comment_1_fe2f0e7a4688865faf21c2c0467852b7._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2018-03-02T19:04:08Z" + content=""" +Your version of git-annex is impressively out of date. +When I try this with the current version, it works ok. +"""]] diff --git a/doc/install/Debian.mdwn b/doc/install/Debian.mdwn index 2c3a48622..aa49f8800 100644 --- a/doc/install/Debian.mdwn +++ b/doc/install/Debian.mdwn @@ -11,6 +11,8 @@ Debian's stable release contains git-annex version 6.20170101. sudo apt install git-annex +A newer version of git-annex is available in backports. + ## Standalone backports for all releases If the version shipped with Debian is too old, diff --git a/doc/walkthrough/adding_a_remote/comment_6_15ea28114e69dddac82fddaf009079ca._comment b/doc/walkthrough/adding_a_remote/comment_6_15ea28114e69dddac82fddaf009079ca._comment new file mode 100644 index 000000000..a57115c80 --- /dev/null +++ b/doc/walkthrough/adding_a_remote/comment_6_15ea28114e69dddac82fddaf009079ca._comment @@ -0,0 +1,9 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 6""" + date="2018-03-02T19:09:36Z" + content=""" +@elmimmo, you could add all those permutations, but there's no need to +connect repositories that you don't need git-annex to transfer data +between. +"""]] diff --git a/git-annex.cabal b/git-annex.cabal index 2b17f6729..994e01570 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -377,7 +377,12 @@ Executable git-annex -- Fully optimize for production. if flag(Production) - GHC-Options: -O2 + -- Lower memory systems can run out of memory with -O2, so + -- optimise slightly less. + if arch(arm) + GHC-Options: -O1 -optlo-O2 + else + GHC-Options: -O2 -- Avoid linking with unused dynamic libaries. -- (Only tested on Linux). |