From: Reza Alizadeh Majd <r.majd@pantherx.org>
To: 57070@debbugs.gnu.org
Cc: Reza Alizadeh Majd <r.majd@pantherx.org>
Subject: [bug#57070] [PATCH] bootloader: extlinux: support for optional FDTDIR
Date: Tue, 9 Aug 2022 15:00:44 +0430 [thread overview]
Message-ID: <20220809103044.27964-1-r.majd@pantherx.org> (raw)
In-Reply-To: <20220809145730.435ef8d0@pantherx.org>
* 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)))
\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
next prev parent reply other threads:[~2022-08-09 10:32 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-09 10:27 [bug#57070] [PATCH] bootloader: extlinux: support for optional FDTDIR Reza Alizadeh Majd
2022-08-09 10:30 ` Reza Alizadeh Majd [this message]
2022-08-15 9:27 ` Mathieu Othacehe
2022-08-16 18:10 ` Reza Alizadeh Majd
2022-08-25 17:35 ` Mathieu Othacehe
2022-08-28 8:19 ` Reza Alizadeh Majd
2022-08-28 15:49 ` Mathieu Othacehe
2022-08-29 18:17 ` Reza Alizadeh Majd
2022-08-30 6:53 ` bug#57070: " Mathieu Othacehe
2022-08-10 9:31 ` [bug#57070] " Maxime Devos
2022-08-15 10:57 ` Tobias Geerinckx-Rice via Guix-patches via
2022-08-10 9:32 ` Maxime Devos
2022-08-16 17:08 ` Reza Alizadeh Majd
2022-08-16 18:44 ` Maxime Devos
2022-08-10 14:37 ` Pavel Shlyak
2022-08-11 10:00 ` Maxime Devos
2022-08-11 11:13 ` Pavel Shlyak
2022-08-10 14:46 ` Pavel Shlyak
2022-08-20 10:15 ` Pavel Shlyak
2022-08-22 8:54 ` Maxime Devos
2022-08-22 10:52 ` Pavel Shlyak
2022-08-22 18:57 ` Maxime Devos
2022-08-22 19:19 ` Pavel Shlyak
2022-08-22 21:17 ` Maxime Devos
2022-08-22 21:29 ` Pavel Shlyak
2022-08-23 18:11 ` Vagrant Cascadian
2022-08-25 19:16 ` Pavel Shlyak
2022-08-30 6:52 ` 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=20220809103044.27964-1-r.majd@pantherx.org \
--to=r.majd@pantherx.org \
--cc=57070@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.