[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#36477] [PATCH v2 61/61] scripts: system: Add --target option.
From: |
Mathieu Othacehe |
Subject: |
[bug#36477] [PATCH v2 61/61] scripts: system: Add --target option. |
Date: |
Wed, 21 Aug 2019 10:54:55 +0200 |
* guix/scripts/system.scm (%options): Add target option,
(%default-options): ditto,
(process-action): Rename existing target variable to target-file and pass new
target variable to run-with-store procedure.
---
guix/scripts/system.scm | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 9fc3a10e98..f8040dd975 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès
<address@hidden>
;;; Copyright © 2016 Alex Kost <address@hidden>
;;; Copyright © 2016, 2017, 2018 Chris Marusich <address@hidden>
-;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
+;;; Copyright © 2017, 2019 Mathieu Othacehe <address@hidden>
;;; Copyright © 2018 Ricardo Wurmus <address@hidden>
;;; Copyright © 2019 Christopher Baines <address@hidden>
;;;
@@ -929,6 +929,8 @@ Some ACTIONS support additional ARGS.\n"))
--full-boot for 'vm', make a full boot sequence"))
(display (G_ "
--skip-checks skip file system and initrd module safety checks"))
+ (display (G_ "
+ --target=TRIPLET cross-build for TRIPLET--e.g., \"armel-linux-gnu\""))
(display (G_ "
-v, --verbosity=LEVEL use the given verbosity LEVEL"))
(newline)
@@ -1002,6 +1004,10 @@ Some ACTIONS support additional ARGS.\n"))
(lambda (opt name arg result)
(alist-cons 'system arg
(alist-delete 'system result eq?))))
+ (option '("target") #t #f
+ (lambda (opt name arg result)
+ (alist-cons 'target arg
+ (alist-delete 'target result eq?))))
(option '(#\r "root") #t #f
(lambda (opt name arg result)
(alist-cons 'gc-root arg result)))
@@ -1010,6 +1016,7 @@ Some ACTIONS support additional ARGS.\n"))
(define %default-options
;; Alist of default option values.
`((system . ,(%current-system))
+ (target . #f)
(substitutes? . #t)
(build-hook? . #t)
(print-build-trace? . #t)
@@ -1043,6 +1050,7 @@ resulting from command-line parsing."
((x . _) x)))
(expr (assoc-ref opts 'expression))
(system (assoc-ref opts 'system))
+ (target (assoc-ref opts 'target))
(os (ensure-operating-system
(or file expr)
(cond
@@ -1059,7 +1067,7 @@ resulting from command-line parsing."
(dry? (assoc-ref opts 'dry-run?))
(bootloader? (assoc-ref opts 'install-bootloader?))
- (target (match args
+ (target-file (match args
((first second) second)
(_ #f)))
(bootloader-target
@@ -1101,9 +1109,10 @@ resulting from command-line parsing."
(_ #f))
opts)
#:install-bootloader? bootloader?
- #:target target
+ #:target target-file
#:bootloader-target bootloader-target
#:gc-root (assoc-ref opts 'gc-root)))))
+ #:target target
#:system system))
(warn-about-disk-space)))
--
2.17.1
- [bug#36477] [PATCH v2 54/61] linux-initrd: Use native gzip., (continued)
- [bug#36477] [PATCH v2 54/61] linux-initrd: Use native gzip., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 46/61] gnu: libnl: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 45/61] gnu: texinfo-4: Fix cross compilation, Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 51/61] gnu: console-setup: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 47/61] gnu: crda: Fix cross-compilation, Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 53/61] gnu: grub: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 55/61] gnu: linux-libre: Enable built-in ext4 support., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 58/61] utils: Use target-arm64? and target-arm? helpers., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 56/61] gexp: Use cross extensions when cross-compiling., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 60/61] system: vm: Support cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 61/61] scripts: system: Add --target option.,
Mathieu Othacehe <=
- [bug#36477] [PATCH v2 59/61] system: vm: Add arm64 support., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 57/61] gexp: Pass target to compiled-modules in lower-gexp., Mathieu Othacehe, 2019/08/21