seasharp/Rosenthal
1
0
Fork 0
mirror of https://codeberg.org/hako/Rosenthal.git synced 2025-04-16 11:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

bootloader: Fix modules related build issue.

Browse Source 
* rosenthal/bootloader/u-boot.scm: Fix modules related build issue.
* rosenthal/packages/gnome-xyz.scm: Likewise.
This commit is contained in:
Hilton Chain 2022-12-06 13:44:19 +08:00
parent 74501fd33a
commit f8aacd14fa
No known key found for this signature in database
GPG Key ID: 5E5AA665614917F7
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rosenthal/bootloader/u-boot.scm
View File

@ -3,17 +3,13 @@
;; SPDX-License-Identifier: GPL-3.0-or-later ;; SPDX-License-Identifier: GPL-3.0-or-later
(define-module (rosenthal bootloader u-boot) (define-module (rosenthal bootloader u-boot)
#:use-module (ice-9 format)
#:use-module (guix gexp)
#:use-module (gnu bootloader) #:use-module (gnu bootloader)
#:use-module (gnu bootloader u-boot) #:use-module (gnu bootloader u-boot)
#:use-module (guix gexp)
#:use-module (rosenthal packages bootloaders) #:use-module (rosenthal packages bootloaders)
#:export (u-boot-rpi4-arm64-bootloader)) #:export (u-boot-rpi4-arm64-bootloader))
;; Autoload Nonguix*, so we only have a soft dependency.
;; * <https://gitlab.com/nonguix/nonguix>
(module-autoload! (current-module)
'(nongnu packages linux) '(raspberrypi-firmware))
(define %rpi4-arm64-boot-config (define %rpi4-arm64-boot-config
(plain-file "config.txt" (format #f "~ (plain-file "config.txt" (format #f "~
enable_uart=1 enable_uart=1
@ -27,10 +23,15 @@ kernel=u-boot.bin
#~(lambda (bootloader device mount-point) #~(lambda (bootloader device mount-point)
(let ((u-boot (string-append bootloader "/libexec/u-boot.bin")) (let ((u-boot (string-append bootloader "/libexec/u-boot.bin"))
(install-dir (string-append mount-point "/boot"))) (install-dir (string-append mount-point "/boot")))
;; Autoload Nonguix*, so we only have a soft dependency.
;; * <https://gitlab.com/nonguix/nonguix>
(module-autoload! (current-module)
'(nongnu packages linux) '(raspberrypi-firmware))
;; Install raspberrypi-firmware ;; Install raspberrypi-firmware
(for-each (lambda (file) (for-each (lambda (file)
(install-file (install-file
(string-append #$raspberrypi-firmware "/" file) install-dir)) (string-append raspberrypi-firmware "/" file) install-dir))
'(;; VideoCore firmwares '(;; VideoCore firmwares
"start4.elf" ;basic "start4.elf" ;basic
"start4x.elf" ;camera drivers and codec "start4x.elf" ;camera drivers and codec

1
rosenthal/packages/gnome-xyz.scm
View File

@ -4,7 +4,6 @@
(define-module (rosenthal packages gnome-xyz) (define-module (rosenthal packages gnome-xyz)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (ice-9 string-fun)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix git-download) #:use-module (guix git-download)