From 27b52c1f6aa036ec99691a5c76ecf697e09cd62f Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 26 Apr 2018 08:14:50 +0200 Subject: gnu: qemu: Build with Python 3 and SDL2 support. * gnu/packages/bootloaders.scm (qemu-minimal-2.10): Remove variable. * gnu/packages/virtualization.scm (qemu)[inputs]: Use sdl2 instead of sdl. [native-inputs]: Use python-wrapper instead of python@2. * gnu/packages/virtualization.scm (qemu-minimal)[inputs]: Remove sdl2 instead of sdl from inherited packages. * gnu/packages/virtualization.scm (qemu-minimal-2.10): Add variable. [native-inputs]: Remove python-wrapper from inherited packages and use python@2 instead. * gnu/packages/debug.scm (american-fuzzy-lop): Inherit from moved hidden-package qemu-minimal-2.10. --- gnu/packages/bootloaders.scm | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'gnu/packages/bootloaders.scm') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 281bb98fa9..4350ff3a50 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -72,22 +72,6 @@ (base32 "0p2vhnc18cnbmb39vq4m7hzv4mhnm2l0a2s7gx3ar277fwng3hys")))) -;; The GRUB test suite fails with later versions of Qemu, so we -;; keep it at 2.10 for now. See -;; . -;; TODO: When grub no longer needs this version, move to gnu/packages/debug.scm. -(define qemu-minimal-2.10 - (package - (inherit qemu-minimal) - (version "2.10.2") - (source (origin - (method url-fetch) - (uri (string-append "https://download.qemu.org/qemu-" - version ".tar.xz")) - (sha256 - (base32 - "17w21spvaxaidi2am5lpsln8yjpyp2zi3s3gc6nsxj5arlgamzgw")))))) - (define-public grub (package (name "grub") -- cgit v1.2.3 From fd0b21d5f636c227b83a1fe722b12120dbc0750e Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 29 Apr 2018 04:33:00 +0000 Subject: gnu: make-u-boot-package: Install 'SPL' files also. * gnu/packages/bootloaders.scm (make-u-boot-package)[arguments]: Add 'SPL' files to the files installed during custom 'install phase. --- 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 4350ff3a50..fc4570c2e5 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -408,7 +408,7 @@ also initializes the boards (RAM etc).") (libexec (string-append out "/libexec")) (uboot-files (append (find-files "." ".*\\.(bin|efi|img|spl|itb|dtb)$") - (find-files "." "^MLO$")))) + (find-files "." "^(MLO|SPL)$")))) (mkdir-p libexec) (install-file ".config" libexec) (for-each -- cgit v1.2.3 From 95a3422ef1da7be528d1ae4204ec1b63effde5b6 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 29 Apr 2018 04:38:05 +0000 Subject: gnu: Add u-boot-wandboard. * gnu/packages/bootloaders.scm (u-boot-wandboard): New variable. --- gnu/packages/bootloaders.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/bootloaders.scm') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index fc4570c2e5..6a9fa36f24 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -463,6 +463,9 @@ also initializes the boards (RAM etc).") (define-public u-boot-nintendo-nes-classic-edition (make-u-boot-package "Nintendo_NES_Classic_Edition" "arm-linux-gnueabihf")) +(define-public u-boot-wandboard + (make-u-boot-package "wandboard" "arm-linux-gnueabihf")) + (define-public vboot-utils (package (name "vboot-utils") -- cgit v1.2.3 From adc61d72448de550614b71f120dc5b3a340f6dc0 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 29 Apr 2018 06:39:10 +0000 Subject: gnu: Add u-boot-mx6cuboxi. * gnu/packages/bootloaders.scm (u-boot-mx6cuboxi): New variable. --- gnu/packages/bootloaders.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/bootloaders.scm') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 6a9fa36f24..0db6ad3f6a 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -466,6 +466,9 @@ also initializes the boards (RAM etc).") (define-public u-boot-wandboard (make-u-boot-package "wandboard" "arm-linux-gnueabihf")) +(define-public u-boot-mx6cuboxi + (make-u-boot-package "mx6cuboxi" "arm-linux-gnueabihf")) + (define-public vboot-utils (package (name "vboot-utils") -- cgit v1.2.3