diff options
Diffstat (limited to 'gnu/packages/bootloaders.scm')
| -rw-r--r-- | gnu/packages/bootloaders.scm | 39 |
1 files changed, 27 insertions, 12 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index fcc1088fd6..0e27113155 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -76,6 +76,7 @@ #:use-module (gnu packages version-control) #:use-module (gnu packages virtualization) #:use-module (gnu packages xorg) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (guix build-system gnu) @@ -192,6 +193,14 @@ (setenv "BUILD_FREETYPE_CFLAGS" (string-append "-I" freetype "/include/freetype2")))))) + #$@(if (target-hurd64?) + #~((add-after 'unpack 'apply-hurd64-patch + (lambda _ + (let ((patch + #$(local-file + (search-patch "grub-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch))))) + #~()) (add-before 'check 'disable-flaky-test (lambda _ ;; This test is unreliable. For more information, see: @@ -758,7 +767,8 @@ tree binary files. These are board description files used by Linux and BSD.") (patches (list %u-boot-rockchip-inno-usb-patch %u-boot-build-without-libcrypto-patch - %u-boot-allow-disabling-openssl-patch)) + %u-boot-allow-disabling-openssl-patch + (search-patch "u-boot-calloc-visibility.patch"))) (method url-fetch) (uri (string-append "https://ftp.denx.de/pub/u-boot/" @@ -778,6 +788,8 @@ tree binary files. These are board description files used by Linux and BSD.") pkg-config ;for 'make menuconfig' python python-pyelftools + python-setuptools + python-wheel swig (list util-linux "lib"))) (home-page "https://www.denx.de/wiki/U-Boot/") @@ -926,19 +938,22 @@ CONFIG_TOOLS_LIBCRYPTO=n") "tools/sunxi-spl-image-builder"))))) (delete 'check) (add-after 'install 'check - (lambda* (#:key make-flags test-target #:allow-other-keys) - (invoke "test/image/test-imagetools.sh"))) + (lambda* (#:key make-flags test-target tests? #:allow-other-keys) + (when tests? + (invoke "test/image/test-imagetools.sh")))) ;; Only run full test suite on x86_64 systems, as many tests ;; assume x86_64. ,@(if (string-match "^x86_64-linux" (or (%current-target-system) (%current-system))) '((add-after 'check 'check-x86 - (lambda* (#:key make-flags test-target #:allow-other-keys) - (apply invoke "make" "mrproper" make-flags) - (setenv "SDL_VIDEODRIVER" "dummy") - (setenv "PAGER" "cat") - (apply invoke "make" test-target make-flags)))) + (lambda* (#:key make-flags test-target tests? #:allow-other-keys) + (when tests? + (begin + (apply invoke "make" "mrproper" make-flags) + (setenv "SDL_VIDEODRIVER" "dummy") + (setenv "PAGER" "cat") + (apply invoke "make" test-target make-flags)))))) '())))) (description (string-append (package-description u-boot) @@ -1934,9 +1949,9 @@ 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 "1706118389") - (commit "de8a0821c7bc737e724fa3dfb6d89dc36f591d7a") - (revision "2")) + (let ((timestamp "1733491642") + (commit "24db39fb2983ca83ab5c6ee37cb57a4f7f6f94e6") + (revision "3")) (package (name "ipxe") (version (git-version "1.21.1" revision commit)) @@ -1948,7 +1963,7 @@ order to add a suitable bootloader menu entry.") (file-name (git-file-name name version)) (sha256 (base32 - "0xiffdmf8hpmsw7nm9wp10wd0rs4avm2m3q5ncx0r5zfykannlbd")))) + "0b2h4bsdgnyjna6piwfqqn985vqfjmbz80jh0n7hrnncp2v53qj6")))) (build-system gnu-build-system) (arguments (list |