diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2021-05-07 18:38:58 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-05-09 12:21:56 -0700 |
| commit | 8fa130526050c4d3bdfa5465e06180f813a71f3c (patch) | |
| tree | 820ead2c6b33e12337bc6d3e453ff7b2c4b2f8bf /src/property/u-boot.lisp | |
| parent | 9cc2fd8af9b974c28534aaa40c736503bdef98d6 (diff) | |
| download | consfigurator-8fa130526050c4d3bdfa5465e06180f813a71f3c.tar.gz | |
rework bootloader installation so can use property-defining macros
It is better to have the code which installs bootloaders to volumes in
property definitions rather than in plain functions, as then we can specify
that it's :POSIX or :LISP, specify the OS required for it to run, and similar.
This commit enables that by replacing INSTALL-BOOTLOADER with a different
generic which returns propspecs.
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src/property/u-boot.lisp')
| -rw-r--r-- | src/property/u-boot.lisp | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/src/property/u-boot.lisp b/src/property/u-boot.lisp index 9d8f7f0..4e45527 100644 --- a/src/property/u-boot.lisp +++ b/src/property/u-boot.lisp @@ -18,14 +18,25 @@ (in-package :consfigurator.property.u-boot) (named-readtables:in-readtable :consfigurator) -(defmethod install-bootloader ((type (eql 'u-boot-install-rockchip)) - (volume opened-volume) - running-on-target &key) - (mrun "u-boot-install-rockchip" (device-file volume)) - (mrun "sync")) - -(defmethod install-bootloader-binaries - ((type (eql 'u-boot-install-rockchip)) volume &key) - `(os:etypecase +;; Currently we have a distinct property for each (Debian-specific) +;; installation script. Perhaps there is some sensible parameterisation of +;; these available instead. + +(defmethod install-bootloader-propspec + ((type (eql 'u-boot-install-rockchip)) volume running-on-target + &key &allow-other-keys) + `(u-boot-installed-rockchip ,volume ,running-on-target)) + +(defmethod install-bootloader-binaries-propspec + ((type (eql 'u-boot-install-rockchip)) volume &key &allow-other-keys) + '(os:etypecase (debianlike (apt:installed "u-boot-rockchip")))) + +(defprop u-boot-installed-rockchip :posix (volume running-on-target) + (:desc "Installed U-Boot using Debian scripts") + (:hostattrs + (os:required 'os:debianlike)) + (:apply + (declare (ignore running-on-target)) + (mrun "u-boot-install-rockchip" (device-file volume)))) |