[FIXME] system: Add ARM installer.

  • Done
  • quality assurance status badge
Details
3 participants
  • Danny Milosavljevic
  • Ludovic Courtès
  • Christopher Baines
Owner
unassigned
Submitted by
Danny Milosavljevic
Severity
normal

Debbugs page

Danny Milosavljevic wrote 7 years ago
(address . guix-patches@gnu.org)(name . Danny Milosavljevic)(address . dannym@scratchpost.org)
20180122220011.7896-1-dannym@scratchpost.org
* gnu/system/install.scm (arm-installation-os): New exported variable.
---
gnu/system/install.scm | 6 ++++++
1 file changed, 6 insertions(+)

Toggle diff (24 lines)
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index 286415052..a708e57f3 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -47,6 +47,7 @@
a20-olinuxino-lime-installation-os
a20-olinuxino-lime2-emmc-installation-os
a20-olinuxino-micro-installation-os
+ arm-installation-os
banana-pi-m2-ultra-installation-os
beaglebone-black-installation-os
nintendo-nes-classic-edition-installation-os))
@@ -408,6 +409,11 @@ The bootloader BOOTLOADER is installed to BOOTLOADER-TARGET."
(services (cons* (agetty-default-service tty)
(operating-system-user-services installation-os)))))
+(define arm-installation-os
+ (embedded-installation-os u-boot-bootloader
+ "/dev/null"
+ "ttyS0"))
+
(define beaglebone-black-installation-os
(embedded-installation-os u-boot-beaglebone-black-bootloader
"/dev/sda"
Danny Milosavljevic wrote 7 years ago
[WIP] services: agetty: Make tty optional.
(address . 30216@debbugs.gnu.org)(name . Danny Milosavljevic)(address . dannym@scratchpost.org)
20180122232643.22408-1-dannym@scratchpost.org
* gnu/services/base.scm (default-tty): New variable.
(agetty-shepherd-service): Make tty optional, default to the above.
* gnu/system/install.scm (arm-installation-os): New variable. Use the above.
---
gnu/services/base.scm | 27 ++++++++++++++++++++++++---
gnu/system/install.scm | 8 +++++++-
2 files changed, 31 insertions(+), 4 deletions(-)

Toggle diff (92 lines)
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 8e30bcd34..d29da29ff 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -817,7 +817,7 @@ the message of the day, among other things."
agetty-configuration?
(agetty agetty-configuration-agetty ;<package>
(default util-linux))
- (tty agetty-configuration-tty) ;string
+ (tty agetty-configuration-tty) ;string | #f
(term agetty-term ;string | #f
(default #f))
(baud-rate agetty-baud-rate ;string | #f
@@ -890,6 +890,27 @@ the message of the day, among other things."
;;; (default #f))
)
+(define (default-tty)
+ #~(begin
+ ;; console=device,options
+ ;; device: can be tty0, ttyS0, lp0, ttyUSB0 (serial).
+ ;; options: BBBBPNF. P n|o|e, N number of bits,
+ ;; F flow control (r RTS)
+ (use-modules (ice-9 textual-ports))
+ (let* ((command (call-with-input-file "/proc/cmdline" get-string-all))
+ (not-comma (char-set-complement (char-set #\,)))
+ (items (string-tokenize command))
+ (item-by-key (lambda (key)
+ (let ((keylen (string-length key)))
+ (map (lambda (a) (string-drop a keylen))
+ (filter (lambda (b) (string-prefix? key b)) items)))))
+ (agetty-ttys (item-by-key "agetty.tty="))
+ (console-ttys (item-by-key "console="))
+ (ttys (or agetty-ttys (map car (string-tokenize console-ttys not-comma)))))
+ (if (null? ttys)
+ "XXX"
+ (car ttys)))))
+
(define agetty-shepherd-service
(match-lambda
(($ <agetty-configuration> agetty tty term baud-rate auto-login
@@ -901,7 +922,7 @@ the message of the day, among other things."
(list
(shepherd-service
(documentation "Run agetty on a tty.")
- (provision (list (symbol-append 'term- (string->symbol tty))))
+ (provision (list (symbol-append 'term- (string->symbol (or tty "auto")))))
;; Since the login prompt shows the host name, wait for the 'host-name'
;; service to be done. Also wait for udev essentially so that the tty
@@ -1009,7 +1030,7 @@ the message of the day, among other things."
#$@(if login-pause?
#~("--login-pause")
#~())
- #$tty
+ #$(or tty (default-tty))
#$@(if baud-rate
#~(#$baud-rate)
#~())
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index 286415052..19a129ce3 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -47,6 +47,7 @@
a20-olinuxino-lime-installation-os
a20-olinuxino-lime2-emmc-installation-os
a20-olinuxino-micro-installation-os
+ arm-installation-os
banana-pi-m2-ultra-installation-os
beaglebone-black-installation-os
nintendo-nes-classic-edition-installation-os))
@@ -381,7 +382,7 @@ You have been warned. Thanks for being so brave.\x1b[0m
nvi ;:wq!
%base-packages))))
-(define* (agetty-default-service #:optional (tty "ttyS0"))
+(define* (agetty-default-service #:optional (tty #f))
"Return an agetty-service on the given TTY"
(agetty-service (agetty-configuration
(extra-options '("-L"))
@@ -408,6 +409,11 @@ The bootloader BOOTLOADER is installed to BOOTLOADER-TARGET."
(services (cons* (agetty-default-service tty)
(operating-system-user-services installation-os)))))
+(define arm-installation-os
+ (embedded-installation-os u-boot-bootloader
+ "/dev/null"
+ #f))
+
(define beaglebone-black-installation-os
(embedded-installation-os u-boot-beaglebone-black-bootloader
"/dev/sda"
Ludovic Courtès wrote 7 years ago
Re: [bug#30216] [FIXME] system: Add ARM installer.
(name . Danny Milosavljevic)(address . dannym@scratchpost.org)(address . 30216@debbugs.gnu.org)
87lggo7qjl.fsf@gnu.org
Hi Danny!

Danny Milosavljevic <dannym@scratchpost.org> skribis:

Toggle quote (2 lines)
> * gnu/system/install.scm (arm-installation-os): New exported variable.

What would it mean to have an “ARM” installer? I’d expect these things
to be board-specific, no?

Thanks,
Ludo’.
Danny Milosavljevic wrote 7 years ago
Re: [bug#30216] [WIP] system: Add ARM installer; services: agetty: Make tty optional
(name . Ludovic Courtès)(address . ludo@gnu.org)(address . 30216@debbugs.gnu.org)
20180123145452.57b9e1e6@scratchpost.org
Hi Ludo,

On Tue, 23 Jan 2018 12:39:10 +0100
ludo@gnu.org (Ludovic Courtès) wrote:

Toggle quote (3 lines)
> What would it mean to have an “ARM” installer? I’d expect these things
> to be board-specific, no?

I hope it's not that board-specific. There are minimal differences but
many ARM boards use the same Linux kernel (with the same config).

This was one of the motivation to create u-boot: u-boot is like a
board-specific mini-Linux kernel. The Linux kernel that u-boot then
loads later is not board-specific.

In the past, board vendors kept putting huge board configuration tables inside
Linux until Linus put a stop to it.

Nowadays it should not be the case anymore that Linux is board-specific.

Therefore, I think it would be preferrable in the long run if
Hydra didn't build 1000 different 1 GB images for different boards
where the only different part is u-boot.

This is preparatory work which is very much work-in-progress, mostly
as a discussion basis.

There's a thread about it on guix-devel, "Porting GuixSD to ARM article.".

So long story short, about 99% of the image this arm-installer generates
will work and be identical for almost every ARMv7 board, except for u-boot
(u-boot is kinda important, though).
Danny Milosavljevic wrote 7 years ago
[WIP v2] services: agetty: Make tty optional.
(address . 30216@debbugs.gnu.org)(name . Danny Milosavljevic)(address . dannym@scratchpost.org)
20180123143409.31064-1-dannym@scratchpost.org
* gnu/services/base.scm (default-tty): New variable.
(agetty-shepherd-service): Make tty optional, default to the above.
* gnu/system/install.scm (arm-installation-os): New variable. Use the above.
---
gnu/services/base.scm | 45 ++++++++++++++++++++++++++++++++++++++++++---
gnu/system/install.scm | 8 +++++++-
2 files changed, 49 insertions(+), 4 deletions(-)

Toggle diff (117 lines)
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 8e30bcd34..3874c22b8 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -817,7 +817,7 @@ the message of the day, among other things."
agetty-configuration?
(agetty agetty-configuration-agetty ;<package>
(default util-linux))
- (tty agetty-configuration-tty) ;string
+ (tty agetty-configuration-tty) ;string | #f
(term agetty-term ;string | #f
(default #f))
(baud-rate agetty-baud-rate ;string | #f
@@ -890,6 +890,42 @@ the message of the day, among other things."
;;; (default #f))
)
+(define (default-tty)
+ #~(begin
+ ;; console=device,options
+ ;; device: can be tty0, ttyS0, lp0, ttyUSB0 (serial).
+ ;; options: BBBBPNF. P n|o|e, N number of bits,
+ ;; F flow control (r RTS)
+ (use-modules (ice-9 textual-ports))
+ (let* ((command (call-with-input-file "/proc/cmdline" get-string-all))
+ (not-comma (char-set-complement (char-set #\,)))
+ (items (string-tokenize command))
+ (items-by-key (lambda (key target-prefix)
+ (let ((keylen (string-length key)))
+ (map (lambda (a)
+ (string-append target-prefix
+ (string-drop a keylen)))
+ (filter (lambda (b)
+ (string-prefix? key b)) items)))))
+ (agetty-ttys (items-by-key "agetty.tty=" ""))
+ (console-ttys (filter (lambda (tty)
+ (not (or
+ (string-prefix tty "tty0")
+ (string-prefix tty "tty1")
+ (string-prefix tty "tty2")
+ (string-prefix tty "tty3")
+ (string-prefix tty "tty4")
+ (string-prefix tty "tty5")
+ (string-prefix tty "tty6")
+ (string-prefix tty "tty7")
+ (string-prefix tty "tty8")
+ (string-prefix tty "tty9"))))
+ (items-by-key "console=tty" "tty")))
+ (ttys (or agetty-ttys (map car (string-tokenize console-ttys not-comma)))))
+ (if (null? ttys)
+ "XXX"
+ (car ttys)))))
+
(define agetty-shepherd-service
(match-lambda
(($ <agetty-configuration> agetty tty term baud-rate auto-login
@@ -901,7 +937,7 @@ the message of the day, among other things."
(list
(shepherd-service
(documentation "Run agetty on a tty.")
- (provision (list (symbol-append 'term- (string->symbol tty))))
+ (provision (list (symbol-append 'term- (string->symbol (or tty "auto")))))
;; Since the login prompt shows the host name, wait for the 'host-name'
;; service to be done. Also wait for udev essentially so that the tty
@@ -946,6 +982,9 @@ the message of the day, among other things."
('always "--local-line=always")
('never "-local-line=never")))
#~())
+ #$@(if tty
+ #~()
+ #~("--keep-baud"))
#$@(if extract-baud?
#~("--extract-baud")
#~())
@@ -1009,7 +1048,7 @@ the message of the day, among other things."
#$@(if login-pause?
#~("--login-pause")
#~())
- #$tty
+ #$(or tty (default-tty))
#$@(if baud-rate
#~(#$baud-rate)
#~())
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index e4b2e8237..cde30ec3b 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -47,6 +47,7 @@
a20-olinuxino-lime-installation-os
a20-olinuxino-lime2-emmc-installation-os
a20-olinuxino-micro-installation-os
+ arm-installation-os
banana-pi-m2-ultra-installation-os
beaglebone-black-installation-os
nintendo-nes-classic-edition-installation-os))
@@ -381,7 +382,7 @@ You have been warned. Thanks for being so brave.\x1b[0m
nvi ;:wq!
%base-packages))))
-(define* (agetty-default-service #:optional (tty "ttyS0"))
+(define* (agetty-default-service #:optional (tty #f))
"Return an agetty-service on the given TTY"
(agetty-service (agetty-configuration
(extra-options '("-L"))
@@ -408,6 +409,11 @@ The bootloader BOOTLOADER is installed to BOOTLOADER-TARGET."
(services (cons* (agetty-default-service tty)
(operating-system-user-services installation-os)))))
+(define arm-installation-os
+ (embedded-installation-os u-boot-bootloader
+ "/dev/null"
+ #f))
+
(define beaglebone-black-installation-os
(embedded-installation-os u-boot-beaglebone-black-bootloader
"/dev/sda"
Danny Milosavljevic wrote 7 years ago
[WIP v3] services: agetty: Make tty optional.
(address . 30216@debbugs.gnu.org)(name . Danny Milosavljevic)(address . dannym@scratchpost.org)
20180123144022.31285-1-dannym@scratchpost.org
* gnu/services/base.scm (default-tty): New variable.
(agetty-shepherd-service): Make tty optional, default to the above.
* gnu/system/install.scm (arm-installation-os): New variable. Use the above.
---
gnu/services/base.scm | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
gnu/system/install.scm | 8 +++++++-
2 files changed, 53 insertions(+), 4 deletions(-)

Toggle diff (121 lines)
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 8e30bcd34..45b057eb8 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -817,7 +817,7 @@ the message of the day, among other things."
agetty-configuration?
(agetty agetty-configuration-agetty ;<package>
(default util-linux))
- (tty agetty-configuration-tty) ;string
+ (tty agetty-configuration-tty) ;string | #f
(term agetty-term ;string | #f
(default #f))
(baud-rate agetty-baud-rate ;string | #f
@@ -890,6 +890,46 @@ the message of the day, among other things."
;;; (default #f))
)
+(define (default-tty)
+ #~(begin
+ ;; console=device,options
+ ;; device: can be tty0, ttyS0, lp0, ttyUSB0 (serial).
+ ;; options: BBBBPNF. P n|o|e, N number of bits,
+ ;; F flow control (r RTS)
+ (use-modules (ice-9 textual-ports))
+ (let* ((command (call-with-input-file "/proc/cmdline" get-string-all))
+ (not-comma (char-set-complement (char-set #\,)))
+ (items (string-tokenize command))
+ (items-by-key (lambda (key target-prefix)
+ (let ((keylen (string-length key)))
+ (map (lambda (a)
+ (string-append target-prefix
+ (string-drop a keylen)))
+ (filter (lambda (b)
+ (string-prefix? key b)) items)))))
+ (agetty-ttys (items-by-key "agetty.tty=" ""))
+ (console-ttys (filter (lambda (tty)
+ (not (or
+ (string-prefix tty "tty0")
+ (string-prefix tty "tty1")
+ (string-prefix tty "tty2")
+ (string-prefix tty "tty3")
+ (string-prefix tty "tty4")
+ (string-prefix tty "tty5")
+ (string-prefix tty "tty6")
+ (string-prefix tty "tty7")
+ (string-prefix tty "tty8")
+ (string-prefix tty "tty9"))))
+ (items-by-key "console=tty" "tty")))
+ (ttys (or agetty-ttys (map (lambda (console-spec)
+ ;; Extract device name.
+ (car (string-tokenize console-spec
+ not-comma)))
+ console-ttys))))
+ (if (null? ttys)
+ "XXX"
+ (car ttys)))))
+
(define agetty-shepherd-service
(match-lambda
(($ <agetty-configuration> agetty tty term baud-rate auto-login
@@ -901,7 +941,7 @@ the message of the day, among other things."
(list
(shepherd-service
(documentation "Run agetty on a tty.")
- (provision (list (symbol-append 'term- (string->symbol tty))))
+ (provision (list (symbol-append 'term- (string->symbol (or tty "auto")))))
;; Since the login prompt shows the host name, wait for the 'host-name'
;; service to be done. Also wait for udev essentially so that the tty
@@ -946,6 +986,9 @@ the message of the day, among other things."
('always "--local-line=always")
('never "-local-line=never")))
#~())
+ #$@(if tty
+ #~()
+ #~("--keep-baud"))
#$@(if extract-baud?
#~("--extract-baud")
#~())
@@ -1009,7 +1052,7 @@ the message of the day, among other things."
#$@(if login-pause?
#~("--login-pause")
#~())
- #$tty
+ #$(or tty (default-tty))
#$@(if baud-rate
#~(#$baud-rate)
#~())
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index e4b2e8237..cde30ec3b 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -47,6 +47,7 @@
a20-olinuxino-lime-installation-os
a20-olinuxino-lime2-emmc-installation-os
a20-olinuxino-micro-installation-os
+ arm-installation-os
banana-pi-m2-ultra-installation-os
beaglebone-black-installation-os
nintendo-nes-classic-edition-installation-os))
@@ -381,7 +382,7 @@ You have been warned. Thanks for being so brave.\x1b[0m
nvi ;:wq!
%base-packages))))
-(define* (agetty-default-service #:optional (tty "ttyS0"))
+(define* (agetty-default-service #:optional (tty #f))
"Return an agetty-service on the given TTY"
(agetty-service (agetty-configuration
(extra-options '("-L"))
@@ -408,6 +409,11 @@ The bootloader BOOTLOADER is installed to BOOTLOADER-TARGET."
(services (cons* (agetty-default-service tty)
(operating-system-user-services installation-os)))))
+(define arm-installation-os
+ (embedded-installation-os u-boot-bootloader
+ "/dev/null"
+ #f))
+
(define beaglebone-black-installation-os
(embedded-installation-os u-boot-beaglebone-black-bootloader
"/dev/sda"
Danny Milosavljevic wrote 7 years ago
[WIP v4] services: agetty: Make tty optional.
(address . 30216@debbugs.gnu.org)(name . Danny Milosavljevic)(address . dannym@scratchpost.org)
20180124131219.14202-1-dannym@scratchpost.org
* gnu/system/install.scm (agetty-default-service): Delete variable.
(embedded-installation-os): Move agetty-service instantiation to...
* gnu/services/base.scm (%base-services): ...here.
(default-tty): New variable.
(agetty-shepherd-service): Make tty optional, default to the above.
---
gnu/services/base.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++++---
gnu/system/install.scm | 12 +----------
2 files changed, 53 insertions(+), 14 deletions(-)

Toggle diff (131 lines)
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 8e30bcd34..90b45920d 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -817,7 +817,7 @@ the message of the day, among other things."
agetty-configuration?
(agetty agetty-configuration-agetty ;<package>
(default util-linux))
- (tty agetty-configuration-tty) ;string
+ (tty agetty-configuration-tty) ;string | #f
(term agetty-term ;string | #f
(default #f))
(baud-rate agetty-baud-rate ;string | #f
@@ -890,6 +890,47 @@ the message of the day, among other things."
;;; (default #f))
)
+(define (default-tty)
+ #~(begin
+ ;; console=device,options
+ ;; device: can be tty0, ttyS0, lp0, ttyUSB0 (serial).
+ ;; options: BBBBPNF. P n|o|e, N number of bits,
+ ;; F flow control (r RTS)
+ (use-modules (rnrs io ports))
+ (let* ((command (call-with-input-file "/proc/cmdline" get-string-all))
+ (not-comma (char-set-complement (char-set #\,)))
+ (items (string-tokenize command))
+ (items-by-key (lambda (key target-prefix)
+ (let ((keylen (string-length key)))
+ (map (lambda (a)
+ (string-append target-prefix
+ (string-drop a keylen)))
+ (filter (lambda (b)
+ (string-prefix? key b)) items)))))
+ (agetty-ttys (items-by-key "agetty.tty=" ""))
+ (console-ttys (filter (lambda (tty)
+ (not (or
+ (string-prefix? tty "tty0")
+ (string-prefix? tty "tty1")
+ (string-prefix? tty "tty2")
+ (string-prefix? tty "tty3")
+ (string-prefix? tty "tty4")
+ (string-prefix? tty "tty5")
+ (string-prefix? tty "tty6")
+ (string-prefix? tty "tty7")
+ (string-prefix? tty "tty8")
+ (string-prefix? tty "tty9"))))
+ (items-by-key "console=tty" "tty")))
+ (ttys (or agetty-ttys (map (lambda (console-spec)
+ ;; Extract device name.
+ (car (string-tokenize console-spec
+ not-comma)))
+ console-ttys))))
+ (if (null? ttys)
+ "XXX" ; crashes entire boot: (error "agetty: 'tty' not specified and no default tty found.
+;Try specifying 'agetty.tty' or 'console' on the kernel command line.")
+ (car ttys)))))
+
(define agetty-shepherd-service
(match-lambda
(($ <agetty-configuration> agetty tty term baud-rate auto-login
@@ -901,7 +942,7 @@ the message of the day, among other things."
(list
(shepherd-service
(documentation "Run agetty on a tty.")
- (provision (list (symbol-append 'term- (string->symbol tty))))
+ (provision (list (symbol-append 'term- (string->symbol (or tty "auto")))))
;; Since the login prompt shows the host name, wait for the 'host-name'
;; service to be done. Also wait for udev essentially so that the tty
@@ -946,6 +987,9 @@ the message of the day, among other things."
('always "--local-line=always")
('never "-local-line=never")))
#~())
+ #$@(if tty
+ #~()
+ #~("--keep-baud"))
#$@(if extract-baud?
#~("--extract-baud")
#~())
@@ -1009,7 +1053,7 @@ the message of the day, among other things."
#$@(if login-pause?
#~("--login-pause")
#~())
- #$tty
+ #$(or tty (default-tty))
#$@(if baud-rate
#~(#$baud-rate)
#~())
@@ -2012,6 +2056,11 @@ This service is not part of @var{%base-services}."
(cons tty %default-console-font))
'("tty1" "tty2" "tty3" "tty4" "tty5" "tty6")))
+ (agetty-service (agetty-configuration
+ (extra-options '("-L")) ; no carrier detect
+ (term "vt100")
+ (tty #f))) ; automatic
+
(mingetty-service (mingetty-configuration
(tty "tty1")))
(mingetty-service (mingetty-configuration
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index e4b2e8237..27bc05c95 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -381,14 +381,6 @@ You have been warned. Thanks for being so brave.\x1b[0m
nvi ;:wq!
%base-packages))))
-(define* (agetty-default-service #:optional (tty "ttyS0"))
- "Return an agetty-service on the given TTY"
- (agetty-service (agetty-configuration
- (extra-options '("-L"))
- (baud-rate "115200")
- (term "vt100")
- (tty tty))))
-
(define* (embedded-installation-os bootloader bootloader-target tty
#:key (extra-modules '()))
"Return an installation os for embedded systems.
@@ -404,9 +396,7 @@ The bootloader BOOTLOADER is installed to BOOTLOADER-TARGET."
(initrd (lambda (fs . rest)
(apply base-initrd fs
#:extra-modules extra-modules
- rest)))
- (services (cons* (agetty-default-service tty)
- (operating-system-user-services installation-os)))))
+ rest)))))
(define beaglebone-black-installation-os
(embedded-installation-os u-boot-beaglebone-black-bootloader
Danny Milosavljevic wrote 7 years ago
[WIP v5] services: agetty: Make tty optional.
(address . 30216@debbugs.gnu.org)(name . Danny Milosavljevic)(address . dannym@scratchpost.org)
20180124133147.15060-1-dannym@scratchpost.org
* gnu/system/install.scm (agetty-default-service): Delete variable.
(beaglebone-black-installation-os): Do not specify tty.
(a20-olinuxino-lime-installation-os): Do not specify tty.
(a20-olinuxino-lime2-emmc-installation-os): Do not specify tty.
(a20-olinuxino-micro-installation-os): Do not specify tty.
(banana-pi-m2-ultra-installation-os): Do not specify tty.
(nintendo-nes-classic-edition-installation-os): Do not specify tty.
(embedded-installation-os): Move agetty-service instantiation to...
* gnu/services/base.scm (%base-services): ...here.
(default-tty): New variable.
(agetty-shepherd-service): Make tty optional, default to the above.
---
gnu/services/base.scm | 54 +++++++++++++++++++++++++++++++++++++++++++++++---
gnu/system/install.scm | 37 +++++++++++-----------------------
2 files changed, 63 insertions(+), 28 deletions(-)

Toggle diff (180 lines)
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 8e30bcd34..e8c0240bf 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -817,7 +817,7 @@ the message of the day, among other things."
agetty-configuration?
(agetty agetty-configuration-agetty ;<package>
(default util-linux))
- (tty agetty-configuration-tty) ;string
+ (tty agetty-configuration-tty) ;string | #f
(term agetty-term ;string | #f
(default #f))
(baud-rate agetty-baud-rate ;string | #f
@@ -890,6 +890,46 @@ the message of the day, among other things."
;;; (default #f))
)
+(define (default-tty)
+ #~(begin
+ ;; console=device,options
+ ;; device: can be tty0, ttyS0, lp0, ttyUSB0 (serial).
+ ;; options: BBBBPNF. P n|o|e, N number of bits,
+ ;; F flow control (r RTS)
+ (use-modules (rnrs io ports))
+ (let* ((command (call-with-input-file "/proc/cmdline" get-string-all))
+ (not-comma (char-set-complement (char-set #\,)))
+ (items (string-tokenize command))
+ (items-by-key (lambda (key target-prefix)
+ (let ((keylen (string-length key)))
+ (map (lambda (a)
+ (string-append target-prefix
+ (string-drop a keylen)))
+ (filter (lambda (b)
+ (string-prefix? key b)) items)))))
+ (agetty-ttys (items-by-key "agetty.tty=" ""))
+ (console-ttys (filter (lambda (tty)
+ (not (or
+ (string-prefix? tty "tty0")
+ (string-prefix? tty "tty1")
+ (string-prefix? tty "tty2")
+ (string-prefix? tty "tty3")
+ (string-prefix? tty "tty4")
+ (string-prefix? tty "tty5")
+ (string-prefix? tty "tty6")
+ (string-prefix? tty "tty7")
+ (string-prefix? tty "tty8")
+ (string-prefix? tty "tty9"))))
+ (items-by-key "console=tty" "tty")))
+ (ttys (or agetty-ttys (map (lambda (console-spec)
+ ;; Extract device name.
+ (car (string-tokenize console-spec
+ not-comma)))
+ console-ttys))))
+ (if (null? ttys)
+ "XXX" ; would crash entire boot process: (error "agetty: No default tty found.")
+ (car ttys)))))
+
(define agetty-shepherd-service
(match-lambda
(($ <agetty-configuration> agetty tty term baud-rate auto-login
@@ -901,7 +941,7 @@ the message of the day, among other things."
(list
(shepherd-service
(documentation "Run agetty on a tty.")
- (provision (list (symbol-append 'term- (string->symbol tty))))
+ (provision (list (symbol-append 'term- (string->symbol (or tty "auto")))))
;; Since the login prompt shows the host name, wait for the 'host-name'
;; service to be done. Also wait for udev essentially so that the tty
@@ -946,6 +986,9 @@ the message of the day, among other things."
('always "--local-line=always")
('never "-local-line=never")))
#~())
+ #$@(if tty
+ #~()
+ #~("--keep-baud"))
#$@(if extract-baud?
#~("--extract-baud")
#~())
@@ -1009,7 +1052,7 @@ the message of the day, among other things."
#$@(if login-pause?
#~("--login-pause")
#~())
- #$tty
+ #$(or tty (default-tty))
#$@(if baud-rate
#~(#$baud-rate)
#~())
@@ -2012,6 +2055,11 @@ This service is not part of @var{%base-services}."
(cons tty %default-console-font))
'("tty1" "tty2" "tty3" "tty4" "tty5" "tty6")))
+ (agetty-service (agetty-configuration
+ (extra-options '("-L")) ; no carrier detect
+ (term "vt100")
+ (tty #f))) ; automatic
+
(mingetty-service (mingetty-configuration
(tty "tty1")))
(mingetty-service (mingetty-configuration
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index e4b2e8237..db06b7a52 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -381,19 +381,10 @@ You have been warned. Thanks for being so brave.\x1b[0m
nvi ;:wq!
%base-packages))))
-(define* (agetty-default-service #:optional (tty "ttyS0"))
- "Return an agetty-service on the given TTY"
- (agetty-service (agetty-configuration
- (extra-options '("-L"))
- (baud-rate "115200")
- (term "vt100")
- (tty tty))))
-
-(define* (embedded-installation-os bootloader bootloader-target tty
+(define* (embedded-installation-os bootloader bootloader-target
#:key (extra-modules '()))
"Return an installation os for embedded systems.
The initrd gets the extra modules EXTRA-MODULES.
-A getty is provided on TTY.
The bootloader BOOTLOADER is installed to BOOTLOADER-TARGET."
(operating-system
(inherit installation-os)
@@ -404,43 +395,39 @@ The bootloader BOOTLOADER is installed to BOOTLOADER-TARGET."
(initrd (lambda (fs . rest)
(apply base-initrd fs
#:extra-modules extra-modules
- rest)))
- (services (cons* (agetty-default-service tty)
- (operating-system-user-services installation-os)))))
+ rest)))))
(define beaglebone-black-installation-os
(embedded-installation-os u-boot-beaglebone-black-bootloader
"/dev/sda"
- "ttyO0"
#:extra-modules
;; This module is required to mount the sd card.
'("omap_hsmmc")))
-
(define a20-olinuxino-lime-installation-os
(embedded-installation-os u-boot-a20-olinuxino-lime-bootloader
- "/dev/mmcblk0" ; SD card storage
- "ttyS0"))
+ ;; SD card storage
+ "/dev/mmcblk0"))
(define a20-olinuxino-lime2-emmc-installation-os
(embedded-installation-os u-boot-a20-olinuxino-lime2-bootloader
- "/dev/mmcblk1" ; eMMC storage
- "ttyS0"))
+ ;; eMMC storage
+ "/dev/mmcblk1"))
(define a20-olinuxino-micro-installation-os
(embedded-installation-os u-boot-a20-olinuxino-micro-bootloader
- "/dev/mmcblk0" ; SD card storage
- "ttyS0"))
+ ;; SD card storage
+ "/dev/mmcblk0"))
(define banana-pi-m2-ultra-installation-os
(embedded-installation-os u-boot-banana-pi-m2-ultra-bootloader
- "/dev/mmcblk1" ; eMMC storage
- "ttyS0"))
+ ;; eMMC storage
+ "/dev/mmcblk1"))
(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"))
+ ;; SD card storage (solder it yourself)
+ "/dev/mmcblk0"))
;; Return the default os here so 'guix system' can consume it directly.
installation-os
Ludovic Courtès wrote 7 years ago
Re: [bug#30216] [WIP] system: Add ARM installer; services: agetty: Make tty optional
(name . Danny Milosavljevic)(address . dannym@scratchpost.org)(address . 30216@debbugs.gnu.org)
87vafqt2at.fsf@gnu.org
Hello!

Danny Milosavljevic <dannym@scratchpost.org> skribis:

Toggle quote (12 lines)
> I hope it's not that board-specific. There are minimal differences but
> many ARM boards use the same Linux kernel (with the same config).
>
> This was one of the motivation to create u-boot: u-boot is like a
> board-specific mini-Linux kernel. The Linux kernel that u-boot then
> loads later is not board-specific.
>
> In the past, board vendors kept putting huge board configuration tables inside
> Linux until Linus put a stop to it.
>
> Nowadays it should not be the case anymore that Linux is board-specific.

Understood.

Toggle quote (4 lines)
> Therefore, I think it would be preferrable in the long run if
> Hydra didn't build 1000 different 1 GB images for different boards
> where the only different part is u-boot.

Definitely!

Toggle quote (4 lines)
> So long story short, about 99% of the image this arm-installer generates
> will work and be identical for almost every ARMv7 board, except for u-boot
> (u-boot is kinda important, though).

Yes, but… this 1% is enough to make a non-bootable image though, which
is what I’m concerned with. :-)

I suppose fixing it would mean having a universal ARM U-Boot? Or do you
have other solutions in mind?

Ludo’.
Danny Milosavljevic wrote 7 years ago
(name . Ludovic Courtès)(address . ludo@gnu.org)(address . 30216@debbugs.gnu.org)
20180125233315.677b3ae5@scratchpost.org
Toggle quote (2 lines)
> I suppose fixing it would mean having a universal ARM U-Boot?

Well, I guess that's for u-boot upstream to get to work.

Toggle quote (2 lines)
> Or do you have other solutions in mind?

User boots the (u-boot-less) image using qemu and sets up u-boot on there - and
only then copies the whole (new) image to the SD card.
Ludovic Courtès wrote 7 years ago
(name . Danny Milosavljevic)(address . dannym@scratchpost.org)(address . 30216@debbugs.gnu.org)
87inbo52lq.fsf@gnu.org
Danny Milosavljevic <dannym@scratchpost.org> skribis:

Toggle quote (9 lines)
>> I suppose fixing it would mean having a universal ARM U-Boot?
>
> Well, I guess that's for u-boot upstream to get to work.
>
>> Or do you have other solutions in mind?
>
> User boots the (u-boot-less) image using qemu and sets up u-boot on there - and
> only then copies the whole (new) image to the SD card.

OK. I guess that’d work, though it doesn’t sound particularly
convenient.

Ludo’.
Ludovic Courtès wrote 7 years ago
Re: [bug#30216] [WIP v5] services: agetty: Make tty optional.
(name . Danny Milosavljevic)(address . dannym@scratchpost.org)(address . 30216@debbugs.gnu.org)
87r2q7vzei.fsf@gnu.org
Hi,

Danny Milosavljevic <dannym@scratchpost.org> skribis:

Toggle quote (12 lines)
> * gnu/system/install.scm (agetty-default-service): Delete variable.
> (beaglebone-black-installation-os): Do not specify tty.
> (a20-olinuxino-lime-installation-os): Do not specify tty.
> (a20-olinuxino-lime2-emmc-installation-os): Do not specify tty.
> (a20-olinuxino-micro-installation-os): Do not specify tty.
> (banana-pi-m2-ultra-installation-os): Do not specify tty.
> (nintendo-nes-classic-edition-installation-os): Do not specify tty.
> (embedded-installation-os): Move agetty-service instantiation to...
> * gnu/services/base.scm (%base-services): ...here.
> (default-tty): New variable.
> (agetty-shepherd-service): Make tty optional, default to the above.

Neat, it looks better than hardcoding a default tty for each of these
machines. :-)

Toggle quote (2 lines)
> +(define (default-tty)

Could you add a docstring, like, IIUC: “Return a gexp that determines a
reasonable default serial port to use as the tty. This is primarily
useful for headless systems such as ARM SoCs.”

In the manual, for the agetty service, it would be good to document the
‘agetty.tty’ kernel command-line option.

Perhaps ‘default-serial-port’ is more appropriate in fact?

Toggle quote (18 lines)
> + #~(begin
> + ;; console=device,options
> + ;; device: can be tty0, ttyS0, lp0, ttyUSB0 (serial).
> + ;; options: BBBBPNF. P n|o|e, N number of bits,
> + ;; F flow control (r RTS)
> + (use-modules (rnrs io ports))
> + (let* ((command (call-with-input-file "/proc/cmdline" get-string-all))
> + (not-comma (char-set-complement (char-set #\,)))
> + (items (string-tokenize command))
> + (items-by-key (lambda (key target-prefix)
> + (let ((keylen (string-length key)))
> + (map (lambda (a)
> + (string-append target-prefix
> + (string-drop a keylen)))
> + (filter (lambda (b)
> + (string-prefix? key b)) items)))))
> + (agetty-ttys (items-by-key "agetty.tty=" ""))

Rather use ‘linux-command-line’ from (gnu build linux-boot).
‘find-long-option’ in the same module does almost what you want, but if
you really want to support repeated “agetty.tty” options, you’ll have to
make a new ‘find-long-options’ (plural) variant.

Toggle quote (14 lines)
> + (console-ttys (filter (lambda (tty)
> + (not (or
> + (string-prefix? tty "tty0")
> + (string-prefix? tty "tty1")
> + (string-prefix? tty "tty2")
> + (string-prefix? tty "tty3")
> + (string-prefix? tty "tty4")
> + (string-prefix? tty "tty5")
> + (string-prefix? tty "tty6")
> + (string-prefix? tty "tty7")
> + (string-prefix? tty "tty8")
> + (string-prefix? tty "tty9"))))
> + (items-by-key "console=tty" "tty")))

I think this would work:

(let* ((consoles (find-long-option "console" (linux-command-line)))
(console-ttys (remove (lambda (console)
(string-prefix? "tty" console))
(string-tokenize consoles not-comma))))
…)

Toggle quote (9 lines)
> + (ttys (or agetty-ttys (map (lambda (console-spec)
> + ;; Extract device name.
> + (car (string-tokenize console-spec
> + not-comma)))
> + console-ttys))))
> + (if (null? ttys)
> + "XXX" ; would crash entire boot process: (error "agetty: No default tty found.")
> + (car ttys)))))

Maybe default to /dev/ttyS0?

Could you send an updated patch?

Thanks,
Ludo’.
Danny Milosavljevic wrote 7 years ago
(name . Ludovic Courtès)(address . ludo@gnu.org)(address . 30216@debbugs.gnu.org)
20180131002430.753330b5@scratchpost.org
Toggle quote (8 lines)
> +(define (default-tty)

>Could you add a docstring, like, IIUC: “Return a gexp that determines a
>reasonable default serial port to use as the tty. This is primarily
>useful for headless systems such as ARM SoCs.”
>In the manual, for the agetty service, it would be good to document the
>‘agetty.tty’ kernel command-line option.

Sure.

Toggle quote (5 lines)
> Rather use ‘linux-command-line’ from (gnu build linux-boot).
> ‘find-long-option’ in the same module does almost what you want, but if
> you really want to support repeated “agetty.tty” options, you’ll have to
> make a new ‘find-long-options’ (plural) variant.

It's more for the repeated "console=" options which Linux supports.

Toggle quote (2 lines)
>Perhaps ‘default-serial-port’ is more appropriate in fact?

Yeah.
Danny Milosavljevic wrote 7 years ago
(name . Ludovic Courtès)(address . ludo@gnu.org)(address . 30216@debbugs.gnu.org)
20180131003018.23bf45d7@scratchpost.org
Hi Ludo,

Toggle quote (7 lines)
> I think this would work:
>
> (let* ((consoles (find-long-option "console" (linux-command-line)))
> (console-ttys (remove (lambda (console)
> (string-prefix? "tty" console))
> (string-tokenize consoles not-comma))))

"ttyS0" starts with "tty" but should not be removed...

Toggle quote (2 lines)
> Maybe default to /dev/ttyS0?

Sounds unsafe. Also, on x86_64 that's not really useful either. It would be
good to have a way to the not start the service after all in that case.
Ludovic Courtès wrote 7 years ago
(name . Danny Milosavljevic)(address . dannym@scratchpost.org)(address . 30216@debbugs.gnu.org)
87r2q6v1ga.fsf@gnu.org
Hey Danny,

Danny Milosavljevic <dannym@scratchpost.org> skribis:

Toggle quote (14 lines)
>> I think this would work:
>>
>> (let* ((consoles (find-long-option "console" (linux-command-line)))
>> (console-ttys (remove (lambda (console)
>> (string-prefix? "tty" console))
>> (string-tokenize consoles not-comma))))
>
> "ttyS0" starts with "tty" but should not be removed...
>
>> Maybe default to /dev/ttyS0?
>
> Sounds unsafe. Also, on x86_64 that's not really useful either. It would be
> good to have a way to the not start the service after all in that case.

What about having ‘default-serial-port’ return #f in that case, and do
something like:

#:start #~(let ((tty #$(default-serial-port)))
(if tty
(make-forkexec-constructor …)
(const #f))) ;never start

?

Ludo’.
Christopher Baines wrote 7 years ago
control message for bug #30216
(address . control@debbugs.gnu.org)
874llc7avr.fsf@cbaines.net
tags 30216 patch
Danny Milosavljevic wrote 6 years ago
(no subject)
(address . control@debbugs.gnu.org)
20190210221205.1a8d27ff@scratchpost.org
close 30216
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAlxgk6UACgkQ5xo1VCww
uqVt3gf9E2tf3AIrUK20z5NrM4uIKNOfu6HLpSPmCnOApD/Ojc5bV+8qZbLDkUxv
qpODpNO98ubR5OMVMtOkg204tlm5MnmrioNXXZpmnBgMGHJDzZI5l28BtZh0xXN5
GpDhX72Sn9kuOdqLrNegPFuhznE05VGnR4HwB6nC5IS5sgAXkeUVc3X/KM2H8k+y
gGe3rePVeJGJzleJor9HJp8ieP7qZcXDrePGqE7tH5HyCFbwJ75BD88/uDv6Af6q
MHKWqeCyS6bPwoPhqfTa/tTRxRhlwbIXlO4WyQVtZBRO8ukVAfrg990IG5EPh7Cb
AXIxtTu9v438bsXxYp2RV2klSaYybA==
=ExyV
-----END PGP SIGNATURE-----


?
Your comment

This issue is archived.

To comment on this conversation send an email to 30216@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 30216
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch
You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags
mumi command -t +confirmed -t +easy
Or, remove the moreinfo tag and set the help tag
mumi command -t -moreinfo -t +help