From 56f0feb6781e3680541d7adc21d6b3b4746a33ca Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 28 Nov 2017 10:25:00 +0100 Subject: gnu: grub: Disable tests on ARM platforms. * gnu/packages/bootloaders (grub): Disable tests on ARM platforms. Half of the tests are failing on ARM. --- gnu/packages/bootloaders.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu/packages/bootloaders.scm') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 20f38b2d0d..dea9366f58 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -75,7 +75,7 @@ "03vvdfhdmf16121v7xs8is2krwnv15wpkhkf16a4yf8nsfc3f2w1")))) (build-system gnu-build-system) (arguments - '(#:phases (modify-phases %standard-phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'patch-stuff (lambda* (#:key inputs #:allow-other-keys) (substitute* "grub-core/Makefile.in" @@ -102,7 +102,10 @@ (substitute* "Makefile.in" (("grub_cmd_date grub_cmd_set_date grub_cmd_sleep") "grub_cmd_date grub_cmd_sleep")) - #t))))) + #t))) + ;; Disable tests on ARM platforms. + #:tests? ,(not (string-prefix? "arm" (or (%current-target-system) + (%current-system)))))) (inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 63087721bb54a14dc04ec424474386ae98f7771b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 29 Nov 2017 20:34:15 +0200 Subject: gnu: grub :Disable tests on aarch64. * gnu/packages/bootloaders.scm (grub)[arguments]: Add aarch64 to the architectures where the test suite is not run. --- gnu/packages/bootloaders.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gnu/packages/bootloaders.scm') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index dea9366f58..273aeb3823 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -50,7 +50,9 @@ #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) - #:use-module (guix utils)) + #:use-module (guix utils) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26)) (define unifont ;; GNU Unifont, . @@ -103,9 +105,10 @@ (("grub_cmd_date grub_cmd_set_date grub_cmd_sleep") "grub_cmd_date grub_cmd_sleep")) #t))) - ;; Disable tests on ARM platforms. - #:tests? ,(not (string-prefix? "arm" (or (%current-target-system) - (%current-system)))))) + ;; Disable tests on ARM and AARCH64 platforms. + #:tests? ,(not (any (cute string-prefix? <> (or (%current-target-system) + (%current-system))) + '("arm" "aarch64"))))) (inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 46ff2dbb4ae6f85554aaf2a16c2e6dc2edf244da Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 30 Nov 2017 10:17:09 +0200 Subject: gnu: grub-efi: Disable tests on all platforms. This is a follow-up to 56f0feb6781e3680541d7adc21d6b3b4746a33ca and 63087721bb54a14dc04ec424474386ae98f7771b, which accidentally enabled tests for grub-efi on other platforms. * gnu/packages/bootloaders.scm (grub-efi)[arguments]: Override inherited tests field and disable on all platforms. --- gnu/packages/bootloaders.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/bootloaders.scm') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 273aeb3823..7d42ff3ebc 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -164,8 +164,8 @@ menu to select one of the installed operating systems.") `(;; TODO: Tests need a UEFI firmware for qemu. There is one at ;; https://github.com/tianocore/edk2/tree/master/OvmfPkg . ;; Search for 'OVMF' in "tests/util/grub-shell.in". - #:tests? #f ,@(substitute-keyword-arguments (package-arguments grub) + ((#:tests? _ #f) #f) ((#:configure-flags flags ''()) `(cons "--with-platform=efi" ,flags)) ((#:phases phases) -- cgit v1.2.3 From c5b2905d92e7c34616fca2dc12d9df991f2d7d06 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 28 Nov 2017 10:19:56 +0100 Subject: gnu: dtc: Fix build on 32 bits platforms. * gnu/packages/bootloaders.scm (dtc)[patches]: Add dtc-32-bits-check.patch and dtc-format-modifier.patch to fix build and tests on 32 bits platforms. * gnu/packages/patches/dtc-32-bits-check.patch : New file. * gnu/packages/patches/dtc-format-modifier.patch : New file. * gnu/local.mk (dist_patch_DATA): Add two above patches. --- gnu/packages/bootloaders.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages/bootloaders.scm') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 7d42ff3ebc..cee1b17019 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -302,7 +302,11 @@ menu to select one of the installed operating systems.") "dtc-" version ".tar.xz")) (sha256 (base32 - "08gnl39i4xy3dm8iqwlz2ygx0ml1bgc5kpiys5ll1wvah1j72b04")))) + "08gnl39i4xy3dm8iqwlz2ygx0ml1bgc5kpiys5ll1wvah1j72b04")) + ;; Fix build and tests on 32 bits platforms. + ;; Will probably be fixed in 1.4.6 release. + (patches (search-patches "dtc-format-modifier.patch" + "dtc-32-bits-check.patch")))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) -- cgit v1.2.3 From 211e804758632d65b98a561a5c339938994e9247 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 3 Dec 2017 08:46:11 +0200 Subject: gnu: u-boot: Update to 2017.11. * gnu/packages/bootloaders.scm (u-boot): Update to 2017.11. --- gnu/packages/bootloaders.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/bootloaders.scm') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index cee1b17019..3cffbcfeb6 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -333,7 +333,7 @@ tree binary files. These are board description files used by Linux and BSD.") (define u-boot (package (name "u-boot") - (version "2017.07") + (version "2017.11") (source (origin (method url-fetch) (uri (string-append @@ -341,7 +341,7 @@ tree binary files. These are board description files used by Linux and BSD.") "u-boot-" version ".tar.bz2")) (sha256 (base32 - "1zzywk0fgngm1mfnhkp8d0v57rs51zr1y6rp4p03i6nbibfbyx2k")))) + "01bcsah5imy6m3fbjwhqywxg0pfk5fl8ks9ylb7kv3zmrb9qy0ba")))) (native-inputs `(("bc" ,bc) ("dtc" ,dtc) -- cgit v1.2.3