From: m.othacehe@gmail.com
To: 29409@debbugs.gnu.org
Subject: [bug#29409] [PATCH v2 2/4] bootloader: Factorize write-file-on-device.
Date: Wed, 13 Dec 2017 12:02:15 +0100 [thread overview]
Message-ID: <1513162937-13145-2-git-send-email-m.othacehe@gmail.com> (raw)
In-Reply-To: <1513162937-13145-1-git-send-email-m.othacehe@gmail.com>
From: Mathieu Othacehe <m.othacehe@gmail.com>
* gnu/bootloader/extlinux.scm (install-extlinux): Factorize bootloader
writing in a new procedure ...
* gnu/bootloader.scm (write-file-on-device): ... defined and exported here.
---
gnu/bootloader/extlinux.scm | 10 +++-------
gnu/build/bootloader.scm | 37 +++++++++++++++++++++++++++++++++++++
gnu/local.mk | 1 +
gnu/system/vm.scm | 6 ++++--
guix/scripts/system.scm | 6 ++++--
5 files changed, 49 insertions(+), 11 deletions(-)
create mode 100644 gnu/build/bootloader.scm
diff --git a/gnu/bootloader/extlinux.scm b/gnu/bootloader/extlinux.scm
index 9b6e2c7..f7820a3 100644
--- a/gnu/bootloader/extlinux.scm
+++ b/gnu/bootloader/extlinux.scm
@@ -20,6 +20,7 @@
(define-module (gnu bootloader extlinux)
#:use-module (gnu bootloader)
#:use-module (gnu system)
+ #:use-module (gnu build bootloader)
#:use-module (gnu packages bootloaders)
#:use-module (guix gexp)
#:use-module (guix monads)
@@ -95,13 +96,8 @@ TIMEOUT ~a~%"
(find-files syslinux-dir "\\.c32$"))
(unless
(and (zero? (system* extlinux "--install" install-dir))
- (call-with-input-file (string-append syslinux-dir "/" #$mbr)
- (lambda (input)
- (let ((bv (get-bytevector-n input 440)))
- (call-with-output-file device
- (lambda (output)
- (put-bytevector output bv))
- #:binary #t)))))
+ (write-file-on-device
+ (string-append syslinux-dir "/" #$mbr) 440 device 0))
(error "failed to install SYSLINUX")))))
(define install-extlinux-mbr
diff --git a/gnu/build/bootloader.scm b/gnu/build/bootloader.scm
new file mode 100644
index 0000000..d00674d
--- /dev/null
+++ b/gnu/build/bootloader.scm
@@ -0,0 +1,37 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu build bootloader)
+ #:use-module (ice-9 binary-ports)
+ #:export (write-file-on-device))
+
+\f
+;;;
+;;; Writing utils.
+;;;
+
+(define (write-file-on-device file size device offset)
+ "Write SIZE bytes from FILE to DEVICE starting at OFFSET."
+ (call-with-input-file file
+ (lambda (input)
+ (let ((bv (get-bytevector-n input size)))
+ (call-with-output-file device
+ (lambda (output)
+ (seek output offset SEEK_SET)
+ (put-bytevector output bv))
+ #:binary #t)))))
diff --git a/gnu/local.mk b/gnu/local.mk
index 4682975..7a55efc 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -489,6 +489,7 @@ GNU_SYSTEM_MODULES = \
%D%/system/vm.scm \
\
%D%/build/activation.scm \
+ %D%/build/bootloader.scm \
%D%/build/cross-toolchain.scm \
%D%/build/file-systems.scm \
%D%/build/install.scm \
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index b376337..6102d46 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -277,10 +277,12 @@ register INPUTS in the store database of the image so that Guix can be used in
the image."
(expression->derivation-in-linux-vm
name
- (with-imported-modules (source-module-closure '((gnu build vm)
+ (with-imported-modules (source-module-closure '((gnu build bootloader)
+ (gnu build vm)
(guix build utils)))
#~(begin
- (use-modules (gnu build vm)
+ (use-modules (gnu build bootloader)
+ (gnu build vm)
(guix build utils)
(srfi srfi-26)
(ice-9 binary-ports))
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index d0eacc5..cbf7e6c 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -674,9 +674,11 @@ any, are available. Raise an error if they're not."
and TARGET arguments."
(with-monad %store-monad
(gexp->file "bootloader-installer"
- (with-imported-modules '((guix build utils))
+ (with-imported-modules '((gnu build bootloader)
+ (guix build utils))
#~(begin
- (use-modules (guix build utils)
+ (use-modules (gnu build bootloader)
+ (guix build utils)
(ice-9 binary-ports))
(#$installer #$bootloader #$device #$target))))))
--
2.7.4
next prev parent reply other threads:[~2017-12-13 11:03 UTC|newest]
Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-23 9:45 [bug#29409] GuixSD ARM port Mathieu Othacehe
2017-11-23 9:49 ` [bug#29409] [PATCH] linux-libre: Adapt some arm options to match intel conf Mathieu Othacehe
2017-11-23 15:43 ` Ludovic Courtès
2017-11-23 19:09 ` bug#29409: " Mathieu Othacehe
2017-11-25 8:35 ` [bug#29409] " Danny Milosavljevic
2017-11-25 17:22 ` Mathieu Othacehe
2017-11-26 8:16 ` Danny Milosavljevic
2017-11-24 16:49 ` [bug#29409] [PATCH] vm: Use os-defined initrd intead of base-initrd Mathieu Othacehe
2017-11-24 21:36 ` Ludovic Courtès
2017-11-26 12:49 ` Mathieu Othacehe
2017-11-28 9:22 ` [bug#29409] [PATCH] gnu: dtc: Fix build on 32 bits platforms m.othacehe
2017-11-28 9:28 ` [bug#29409] [PATCH] gnu: grub: Disable tests on ARM platforms m.othacehe
2017-11-28 21:00 ` Leo Famulari
2017-11-29 14:03 ` Mathieu Othacehe
2017-11-29 14:20 ` [bug#29409] [PATCH] utils: Add target-arm? procedure m.othacehe
2017-11-29 14:20 ` [bug#29409] [PATCH] system: vm: Do not add EFI partition on ARM system m.othacehe
2017-12-01 20:14 ` Danny Milosavljevic
2017-12-02 12:46 ` Mathieu Othacehe
2017-12-08 9:24 ` Ludovic Courtès
2017-11-30 17:09 ` [bug#29409] [PATCH] utils: Add target-arm? procedure Ludovic Courtès
2017-12-01 9:21 ` Mathieu Othacehe
2017-11-29 17:34 ` [bug#29409] [PATCH] tests: install: Increase extlinux install partition size m.othacehe
2017-11-30 17:12 ` Ludovic Courtès
2017-12-01 13:02 ` Mathieu Othacehe
2017-12-01 14:57 ` Mathieu Othacehe
2017-12-01 16:07 ` Ludovic Courtès
2017-12-02 12:02 ` Mathieu Othacehe
2017-12-02 13:16 ` Mathieu Othacehe
2017-12-02 23:34 ` Ludovic Courtès
2017-12-03 19:31 ` Ludovic Courtès
2017-12-03 21:19 ` Mathieu Othacehe
2017-12-04 8:37 ` Ludovic Courtès
2017-12-04 14:29 ` Mathieu Othacehe
2017-12-04 14:30 ` Mathieu Othacehe
2017-11-30 10:47 ` [bug#29409] [PATCH] build: utils: Introduce dd m.othacehe
2017-12-01 12:47 ` Ludovic Courtès
2017-12-01 13:03 ` Mathieu Othacehe
2017-12-04 14:31 ` Mathieu Othacehe
2017-12-04 14:43 ` Ludovic Courtès
2017-12-04 15:53 ` Mathieu Othacehe
2017-12-04 17:17 ` Ludovic Courtès
2017-12-04 17:27 ` Mathieu Othacehe
2017-12-01 10:38 ` [bug#29409] [PATCH] utils: Add target-arm32? procedure m.othacehe
2017-12-01 10:38 ` [bug#29409] [PATCH] system: vm: Do not add EFI partition on ARM system m.othacehe
2017-12-01 11:01 ` Ludovic Courtès
2017-12-01 12:58 ` Mathieu Othacehe
2017-12-01 10:58 ` [bug#29409] [PATCH] utils: Add target-arm32? procedure Ludovic Courtès
2017-12-04 16:52 ` [bug#29409] [PATCH] build: vm: Use netdev qemu parameter m.othacehe
2017-12-04 18:19 ` Leo Famulari
2017-12-05 8:58 ` Mathieu Othacehe
2017-12-04 17:35 ` [bug#29409] [PATCH] build: vm: Use qemu drive device parameter m.othacehe
2017-12-08 9:38 ` Ludovic Courtès
2017-12-08 10:22 ` Mathieu Othacehe
2017-12-06 12:59 ` [bug#29409] [PATCH 0/4] ARM port m.othacehe
2017-12-06 12:59 ` [bug#29409] [PATCH 1/4] build: vm: Use netdev qemu parameter m.othacehe
2017-12-11 16:32 ` Ludovic Courtès
2017-12-11 17:36 ` Mathieu Othacehe
2017-12-12 9:00 ` Ludovic Courtès
2017-12-06 12:59 ` [bug#29409] [PATCH 2/4] build: vm: Use qemu drive device parameter m.othacehe
2017-12-11 16:33 ` Ludovic Courtès
2017-12-11 16:34 ` Ludovic Courtès
2017-12-06 12:59 ` [bug#29409] [PATCH 3/4] build: vm: Adapt qemu command to ARM m.othacehe
2017-12-11 16:38 ` Ludovic Courtès
2017-12-11 17:41 ` Mathieu Othacehe
2017-12-12 9:03 ` Ludovic Courtès
2017-12-06 12:59 ` [bug#29409] [PATCH 4/4] bootloader: Factorize write-file-on-device m.othacehe
2017-12-11 16:40 ` Ludovic Courtès
2017-12-11 17:41 ` Mathieu Othacehe
2017-12-07 8:52 ` [bug#29409] [PATCH] system: Add BeagleBone Black installer m.othacehe
2017-12-11 16:47 ` Ludovic Courtès
2017-12-11 17:32 ` ng0
2017-12-11 17:57 ` Mathieu Othacehe
2017-12-13 11:02 ` [bug#29409] [PATCH v2 1/4] vm: Adapt qemu command to ARM m.othacehe
2017-12-13 11:02 ` m.othacehe [this message]
2017-12-15 10:34 ` [bug#29409] [PATCH v2 2/4] bootloader: Factorize write-file-on-device Ludovic Courtès
2017-12-15 10:53 ` Mathieu Othacehe
2017-12-13 11:02 ` [bug#29409] [PATCH v2 3/4] scripts: system: Add --expression option m.othacehe
2017-12-15 10:39 ` Ludovic Courtès
2017-12-15 11:18 ` Mathieu Othacehe
2017-12-15 14:03 ` Ludovic Courtès
2017-12-15 15:38 ` Mathieu Othacehe
2017-12-13 11:02 ` [bug#29409] [PATCH v2 4/4] system: Add BeagleBone Black installer m.othacehe
2017-12-15 10:40 ` Ludovic Courtès
2017-12-15 10:33 ` [bug#29409] [PATCH v2 1/4] vm: Adapt qemu command to ARM Ludovic Courtès
2017-12-15 10:45 ` Mathieu Othacehe
2017-12-18 13:56 ` [bug#29409] [PATCH] system: examples: Add a template for BeagleBone Black m.othacehe
2017-12-18 14:22 ` Ludovic Courtès
2017-12-18 14:29 ` Mathieu Othacehe
2017-12-20 19:15 ` [bug#29409] Remove hugetlb control group on ARM32 Mathieu Othacehe
2017-12-21 1:16 ` Tobias Geerinckx-Rice
2017-12-21 10:07 ` Ludovic Courtès
2017-12-21 8:57 ` Danny Milosavljevic
2017-12-21 15:52 ` Ludovic Courtès
2017-12-22 7:54 ` Mathieu Othacehe
2017-12-22 10:50 ` Ludovic Courtès
2017-12-22 14:28 ` Mathieu Othacehe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1513162937-13145-2-git-send-email-m.othacehe@gmail.com \
--to=m.othacehe@gmail.com \
--cc=29409@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.