From 6673b6014fdc04976b5bbd95187b28dcbf1a7e19 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 13 Oct 2014 15:05:18 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 1 + 1 file changed, 1 insertion(+) (limited to 'src/Propellor/Property/SiteSpecific') diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs index 056578a1..20ba7844 100644 --- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs +++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs @@ -65,6 +65,7 @@ tree buildarch = combineProperties "gitannexbuilder tree" buildDepsApt :: Property buildDepsApt = combineProperties "gitannexbuilder build deps" [ Apt.buildDep ["git-annex"] + , Apt.installed ["liblockfile-simple-perl"] , buildDepsNoHaskellLibs , "git-annex source build deps installed" ==> Apt.buildDepIn builddir ] -- cgit v1.3-2-g0d8e From 158cbd0fbf414cbaede9b030edbf77a5890098a4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 14 Oct 2014 19:22:01 -0400 Subject: android chroot switched to jessie --- src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Propellor/Property/SiteSpecific') diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs index 20ba7844..d9dc114e 100644 --- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs +++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs @@ -132,7 +132,7 @@ androidContainer dockerImage name setupgitannexdir gitannexdir = Docker.containe chrootsetup = scriptProperty [ "cd " ++ gitannexdir ++ " && ./standalone/android/buildchroot-inchroot" ] - osver = System (Debian (Stable "wheezy")) "i386" + osver = System (Debian Testing) "i386" -- once jessie is released, use: (Stable "jessie") -- armel builder has a companion container using amd64 that -- runs the build first to get TH splices. They need -- cgit v1.3-2-g0d8e From bf238a34ee3c72bd579deb8991fe7529b99bbe22 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 15 Oct 2014 00:49:39 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Propellor/Property/SiteSpecific') diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs index d9dc114e..8604cdf9 100644 --- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs +++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs @@ -117,7 +117,7 @@ androidContainer dockerImage name setupgitannexdir gitannexdir = Docker.containe & User.accountFor builduser & File.dirExists gitbuilderdir & File.ownerGroup homedir builduser builduser - & buildDepsNoHaskellLibs + & buildDepsApt & flagFile chrootsetup ("/chrootsetup") `requires` setupgitannexdir & Docker.tweaked -- cgit v1.3-2-g0d8e From 8a6da9ff731e446a8e74befae1f8dc610cce6082 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 16 Oct 2014 12:13:55 -0400 Subject: full auto baybee! --- src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/Propellor/Property/SiteSpecific') 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 -- cgit v1.3-2-g0d8e From 0f1fcc24f89a7b8f8be1bcd71e800739d46b7912 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 16 Oct 2014 17:02:16 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Propellor/Property/SiteSpecific') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 77af65fa..bd9e01e2 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -72,7 +72,7 @@ oldUseNetServer hosts = propertyList ("olduse.net server") oldUseNetShellBox :: Property oldUseNetShellBox = propertyList "olduse.net shellbox" [ oldUseNetInstalled "oldusenet" - , Service.running "oldusenet" + , Service.running "shellinabox" ] oldUseNetInstalled :: Apt.Package -> Property -- cgit v1.3-2-g0d8e From 2b320d2bd93cbecd412af48d3bcfa348ba3fe453 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 23 Oct 2014 13:26:51 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Propellor/Property/SiteSpecific') diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs index d480e024..901eba2e 100644 --- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs +++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs @@ -130,7 +130,7 @@ androidContainer dockerImage name setupgitannexdir gitannexdir = Docker.containe [ "cd " ++ gitannexdir ++ " && ./standalone/android/buildchroot-inchroot" ] haskellpkgsinstalled = userScriptProperty "builder" - [ "cd " ++ gitannexdir ++ " && ./install-haskell-packages" + [ "cd " ++ gitannexdir ++ " && ./standalone/android/install-haskell-packages" ] osver = System (Debian Testing) "i386" -- once jessie is released, use: (Stable "jessie") -- cgit v1.3-2-g0d8e