me/guix
Archived
1
0
Fork 0
Code Activity

gnu: make-crust-package: Update to 0.6.

Browse source 
* gnu/packages/firmware.scm (make-crust-package): Update to 0.6.  Do not
install host tool as it is not built by default.

Change-Id: Ia79ae8208589601d32235f6d8ace9dce3f8d74f9
This commit is contained in:
Jean-Pierre De Jesus DIAZ 2024-01-19 14:54:45 +01:00 • committed by Mathieu Othacehe
parent e5a00639aa
commit fa0b2cdab3
No known key found for this signature in database
GPG key ID: 8354763531769CA6
1 changed files with 8 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
gnu/packages/firmware.scm
View file

@ -1202,7 +1202,7 @@ such as:
(package (package
(name (string-append "crust-" (name (string-append "crust-"
(string-replace-substring platform "_" "-"))) (string-replace-substring platform "_" "-")))
(version "0.5") (version "0.6")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1213,43 +1213,19 @@ such as:
(file-name (git-file-name "crust" version)) (file-name (git-file-name "crust" version))
(sha256 (sha256
(base32 (base32
"0xgbbhifg3miwd3yp6jq9kp7nqgz5gzy00w95vba45j8jk5vjvvz")))) "1blq6bi2rmg4qqwwr07pamv28b50mwcsybhpn9bws8vbzxa43afd"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list
#:tests? #f ;no test suite #:tests? #f ;no test suite
#:make-flags #:make-flags
(let ((triplet-without-vendor
(and (%current-target-system)
;; TODO: Is there a use case for allowing this?
(not (target-avr?))
(match (string-split (nix-system->gnu-triplet
(%current-target-system)) #\-)
((arch vendor os ..1)
(string-join `(,arch ,@os) "-"))))))
#~(list "CROSS_COMPILE=or1k-elf-" #~(list "CROSS_COMPILE=or1k-elf-"
"V=1" "V=1"
#$@(if triplet-without-vendor "HOSTAR=ar"
;; We are cross-compiling the tools, intended to be "HOSTCC=gcc"
;; executable for the target system. "LEX=flex")
(list (string-append "HOSTAR=" triplet-without-vendor
"-ar")
(string-append "HOSTCC=" triplet-without-vendor
"-gcc"))
;; Not cross-compiling.
(list "HOSTAR=ar"
"HOSTCC=gcc"))
"LEX=flex"))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'do-not-build-tests
(lambda _
;; Attempting to build the tools test binary on a non-aarch64
;; architecture fails with: "No cache cleaning implementation
;; available for this architecture". Avoid building it (see:
;; https://github.com/crust-firmware/crust/issues/182).
(substitute* "tools/Makefile"
(("tools-y \\+= test") ""))))
(delete 'configure) (delete 'configure)
(add-before 'build 'defconfig (add-before 'build 'defconfig
(lambda* (#:key make-flags #:allow-other-keys) (lambda* (#:key make-flags #:allow-other-keys)
@ -1260,9 +1236,7 @@ such as:
(for-each (lambda (file) (for-each (lambda (file)
(install-file file (string-append #$output (install-file file (string-append #$output
"/libexec"))) "/libexec")))
(find-files "." "(scp\\.bin|\\.config)$")) (find-files "." "(scp\\.bin|\\.config)$")))))))
(install-file "build/tools/load"
(string-append #$output "/bin")))))))
;; The firmware is cross-compiled using a "bare bones" compiler (no libc). ;; The firmware is cross-compiled using a "bare bones" compiler (no libc).
;; Use our own tool chain for that. ;; Use our own tool chain for that.
(native-inputs (native-inputs