diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-06-11 23:52:15 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-06-11 23:52:15 +0200 |
| commit | a032b4454b3fc67e11e9fc2d8c2345288065fa29 (patch) | |
| tree | c208124b79dbd2224b68c52106aa72ff2ebfa7ab /gnu/system/install.scm | |
| parent | b5724230fed2d043206df20d12a45bb962b7ee77 (diff) | |
| parent | 6321ce42ab4d9ab788d858cb19bde4aa7a0e3ecc (diff) | |
| download | guix-a032b4454b3fc67e11e9fc2d8c2345288065fa29.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/system/install.scm')
| -rw-r--r-- | gnu/system/install.scm | 36 |
1 files changed, 32 insertions, 4 deletions
diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 920d215272..35f4ba9c24 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -49,7 +49,12 @@ a20-olinuxino-micro-installation-os banana-pi-m2-ultra-installation-os beaglebone-black-installation-os - nintendo-nes-classic-edition-installation-os)) + mx6cuboxi-installation-os + nintendo-nes-classic-edition-installation-os + novena-installation-os + pine64-plus-installation-os + rk3399-puma-installation-os + wandboard-installation-os)) ;;; Commentary: ;;; @@ -324,8 +329,7 @@ You have been warned. Thanks for being so brave.\x1b[0m ;; the appropriate one. (cons* (file-system (mount-point "/") - (device "GuixSD_image") - (title 'label) + (device (file-system-label "GuixSD_image")) (type "ext4")) ;; Make /tmp a tmpfs instead of keeping the overlayfs. This @@ -337,7 +341,6 @@ You have been warned. Thanks for being so brave.\x1b[0m (file-system (mount-point "/tmp") (device "none") - (title 'device) (type "tmpfs") (check? #f)) @@ -429,11 +432,36 @@ The bootloader BOOTLOADER is installed to BOOTLOADER-TARGET." "/dev/mmcblk1" ; eMMC storage "ttyS0")) +(define mx6cuboxi-installation-os + (embedded-installation-os u-boot-mx6cuboxi-bootloader + "/dev/mmcblk0" ; SD card storage + "ttymxc0")) + +(define novena-installation-os + (embedded-installation-os u-boot-novena-bootloader + "/dev/mmcblk1" ; SD card storage + "ttymxc1")) + (define nintendo-nes-classic-edition-installation-os (embedded-installation-os u-boot-nintendo-nes-classic-edition-bootloader "/dev/mmcblk0" ; SD card (solder it yourself) "ttyS0")) +(define pine64-plus-installation-os + (embedded-installation-os u-boot-pine64-plus-bootloader + "/dev/mmcblk0" ; SD card storage + "ttyS0")) + +(define rk3399-puma-installation-os + (embedded-installation-os u-boot-puma-rk3399-bootloader + "/dev/mmcblk0" ; SD card storage + "ttyS0")) + +(define wandboard-installation-os + (embedded-installation-os u-boot-wandboard-bootloader + "/dev/mmcblk0" ; SD card storage + "ttymxc0")) + ;; Return the default os here so 'guix system' can consume it directly. installation-os |