summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorJoey Hess2014-05-24 00:52:37 -0400
committerJoey Hess2014-05-24 00:52:37 -0400
commit321a45a1ba1800241abacaaf1e0d1530360b9204 (patch)
tree758078705307f2579d1931f6d886e92c36246c0b /src/Propellor
parentcc46cb19421d99f93fdc78cda50761dba3556b21 (diff)
propellor spin
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
index 7941d7b4..b8729871 100644
--- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
+++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
@@ -113,16 +113,18 @@ androidContainer dockerImage crontimes timeout = Docker.container "android-git-a
& Apt.stdSourcesList Stable
& Apt.unattendedUpgrades
& builder' noBuildDeps "android" crontimes timeout True
+ & flagFile chrootsetup ("/chrootsetup")
+ -- TODO: automate installing haskell libs
+ -- (Currently have to run
+ -- git-annex/standalone/android/install-haskell-packages
+ -- which is not fully automated.)
+ where
-- Use git-annex's android chroot setup script, which will install
-- ghc-android and the NDK, all build deps, etc, in the home
-- directory of the builder user.
- & scriptProperty
+ chrootsetup = scriptProperty
[ "cd " ++ builddir ++ " && ./standalone/android/buildchroot-inchroot"
]
- -- TODO: automate installing haskell libs
- -- (Currently have to run
- -- git-annex/standalone/android/install-haskell-packages
- -- which is not fully automated.)
-- armel builder has a companion container using amd64 that
-- runs the build first to get TH splices. They need