;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
-;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2016, 2017, 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
-;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module (gnu packages admin)
#:use-module ((gnu packages algebra) #:select (bc))
#:use-module (gnu packages assembly)
+ #:use-module (gnu packages base)
#:use-module (gnu packages disk)
#:use-module (gnu packages bison)
#:use-module (gnu packages cdrom)
#:use-module (gnu packages disk)
#:use-module (gnu packages flex)
#:use-module (gnu packages fontutils)
+ #:use-module (gnu packages gcc)
#:use-module (gnu packages gettext)
#:use-module (gnu packages linux)
#:use-module (gnu packages man)
+ #:use-module (gnu packages mtools)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
+ #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages texinfo)
+ #:use-module (gnu packages tls)
+ #:use-module (gnu packages swig)
#:use-module (gnu packages virtualization)
+ #:use-module (gnu packages web)
#:use-module (guix build-system gnu)
#:use-module (guix download)
#: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, <http://gnu.org/s/unifont>.
(base32
"0p2vhnc18cnbmb39vq4m7hzv4mhnm2l0a2s7gx3ar277fwng3hys"))))
+;; The GRUB test suite fails with later versions of Qemu, so we
+;; keep it at 2.10 for now. See
+;; <https://lists.gnu.org/archive/html/bug-grub/2018-02/msg00004.html>.
+;; 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")
"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"
(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 and AARCH64 platforms.
+ #:tests? ,(not (any (cute string-prefix? <> (or (%current-target-system)
+ (%current-system)))
+ '("arm" "aarch64")))))
(inputs
`(("gettext" ,gettext-minimal)
;; ("fuse" ,fuse)
("ncurses" ,ncurses)))
(native-inputs
- `(("unifont" ,unifont)
+ `(("pkg-config" ,pkg-config)
+ ("unifont" ,unifont)
("bison" ,bison)
;; Due to a bug in flex >= 2.6.2, GRUB must be built with an older flex:
;; <http://lists.gnu.org/archive/html/grub-devel/2017-02/msg00133.html>
;; Dependencies for the test suite. The "real" QEMU is needed here,
;; because several targets are used.
("parted" ,parted)
- ("qemu" ,qemu-minimal)
+ ("qemu" ,qemu-minimal-2.10)
("xorriso" ,xorriso)))
(home-page "https://www.gnu.org/software/grub/")
(synopsis "GRand Unified Boot loader")
(synopsis "GRand Unified Boot loader (UEFI version)")
(inputs
`(("efibootmgr" ,efibootmgr)
+ ("mtools" ,mtools)
,@(package-inputs grub)))
(arguments
`(;; 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)
(("efibootmgr")
(string-append (assoc-ref inputs "efibootmgr")
"/sbin/efibootmgr")))
- #t)))))))))
+ #t))
+ (add-after 'patch-stuff 'use-absolute-mtools-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((mtools (assoc-ref inputs "mtools")))
+ (substitute* "util/grub-mkrescue.c"
+ (("\"mformat\"")
+ (string-append "\"" mtools
+ "/bin/mformat\"")))
+ (substitute* "util/grub-mkrescue.c"
+ (("\"mcopy\"")
+ (string-append "\"" mtools
+ "/bin/mcopy\"")))
+ #t))))))))))
+
+;; Because grub searches hardcoded paths it's easiest to just build grub
+;; again to make it find both grub-pc and grub-efi. There is a command
+;; line argument which allows you to specify ONE platform - but
+;; grub-mkrescue will use multiple platforms if they are available
+;; in the installation directory (without command line argument).
+(define-public grub-hybrid
+ (package
+ (inherit grub-efi)
+ (name "grub-hybrid")
+ (synopsis "GRand Unified Boot loader (hybrid version)")
+ (inputs
+ `(("grub" ,grub)
+ ,@(package-inputs grub-efi)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments grub-efi)
+ ((#:modules modules `((guix build utils) (guix build gnu-build-system)))
+ `((ice-9 ftw) ,@modules))
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (add-after 'install 'install-non-efi
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((input-dir (string-append (assoc-ref inputs "grub")
+ "/lib/grub"))
+ (output-dir (string-append (assoc-ref outputs "out")
+ "/lib/grub")))
+ (for-each
+ (lambda (basename)
+ (if (not (or (string-prefix? "." basename)
+ (file-exists? (string-append output-dir "/" basename))))
+ (symlink (string-append input-dir "/" basename)
+ (string-append output-dir "/" basename))))
+ (scandir input-dir))
+ #t)))))))))
(define-public syslinux
(let ((commit "bb41e935cc83c6242de24d2271e067d76af3585c"))
("perl" ,perl)
("python-2" ,python-2)))
(inputs
- `(("libuuid" ,util-linux)))
+ `(("libuuid" ,util-linux)
+ ("mtools" ,mtools)))
(arguments
`(#:parallel-build? #f
#:make-flags
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-files
- (lambda _
+ (lambda* (#:key inputs #:allow-other-keys)
(substitute* (find-files "." "Makefile.*|ppmtolss16")
(("/bin/pwd") (which "pwd"))
(("/bin/echo") (which "echo"))
(("/usr/bin/perl") (which "perl")))
+ (let ((mtools (assoc-ref inputs "mtools")))
+ (substitute* (find-files "." "\\.c$")
+ (("mcopy")
+ (string-append mtools "/bin/mcopy"))
+ (("mattrib")
+ (string-append mtools "/bin/mattrib"))))
#t))
(delete 'configure)
(add-before 'build 'set-permissions
(define-public dtc
(package
(name "dtc")
- (version "1.4.4")
+ (version "1.4.6")
(source (origin
(method url-fetch)
(uri (string-append
"dtc-" version ".tar.xz"))
(sha256
(base32
- "1yygyvnnpdh241hl90n9p3kxcdvk3jxmsr4ndb961c8mq3ak21s7"))))
+ "0zkvih0fpwvk31aqyyfy9kn13nbi76c21ihax15p6h1wrjzh48rq"))))
(build-system gnu-build-system)
(native-inputs
`(("bison" ,bison)
- ("flex" ,flex)))
+ ("flex" ,flex)
+ ("swig" ,swig)))
+ (inputs
+ `(("python-2" ,python-2)))
(arguments
`(#:make-flags
(list "CC=gcc"
(string-append "PREFIX=" (assoc-ref %outputs "out"))
+ (string-append "SETUP_PREFIX=" (assoc-ref %outputs "out"))
"INSTALL=install")
#:phases
(modify-phases %standard-phases
- (delete 'configure))))
+ (delete 'configure)))) ; no configure script
(home-page "https://www.devicetree.org")
(synopsis "Compiles device tree source files")
(description "@command{dtc} compiles
(define u-boot
(package
(name "u-boot")
- (version "2017.07")
+ (version "2018.01")
(source (origin
(method url-fetch)
(uri (string-append
"u-boot-" version ".tar.bz2"))
(sha256
(base32
- "1zzywk0fgngm1mfnhkp8d0v57rs51zr1y6rp4p03i6nbibfbyx2k"))))
+ "1nidnnjprgxdhiiz7gmaj8cgcf52l5gbv64cmzjq4gmkjirmk3wk"))))
(native-inputs
`(("bc" ,bc)
- ("dtc" ,dtc)
- ("python-2" ,python-2)))
+ ;("dtc" ,dtc) ; they have their own incompatible copy.
+ ("python-2" ,python-2)
+ ("swig" ,swig)))
(build-system gnu-build-system)
(home-page "http://www.denx.de/wiki/U-Boot/")
(synopsis "ARM bootloader")
(define (make-u-boot-package board triplet)
"Returns a u-boot package for BOARD cross-compiled for TRIPLET."
- (package
- (inherit u-boot)
- (name (string-append "u-boot-" (string-downcase board)))
- (native-inputs
- `(("cross-gcc" ,(cross-gcc triplet))
- ("cross-binutils" ,(cross-binutils triplet))
- ,@(package-native-inputs u-boot)))
- (arguments
- `(#:modules ((ice-9 ftw) (guix build utils) (guix build gnu-build-system))
- #:test-target "test"
- #:make-flags
- (list "HOSTCC=gcc" (string-append "CROSS_COMPILE=" ,triplet "-"))
- #:phases
- (modify-phases %standard-phases
- (replace 'configure
- (lambda* (#:key outputs make-flags #:allow-other-keys)
- (let ((config-name (string-append ,board "_defconfig")))
- (if (file-exists? (string-append "configs/" config-name))
- (zero? (apply system* "make" `(,@make-flags ,config-name)))
- (begin
- (display "Invalid board name. Valid board names are:")
- (let ((suffix-len (string-length "_defconfig")))
- (scandir "configs"
- (lambda (file-name)
- (when (string-suffix? "_defconfig" file-name)
- (format #t
- "- ~A\n"
- (string-drop-right file-name
- suffix-len))))))
- #f)))))
- (replace 'install
- (lambda* (#:key outputs make-flags #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (libexec (string-append out "/libexec"))
- (uboot-files (find-files "." ".*\\.(bin|efi|spl)$")))
- (mkdir-p libexec)
- (for-each
- (lambda (file)
- (let ((target-file (string-append libexec "/" file)))
- (mkdir-p (dirname target-file))
- (copy-file file target-file)))
- uboot-files)))))))))
+ (let ((same-arch? (if (string-prefix? (%current-system)
+ (gnu-triplet->nix-system triplet))
+ `#t
+ `#f)))
+ (package
+ (inherit u-boot)
+ (name (string-append "u-boot-"
+ (string-replace-substring (string-downcase board)
+ "_" "-")))
+ (native-inputs
+ `(,@(if (not same-arch?)
+ `(("cross-gcc" ,(cross-gcc triplet #:xgcc gcc-7))
+ ("cross-binutils" ,(cross-binutils triplet)))
+ `(("gcc-7" ,gcc-7)))
+ ,@(package-native-inputs u-boot)))
+ (arguments
+ `(#:modules ((ice-9 ftw) (guix build utils) (guix build gnu-build-system))
+ #:test-target "test"
+ #:make-flags
+ (list "HOSTCC=gcc"
+ ,@(if (not same-arch?)
+ `((string-append "CROSS_COMPILE=" ,triplet "-"))
+ '()))
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'configure
+ (lambda* (#:key outputs make-flags #:allow-other-keys)
+ (let ((config-name (string-append ,board "_defconfig")))
+ (if (file-exists? (string-append "configs/" config-name))
+ (zero? (apply system* "make" `(,@make-flags ,config-name)))
+ (begin
+ (display "Invalid board name. Valid board names are:")
+ (let ((suffix-len (string-length "_defconfig")))
+ (scandir "configs"
+ (lambda (file-name)
+ (when (string-suffix? "_defconfig" file-name)
+ (format #t
+ "- ~A\n"
+ (string-drop-right file-name
+ suffix-len))))))
+ #f)))))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (libexec (string-append out "/libexec"))
+ (uboot-files (append
+ (find-files "." ".*\\.(bin|efi|img|spl)$")
+ (find-files "." "^MLO$"))))
+ (mkdir-p libexec)
+ (install-file ".config" libexec)
+ (for-each
+ (lambda (file)
+ (let ((target-file (string-append libexec "/" file)))
+ (mkdir-p (dirname target-file))
+ (copy-file file target-file)))
+ uboot-files))))))))))
(define-public u-boot-vexpress
(make-u-boot-package "vexpress_ca9x4" "arm-linux-gnueabihf"))
(define-public u-boot-odroid-c2
(make-u-boot-package "odroid-c2" "aarch64-linux-gnu"))
+
+(define-public u-boot-banana-pi-m2-ultra
+ (make-u-boot-package "Bananapi_M2_Ultra" "arm-linux-gnueabihf"))
+
+(define-public u-boot-a20-olinuxino-lime
+ (make-u-boot-package "A20-OLinuXino-Lime" "arm-linux-gnueabihf"))
+
+(define-public u-boot-a20-olinuxino-lime2
+ (make-u-boot-package "A20-OLinuXino-Lime2" "arm-linux-gnueabihf"))
+
+(define-public u-boot-a20-olinuxino-micro
+ (make-u-boot-package "A20-OLinuXino_MICRO" "arm-linux-gnueabihf"))
+
+(define-public u-boot-nintendo-nes-classic-edition
+ (make-u-boot-package "Nintendo_NES_Classic_Edition" "arm-linux-gnueabihf"))
+
+(define-public vboot-utils
+ (package
+ (name "vboot-utils")
+ (version "R63-10032.B")
+ (source (origin
+ ;; XXX: Snapshots are available but changes timestamps every download.
+ (method git-fetch)
+ (uri (git-reference
+ (url (string-append "https://chromium.googlesource.com"
+ "/chromiumos/platform/vboot_reference"))
+ (commit (string-append "release-" version))))
+ (file-name (string-append name "-" version "-checkout"))
+ (sha256
+ (base32
+ "0h0m3l69vp9dr6xrs1p6y7ilkq3jq8jraw2z20kqfv7lvc9l1lxj"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:make-flags (list "CC=gcc"
+ (string-append "DESTDIR=" (assoc-ref %outputs "out")))
+ #:phases (modify-phases %standard-phases
+ (add-after 'unpack 'patch-hard-coded-paths
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((coreutils (assoc-ref inputs "coreutils"))
+ (diffutils (assoc-ref inputs "diffutils")))
+ (substitute* "futility/misc.c"
+ (("/bin/cp") (string-append coreutils "/bin/cp")))
+ (substitute* "tests/bitmaps/TestBmpBlock.py"
+ (("/usr/bin/cmp") (string-append diffutils "/bin/cmp")))
+ (substitute* "vboot_host.pc.in"
+ (("prefix=/usr")
+ (string-append "prefix=" (assoc-ref outputs "out"))))
+ #t)))
+ (delete 'configure)
+ (add-before 'check 'patch-tests
+ (lambda _
+ ;; These tests compare diffs against known-good values.
+ ;; Patch the paths to match those in the build container.
+ (substitute* (find-files "tests/futility/expect_output")
+ (("/mnt/host/source/src/platform/vboot_reference")
+ (string-append "/tmp/guix-build-" ,name "-" ,version
+ ".drv-0/source")))
+ ;; Tests require write permissions to many of these files.
+ (for-each make-file-writable (find-files "tests/futility"))
+ #t)))
+ #:test-target "runtests"))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+
+ ;; For tests.
+ ("diffutils" ,diffutils)
+ ("python@2" ,python-2)))
+ (inputs
+ `(("coreutils" ,coreutils)
+ ("libyaml" ,libyaml)
+ ("openssl" ,openssl)
+ ("openssl:static" ,openssl "static")
+ ("util-linux" ,util-linux)))
+ (home-page
+ "https://dev.chromium.org/chromium-os/chromiumos-design-docs/verified-boot")
+ (synopsis "ChromiumOS verified boot utilities")
+ (description
+ "vboot-utils is a collection of tools to facilitate booting of
+Chrome-branded devices. This includes the @command{cgpt} partitioning
+program, the @command{futility} and @command{crossystem} firmware management
+tools, and more.")
+ (license license:bsd-3)))
+
+(define-public os-prober
+ (package
+ (name "os-prober")
+ (version "1.76")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://debian/pool/main/o/os-prober/os-prober_"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "1vb45i76bqivlghrq7m3n07qfmmq4wxrkplqx8gywj011rhq19fk"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:modules ((guix build gnu-build-system)
+ (guix build utils)
+ (ice-9 regex) ; for string-match
+ (srfi srfi-26)) ; for cut
+ #:make-flags (list "CC=gcc")
+ #:tests? #f ; no tests
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* (find-files ".")
+ (("/usr") (assoc-ref outputs "out")))
+ (substitute* (find-files "." "50mounted-tests$")
+ (("mkdir") "mkdir -p"))
+ #t))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (define (find-files-non-recursive directory)
+ (find-files directory
+ (lambda (file stat)
+ (string-match (string-append "^" directory "/[^/]*$")
+ file))
+ #:directories? #t))
+
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin"))
+ (lib (string-append out "/lib"))
+ (share (string-append out "/share")))
+ (for-each (cut install-file <> bin)
+ (list "linux-boot-prober" "os-prober"))
+ (install-file "newns" (string-append lib "/os-prober"))
+ (install-file "common.sh" (string-append share "/os-prober"))
+ (install-file "os-probes/mounted/powerpc/20macosx"
+ (string-append lib "/os-probes/mounted"))
+ (for-each
+ (lambda (directory)
+ (for-each
+ (lambda (file)
+ (let ((destination (string-append lib "/" directory
+ "/" (basename file))))
+ (mkdir-p (dirname destination))
+ (copy-recursively file destination)))
+ (append (find-files-non-recursive (string-append directory "/common"))
+ (find-files-non-recursive (string-append directory "/x86")))))
+ (list "os-probes" "os-probes/mounted" "os-probes/init"
+ "linux-boot-probes" "linux-boot-probes/mounted"))
+ #t))))))
+ (home-page "https://joeyh.name/code/os-prober")
+ (synopsis "Detect other operating systems")
+ (description "os-prober probes disks on the system for other operating
+systems so that they can be added to the bootloader. It also works out how to
+boot existing GNU/Linux systems and detects what distribution is installed in
+order to add a suitable bootloader menu entry.")
+ (license license:gpl2+)))
HCoop / jackhill / guix / guix.git / blobdiff