diff --git a/Build/BundledPrograms.hs b/Build/BundledPrograms.hs index a64206b7dd..cf16da0f2b 100644 --- a/Build/BundledPrograms.hs +++ b/Build/BundledPrograms.hs @@ -69,6 +69,8 @@ preferredBundledPrograms = catMaybes , Just "rsync" #ifndef mingw32_HOST_OS , Just "sh" + -- used by git-annex when available + , Just "uname" #endif , BuildInfo.lsof , BuildInfo.gcrypt diff --git a/CHANGELOG b/CHANGELOG index 6e14024bf7..25da6e4afe 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -17,6 +17,7 @@ git-annex (6.20180530) UNRELEASED; urgency=medium * When content has been lost from an export remote and git-annex fsck --from remote has noticed it's gone, re-running git-annex export or git-annex sync --content will re-upload it. + * Include uname in standalone builds. -- Joey Hess Wed, 30 May 2018 11:49:08 -0400