From 123334fadd4e2638184300c7ccab6dec06403f11 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Thu, 20 Feb 2020 22:42:22 +0100 Subject: gnu: ath9k-htc-firmware, b43-tools: Use git-file-name. * gnu/packages/firmware.scm (ath9k-htc-firmware): Use git-file-name. (b43-tools): Likewise. --- gnu/packages/firmware.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/firmware.scm') diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index d5828deca2b..826de90ccc5 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -52,7 +52,7 @@ (sha256 (base32 "16jbj8avg5jkgvq5lxm0hdxxn4c3zn7fx8b4nxllvr024apk9w23")) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (patches (search-patches "ath9k-htc-firmware-objcopy.patch")))) (build-system gnu-build-system) (arguments @@ -106,7 +106,7 @@ Linux-libre.") (uri (git-reference (url "http://git.bues.ch/git/b43-tools.git") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1wgmj4d65izbhprwb5bcwimc2ryv19b9066lqzy4sa5m6wncm9cn")))) -- cgit v1.2.3 From 5eeb70a7092b0c3bc1d9a333f5f0ec06e12fb294 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 27 Feb 2020 07:40:33 +0000 Subject: gnu: opensbi: Update to 0.6. * gnu/packages/firmware (make-opensbi-package): Update to 0.6. --- gnu/packages/firmware.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/firmware.scm') diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 826de90ccc5..abe8b0eca65 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -188,7 +188,7 @@ by the b43-open driver of Linux-libre.") (name (string-replace-substring (string-append "opensbi-" platform "-" variant) "_" "-")) - (version "0.5") + (version "0.6") (source (origin (method git-fetch) @@ -197,7 +197,7 @@ by the b43-open driver of Linux-libre.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0qc73xbiy79qqkwxmp4mg15q8n8k26njkyqb6n0jw5dyibd6hb85")))) + (base32 "129ypdga0fzn657n2f42g2a1vx3hf8x7sd78h06d35pgkry0jkl7")))) (build-system gnu-build-system) (native-inputs `(,@(if (and (not (string-prefix? "riscv64" (%current-system))) -- cgit v1.2.3 From 2d9b05817dbc75d7a57ae296069529ade2119419 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 27 Feb 2020 07:43:23 +0000 Subject: gnu: opensbi-qemu-sifive-u: Mark as deprecated. * gnu/packages/firmware (opensbi-qemu-sifive-u): Deprecated by opensbi-sifive-fu540. --- gnu/packages/firmware.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages/firmware.scm') diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index abe8b0eca65..8822ff35da4 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -240,12 +240,14 @@ for platform-specific firmwares executing in M-mode.") (define-public opensbi-qemu-virt (make-opensbi-package "qemu" "virt")) -(define-public opensbi-qemu-sifive-u - (make-opensbi-package "qemu" "sifive_u")) - (define-public opensbi-sifive-fu540 (make-opensbi-package "sifive" "fu540")) +(define-public opensbi-qemu-sifive-u + ;; Dropped upstream, as all functionality is present in the sifive-fu540 + ;; target for recent versions of qemu, u-boot and linux. + (deprecated-package "opensbi-qemu-sifive-u" opensbi-sifive-fu540)) + (define-public seabios (package (name "seabios") -- cgit v1.2.3