cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propellor spin

This commit is contained in:
Joey Hess 2014-05-24 00:52:37 -04:00
parent cc46cb1942
commit 321a45a1ba
Failed to extract signature
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
View File

@ -113,16 +113,18 @@ androidContainer dockerImage crontimes timeout = Docker.container "android-git-a
& Apt.stdSourcesList Stable & Apt.stdSourcesList Stable
& Apt.unattendedUpgrades & Apt.unattendedUpgrades
& builder' noBuildDeps "android" crontimes timeout True & builder' noBuildDeps "android" crontimes timeout True
-- Use git-annex's android chroot setup script, which will install & flagFile chrootsetup ("/chrootsetup")
-- ghc-android and the NDK, all build deps, etc, in the home
-- directory of the builder user.
& scriptProperty
[ "cd " ++ builddir ++ " && ./standalone/android/buildchroot-inchroot"
]
-- TODO: automate installing haskell libs -- TODO: automate installing haskell libs
-- (Currently have to run -- (Currently have to run
-- git-annex/standalone/android/install-haskell-packages -- git-annex/standalone/android/install-haskell-packages
-- which is not fully automated.) -- 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.
chrootsetup = scriptProperty
[ "cd " ++ builddir ++ " && ./standalone/android/buildchroot-inchroot"
]
-- armel builder has a companion container using amd64 that -- armel builder has a companion container using amd64 that
-- runs the build first to get TH splices. They need -- runs the build first to get TH splices. They need