summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
diff options
context:
space:
mode:
Diffstat (limited to 'src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs')
-rw-r--r--src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
index 8604cdf9..d480e024 100644
--- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
+++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
@@ -114,17 +114,14 @@ androidContainer dockerImage name setupgitannexdir gitannexdir = Docker.containe
& os osver
& Apt.stdSourcesList
& Apt.installed ["systemd"]
+ & Docker.tweaked
& User.accountFor builduser
& File.dirExists gitbuilderdir
& File.ownerGroup homedir builduser builduser
& buildDepsApt
& flagFile chrootsetup ("/chrootsetup")
`requires` setupgitannexdir
- & Docker.tweaked
- -- TODO: automate installing haskell libs
- -- (Currently have to run
- -- git-annex/standalone/android/install-haskell-packages
- -- which is not fully automated.)
+ & flagFile haskellpkgsinstalled ("/haskellpkgsinstalled")
where
-- Use git-annex's android chroot setup script, which will install
-- ghc-android and the NDK, all build deps, etc, in the home
@@ -132,6 +129,9 @@ androidContainer dockerImage name setupgitannexdir gitannexdir = Docker.containe
chrootsetup = scriptProperty
[ "cd " ++ gitannexdir ++ " && ./standalone/android/buildchroot-inchroot"
]
+ haskellpkgsinstalled = userScriptProperty "builder"
+ [ "cd " ++ gitannexdir ++ " && ./install-haskell-packages"
+ ]
osver = System (Debian Testing) "i386" -- once jessie is released, use: (Stable "jessie")
-- armel builder has a companion container using amd64 that