amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ipxe: Update to 1.21.1-1.9e1f7a3.

Browse source 
* gnu/packages/bootloaders.scm (ipxe): Update to 1.21.1-1.9e1f7a3.
[source]: Remove patch.
[arguments]: Add phase to skip 1 i386 firmware file. Move setting
syslinux path from make-flags to phases.
* gnu/packages/patches/ipxe-reproducible-geniso.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
This commit is contained in:
Efraim Flashner 2023-03-09 14:13:29 +02:00
parent e22a6ed8f8
commit 4f4e4abd3a
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
3 changed files with 28 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

46
gnu/packages/bootloaders.scm
View file

@ -1710,20 +1710,21 @@ order to add a suitable bootloader menu entry.")
;;
;; TODO: Bump this timestamp at each modifications of the package (not only
;; for updates) by running: date +%s.
(let ((timestamp "1671715380"))
(let ((timestamp "1678285400")
(commit "9e1f7a3659071004f4b8c76f2593da6287f0d575")
(revision "1"))
(package
(name "ipxe")
(version "1.21.1")
(version (git-version "1.21.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ipxe/ipxe")
(commit (string-append "v" version))))
(commit commit)))
(file-name (git-file-name name version))
(patches (search-patches "ipxe-reproducible-geniso.patch"))
(sha256
(base32
"1pkf1n1c0rdlzfls8fvjvi1sd9xjd9ijqlyz3wigr70ijcv6x8i9"))))
"1fp4bgwzy923m11dkkhk9dik7al7shzmmpqhp339z786z8bjzmkb"))))
(build-system gnu-build-system)
(arguments
(list
@ -1757,15 +1758,6 @@ order to add a suitable bootloader menu entry.")
(list "ECHO_E_BIN_ECHO=echo"
"ECHO_E_BIN_ECHO_E=echo -e"
;; cdrtools' mkisofs will silently ignore a missing isolinux.bin!
;; Luckily xorriso is more strict.
#$@(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))
(string-append "BUILD_TIMESTAMP=" #$timestamp)
@ -1792,6 +1784,24 @@ order to add a suitable bootloader menu entry.")
(string-append "#define " option))
(("^#undef.*(DOWNLOAD_PROTO_NFS.*)" _ option)
(string-append "#define " option)))))
;; It is not entirely clear why these fail to compile.
(add-after 'enter-source-directory 'skip-i386-tap-linux
(lambda _
(substitute* "Makefile"
(("bin-i386-linux/tap.linux") "")
(("bin-i386-linux/tests.linux") ""))))
#$@(if (target-x86?)
#~((add-after 'enter-source-directory 'set-syslinux-path
;; cdrtools' mkisofs will silently ignore a missing isolinux.bin!
;; Luckily xorriso is more strict.
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "util/genfsimg"
(("\t/usr/lib/syslinux " all)
(string-append
"\t" #$(this-package-native-input "syslinux")
"/share/syslinux \\\n"
all))))))
#~())
(delete 'configure) ; no configure script
(replace 'install
(lambda _
@ -1817,10 +1827,10 @@ order to add a suitable bootloader menu entry.")
(lambda _ (chdir ".."))))
#:tests? #f)) ; no test suite
(native-inputs
(append (if (or (target-x86-64?) (target-x86?))
;; Syslinux only supports i686 and x86_64.
(list syslinux)
'())
(append (if (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")