From cc46cb19421d99f93fdc78cda50761dba3556b21 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 24 May 2014 00:09:58 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/Propellor/Property/SiteSpecific') diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs index 13f1ac12..7941d7b4 100644 --- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs +++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs @@ -88,6 +88,9 @@ buildDepsNoHaskellLibs = Apt.installed ["git", "rsync", "moreutils", "ca-certifi "libghc-dbus-dev", "libghc-fdo-notify-dev", "libghc-network-protocol-xmpp-dev" ] +noBuildDeps :: Property +noBuildDeps = propertyList "no build deps" [] + -- Installs current versions of git-annex's deps from cabal, but only -- does so once. cabalDeps :: Property @@ -109,10 +112,10 @@ androidContainer dockerImage crontimes timeout = Docker.container "android-git-a (dockerImage $ System (Debian Stable) "i386") & Apt.stdSourcesList Stable & Apt.unattendedUpgrades - & builder "android" crontimes timeout True + & builder' noBuildDeps "android" crontimes timeout True -- Use git-annex's android chroot setup script, which will install - -- ghc-android and the NDK, etc, in the home directory of the - -- builder user. + -- ghc-android and the NDK, all build deps, etc, in the home + -- directory of the builder user. & scriptProperty [ "cd " ++ builddir ++ " && ./standalone/android/buildchroot-inchroot" ] -- cgit v1.2.3