summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Machine.hs
diff options
context:
space:
mode:
authorJoey Hess2017-11-16 17:54:47 -0400
committerJoey Hess2017-11-16 17:54:47 -0400
commitcff178de9c0d229574ab884fcca08a41f434e119 (patch)
tree6208a18ba662ea907eb51db6196ff54c0577b543 /src/Propellor/Property/Machine.hs
parent19feb8451b75ae669b45add9e9d9851a542fd981 (diff)
Uboot: New module.
Installing u-boot to the boot sector is not needed by some boards (my CubieTruck boots without it), but may be by others. Tricky part was making u-boot be written to a disk image when building one. This commit was sponsored by Jake Vosloo on Patreon.
Diffstat (limited to 'src/Propellor/Property/Machine.hs')
-rw-r--r--src/Propellor/Property/Machine.hs17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/Propellor/Property/Machine.hs b/src/Propellor/Property/Machine.hs
index 2f356bdd..5f5024df 100644
--- a/src/Propellor/Property/Machine.hs
+++ b/src/Propellor/Property/Machine.hs
@@ -14,6 +14,7 @@ module Propellor.Property.Machine (
import Propellor.Base
import qualified Propellor.Property.Apt as Apt
import qualified Propellor.Property.FlashKernel as FlashKernel
+import qualified Propellor.Property.Uboot as Uboot
-- | Cubietech Cubietruck
--
@@ -21,21 +22,21 @@ import qualified Propellor.Property.FlashKernel as FlashKernel
-- this property. Also, see https://bugs.debian.org/844056
cubietech_Cubietruck :: Property (HasInfo + DebianLike)
cubietech_Cubietruck = FlashKernel.installed "Cubietech Cubietruck"
- `requires` sunixi
+ `requires` sunixi "Cubietruck"
`requires` lpae
-- | Olimex A10-OLinuXino-LIME
olimex_A10_OLinuXino_LIME :: Property (HasInfo + DebianLike)
olimex_A10_OLinuXino_LIME = FlashKernel.installed "Olimex A10-OLinuXino-LIME"
- `requires` sunixi
+ `requires` sunixi "A10-OLinuXino-Lime"
`requires` armmp
-sunixi :: Property DebianLike
-sunixi = Apt.installed
- [ "firmware-linux-free"
- , "u-boot"
- , "sunxi-tools"
- ]
+sunixi :: Uboot.BoardName -> Property (HasInfo + DebianLike)
+sunixi boardname = Uboot.sunxi boardname
+ `requires` Apt.installed
+ [ "firmware-linux-free"
+ , "sunxi-tools"
+ ]
armmp :: Property DebianLike
armmp = Apt.installed ["linux-image-armmp"]