summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-11-16 16:41:07 -0400
committerJoey Hess2017-11-16 16:41:07 -0400
commit19feb8451b75ae669b45add9e9d9851a542fd981 (patch)
tree9255cd235e3150e8f0a0e406ea4ee0618a2b7c35
parent4f2bd92e568baf1b061f7f2fc82288d320de3346 (diff)
propellor spin
-rw-r--r--joeyconfig.hs12
-rw-r--r--src/Propellor/Property/Machine.hs21
2 files changed, 18 insertions, 15 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs
index ba2e9c59..e044f70c 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -96,14 +96,13 @@ darkstar = host "darkstar.kitenet.net" $ props
[ (SshRsa, "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1YoyHxZwG5Eg0yiMTJLSWJ/+dMM6zZkZiR4JJ0iUfP+tT2bm/lxYompbSqBeiCq+PYcSC67mALxp1vfmdOV//LWlbXfotpxtyxbdTcQbHhdz4num9rJQz1tjsOsxTEheX5jKirFNC5OiKhqwIuNydKWDS9qHGqsKcZQ8p+n1g9Lr3nJVGY7eRRXzw/HopTpwmGmAmb9IXY6DC2k91KReRZAlOrk0287LaK3eCe1z0bu7LYzqqS+w99iXZ/Qs0m9OqAPnHZjWQQ0fN4xn5JQpZSJ7sqO38TBAimM+IHPmy2FTNVVn9zGM+vN1O2xr3l796QmaUG1+XLL0shfR/OZbb joey@darkstar")
]
& imageBuilt (RawDiskImage "/srv/test.img") mychroot MSDOS
- [ partition EXT2 `mountedAt` "/boot"
- , partition EXT4 `mountedAt` "/"
- , swapPartition (MegaBytes 256)
+ [ partition EXT4 `mountedAt` "/"
+ `setSize` MegaBytes 4096
]
where
mychroot d = debootstrapped mempty d $ props
& osDebian Unstable ARMHF
- & Machine.Olimex_A10_OLinuXino_LIME
+ & Machine.olimex_A10_OLinuXino_LIME
gnu :: Host
gnu = host "gnu.kitenet.net" $ props
@@ -189,10 +188,7 @@ honeybee = host "honeybee.kitenet.net" $ props
-- and try to be robust.
& "/etc/default/rcS" `File.containsLine` "FSCKFIX=yes"
- -- Cubietruck
- & Apt.installed ["flash-kernel"]
- & "/etc/flash-kernel/machine" `File.hasContent` ["Cubietech Cubietruck"]
- & Apt.installed ["linux-image-armmp"]
+ & Machine.cubietech_Cubietruck
& Apt.installed ["firmware-brcm80211"]
-- Workaround for https://bugs.debian.org/844056
`requires` File.hasPrivContent "/lib/firmware/brcm/brcmfmac43362-sdio.txt" anyContext
diff --git a/src/Propellor/Property/Machine.hs b/src/Propellor/Property/Machine.hs
index e193c4a2..2f356bdd 100644
--- a/src/Propellor/Property/Machine.hs
+++ b/src/Propellor/Property/Machine.hs
@@ -7,19 +7,26 @@
module Propellor.Property.Machine (
-- * ARM boards
- Cubietech Cubietruck,
- Olimex_A10_OLinuXino_LIME
-)
+ cubietech_Cubietruck,
+ olimex_A10_OLinuXino_LIME
+) where
+
+import Propellor.Base
+import qualified Propellor.Property.Apt as Apt
+import qualified Propellor.Property.FlashKernel as FlashKernel
-- | Cubietech Cubietruck
-Cubietech_Cubietruck :: Property (HasInfo + DebianLike)
-Cubietech_Cubietruck = FlashKernel.installed "Cubietech Cubietruck"
+--
+-- Wifi needs non-free firmware-brcm80211, whicn is not installed by
+-- this property. Also, see https://bugs.debian.org/844056
+cubietech_Cubietruck :: Property (HasInfo + DebianLike)
+cubietech_Cubietruck = FlashKernel.installed "Cubietech Cubietruck"
`requires` sunixi
`requires` lpae
-- | Olimex A10-OLinuXino-LIME
-Olimex_A10_OLinuXino_LIME :: Property (HasInfo + DebianLike)
-Olimex_A10_OLinuXino_LIME = FlashKernel.installed "Olimex A10-OLinuXino-LIME"
+olimex_A10_OLinuXino_LIME :: Property (HasInfo + DebianLike)
+olimex_A10_OLinuXino_LIME = FlashKernel.installed "Olimex A10-OLinuXino-LIME"
`requires` sunixi
`requires` armmp