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

full auto baybee!

This commit is contained in:
Joey Hess 2014-10-16 12:13:55 -04:00
parent bf238a34ee
commit 8a6da9ff73
Failed to extract signature
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,17 +114,14 @@ androidContainer dockerImage name setupgitannexdir gitannexdir = Docker.containe
& os osver & os osver
& Apt.stdSourcesList & Apt.stdSourcesList
& Apt.installed ["systemd"] & Apt.installed ["systemd"]
& Docker.tweaked
& User.accountFor builduser & User.accountFor builduser
& File.dirExists gitbuilderdir & File.dirExists gitbuilderdir
& File.ownerGroup homedir builduser builduser & File.ownerGroup homedir builduser builduser
& buildDepsApt & buildDepsApt
& flagFile chrootsetup ("/chrootsetup") & flagFile chrootsetup ("/chrootsetup")
`requires` setupgitannexdir `requires` setupgitannexdir
& Docker.tweaked & flagFile haskellpkgsinstalled ("/haskellpkgsinstalled")
-- TODO: automate installing haskell libs
-- (Currently have to run
-- git-annex/standalone/android/install-haskell-packages
-- which is not fully automated.)
where where
-- Use git-annex's android chroot setup script, which will install -- Use git-annex's android chroot setup script, which will install
-- ghc-android and the NDK, all build deps, etc, in the home -- 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 chrootsetup = scriptProperty
[ "cd " ++ gitannexdir ++ " && ./standalone/android/buildchroot-inchroot" [ "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") osver = System (Debian Testing) "i386" -- once jessie is released, use: (Stable "jessie")
-- armel builder has a companion container using amd64 that -- armel builder has a companion container using amd64 that