[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#57070] [PATCH] bootloader: extlinux: support for optional FDTDIR
From: |
Reza Alizadeh Majd |
Subject: |
[bug#57070] [PATCH] bootloader: extlinux: support for optional FDTDIR |
Date: |
Tue, 9 Aug 2022 15:00:44 +0430 |
* gnu/bootloader.scm (<bootloader>)[ignore-fdtdir?]: new field.
* gnu/bootloader/extlinux.scm (extlinux-configuration-file): add FDTDIR line
based on bootloader <ignore-fdtdir?> field of <bootloader>.
---
gnu/bootloader.scm | 5 ++++-
gnu/bootloader/extlinux.scm | 12 ++++++++++--
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/gnu/bootloader.scm b/gnu/bootloader.scm
index 9cf5457873..acf51bff7a 100644
--- a/gnu/bootloader.scm
+++ b/gnu/bootloader.scm
@@ -54,6 +54,7 @@ (define-module (gnu bootloader)
bootloader-disk-image-installer
bootloader-configuration-file
bootloader-configuration-file-generator
+ bootloader-ignore-fdtdir?
bootloader-configuration
bootloader-configuration?
@@ -173,7 +174,9 @@ (define-record-type* <bootloader>
(disk-image-installer bootloader-disk-image-installer
(default #f))
(configuration-file bootloader-configuration-file)
- (configuration-file-generator bootloader-configuration-file-generator))
+ (configuration-file-generator bootloader-configuration-file-generator)
+ (ignore-fdtdir? bootloader-ignore-fdtdir?
+ (default #f)))
;;;
diff --git a/gnu/bootloader/extlinux.scm b/gnu/bootloader/extlinux.scm
index 6b5ff298e7..084ed1e7c9 100644
--- a/gnu/bootloader/extlinux.scm
+++ b/gnu/bootloader/extlinux.scm
@@ -38,6 +38,10 @@ (define* (extlinux-configuration-file config entries
(define all-entries
(append entries (bootloader-configuration-menu-entries config)))
+ (define ignore-fdtdir?
+ (let ((bootloader (bootloader-configuration-bootloader config)))
+ (bootloader-ignore-fdtdir? bootloader)))
+
(define (menu-entry->gexp entry)
(let ((label (menu-entry-label entry))
(kernel (menu-entry-linux entry))
@@ -46,12 +50,16 @@ (define (menu-entry->gexp entry)
#~(format port "LABEL ~a
MENU LABEL ~a
KERNEL ~a
- FDTDIR ~a/lib/dtbs
+ ~a
INITRD ~a
APPEND ~a
~%"
#$label #$label
- #$kernel (dirname #$kernel) #$initrd
+ #$kernel
+ (if (not #$ignore-fdtdir?)
+ (string-append "FDTDIR " (dirname #$kernel) "/lib/dtbs")
+ "")
+ #$initrd
(string-join (list #$@kernel-arguments)))))
(define builder
--
2.37.1
- [bug#57070] [PATCH] bootloader: extlinux: support for optional FDTDIR, Reza Alizadeh Majd, 2022/08/09
- [bug#57070] [PATCH] bootloader: extlinux: support for optional FDTDIR,
Reza Alizadeh Majd <=
- [bug#57070] [PATCH] bootloader: extlinux: support for optional FDTDIR, Mathieu Othacehe, 2022/08/15
- [bug#57070] [PATCH] bootloader: extlinux: support for optional FDTDIR, Reza Alizadeh Majd, 2022/08/16
- [bug#57070] [PATCH] bootloader: extlinux: support for optional FDTDIR, Mathieu Othacehe, 2022/08/25
- [bug#57070] [PATCH] bootloader: extlinux: support for optional FDTDIR, Reza Alizadeh Majd, 2022/08/28
- [bug#57070] [PATCH] bootloader: extlinux: support for optional FDTDIR, Mathieu Othacehe, 2022/08/28
- [bug#57070] [PATCH] bootloader: extlinux: support for optional FDTDIR, Reza Alizadeh Majd, 2022/08/29
- bug#57070: [PATCH] bootloader: extlinux: support for optional FDTDIR, Mathieu Othacehe, 2022/08/30
[bug#57070] [PATCH] bootloader: extlinux: support for optional FDTDIR, Maxime Devos, 2022/08/10
[bug#57070] [PATCH] bootloader: extlinux: support for optional FDTDIR, Maxime Devos, 2022/08/10