[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/13: gnu: ipxe: Enable syslinux only on i686-linux and x86_64-linux.
From: |
guix-commits |
Subject: |
13/13: gnu: ipxe: Enable syslinux only on i686-linux and x86_64-linux. |
Date: |
Sat, 7 Jan 2023 15:14:32 -0500 (EST) |
mbakke pushed a commit to branch master
in repository guix.
commit d15972194aaef17fd1f7fd713d235c70794c9d4f
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sat Jan 7 20:55:58 2023 +0100
gnu: ipxe: Enable syslinux only on i686-linux and x86_64-linux.
* gnu/packages/bootloaders.scm (ipxe)[native-inputs]: Conditionally add
SYSLINUX.
[arguments]: Adjust accordingly.
---
gnu/packages/bootloaders.scm | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 3dc5815898..caa8f0bb8d 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -1555,10 +1555,12 @@ order to add a suitable bootloader menu entry.")
;; cdrtools' mkisofs will silently ignore a missing
isolinux.bin!
;; Luckily xorriso is more strict.
- (string-append "ISOLINUX_BIN=" syslinux
- "/share/syslinux/isolinux.bin")
- (string-append "SYSLINUX_MBR_DISK_PATH=" syslinux
- "/share/syslinux/isohdpfx.bin")
+ #$@(if (or (target-x86-64?) (target-x86?))
+ '((string-append "ISOLINUX_BIN=" syslinux
+ "/share/syslinux/isolinux.bin")
+ (string-append "SYSLINUX_MBR_DISK_PATH=" syslinux
+ "/share/syslinux/isohdpfx.bin"))
+ '())
;; Build reproducibly.
(string-append "BUILD_ID_CMD=echo -n " (build-id #$output))
@@ -1611,7 +1613,11 @@ order to add a suitable bootloader menu entry.")
(lambda _ (chdir ".."))))
#:tests? #f)) ; no test suite
(native-inputs
- (list perl syslinux xorriso))
+ (append (if (or (target-x86-64?) (target-x86?))
+ ;; Syslinux only supports i686 and x86_64.
+ (list syslinux)
+ '())
+ (list perl xorriso)))
(home-page "https://ipxe.org")
(synopsis "PXE-compliant network boot firmware")
(description "iPXE is a network boot firmware. It provides a full PXE
- 04/13: gnu: python-openid-teams: Add missing inputs., (continued)
- 04/13: gnu: python-openid-teams: Add missing inputs., guix-commits, 2023/01/07
- 02/13: gnu: Use old setuptools in packages that relies on use_2to3 conversion., guix-commits, 2023/01/07
- 01/13: gnu: python-setuptools: Add 57.5.0., guix-commits, 2023/01/07
- 05/13: gnu: Remove python-trollius-redis., guix-commits, 2023/01/07
- 03/13: gnu: python-openid-cla: Add missing inputs., guix-commits, 2023/01/07
- 07/13: gnu: Remove python-pyev., guix-commits, 2023/01/07
- 12/13: gnu: ipxe: Use G-expression., guix-commits, 2023/01/07
- 06/13: gnu: python-capstone: Fix tests., guix-commits, 2023/01/07
- 08/13: gnu: python-pytidylib: Fix failing test., guix-commits, 2023/01/07
- 11/13: gnu: python-funcy: Use pyproject-build-system., guix-commits, 2023/01/07
- 13/13: gnu: ipxe: Enable syslinux only on i686-linux and x86_64-linux.,
guix-commits <=
- 09/13: gnu: python-gyp: Update to 0.0.0-1.9d09418., guix-commits, 2023/01/07
- 10/13: gnu: python-whatever: Use pyproject-build-system., guix-commits, 2023/01/07