diff options
| author | Ada Stevenson <adanskana@gmail.com> | 2023-11-13 14:46:12 +0800 |
|---|---|---|
| committer | John Kehayias <john.kehayias@protonmail.com> | 2023-11-28 01:40:56 -0500 |
| commit | 170c52a7cfa734ee1d3091311c6dd507dea35ea5 (patch) | |
| tree | 82b9e68b7be7188e582a96f3eeb1387b8113e3e8 | |
| parent | 621ca1767cfc8c88f8b2ac5fd16c3ad5ac2ce8ad (diff) | |
gnu: linux-firmware: Update to 20231111.
* nongnu/packages/linux.scm (linux-firmware): Update to 20231111.
[source]: Add patch.
* nongnu/packages/patches/copy-firmware-rdfind.patch: New file.
Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
| -rw-r--r-- | nongnu/packages/linux.scm | 7 | ||||
| -rw-r--r-- | nongnu/packages/patches/copy-firmware-rdfind.patch | 31 |
2 files changed, 36 insertions, 2 deletions
diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index 8c11069..7853ac4 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | ;;; Copyright © 2023 Jelle Licht <jlicht@fsfe.org> | 23 | ;;; Copyright © 2023 Jelle Licht <jlicht@fsfe.org> |
| 24 | ;;; Copyright © 2023 Adam Kandur <rndd@tuta.io> | 24 | ;;; Copyright © 2023 Adam Kandur <rndd@tuta.io> |
| 25 | ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space> | 25 | ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space> |
| 26 | ;;; Copyright © 2023 Ada Stevenson <adanskana@gmail.com> | ||
| 26 | 27 | ||
| 27 | (define-module (nongnu packages linux) | 28 | (define-module (nongnu packages linux) |
| 28 | #:use-module (gnu packages) | 29 | #:use-module (gnu packages) |
| @@ -247,14 +248,16 @@ stable, responsive and smooth desktop experience.")))) | |||
| 247 | (define-public linux-firmware | 248 | (define-public linux-firmware |
| 248 | (package | 249 | (package |
| 249 | (name "linux-firmware") | 250 | (name "linux-firmware") |
| 250 | (version "20231030") | 251 | (version "20231111") |
| 251 | (source (origin | 252 | (source (origin |
| 252 | (method url-fetch) | 253 | (method url-fetch) |
| 253 | (uri (string-append "mirror://kernel.org/linux/kernel/firmware/" | 254 | (uri (string-append "mirror://kernel.org/linux/kernel/firmware/" |
| 254 | "linux-firmware-" version ".tar.xz")) | 255 | "linux-firmware-" version ".tar.xz")) |
| 255 | (sha256 | 256 | (sha256 |
| 256 | (base32 | 257 | (base32 |
| 257 | "1ivrasi3p1l7sd73m21yybgijn0k9vikqwcllphhs4m3qh7j13f9")))) | 258 | "165hrdwfvkqngmdf5s759wzfk8wpa8h6bln31bjady1z570mjjcd")) |
| 259 | (patches | ||
| 260 | (search-patches "nongnu/packages/patches/copy-firmware-rdfind.patch")))) | ||
| 258 | (build-system gnu-build-system) | 261 | (build-system gnu-build-system) |
| 259 | (arguments | 262 | (arguments |
| 260 | `(#:tests? #f | 263 | `(#:tests? #f |
diff --git a/nongnu/packages/patches/copy-firmware-rdfind.patch b/nongnu/packages/patches/copy-firmware-rdfind.patch new file mode 100644 index 0000000..08ccfad --- /dev/null +++ b/nongnu/packages/patches/copy-firmware-rdfind.patch | |||
| @@ -0,0 +1,31 @@ | |||
| 1 | diff --git a/copy-firmware.sh b/copy-firmware.sh | ||
| 2 | index f9b1f0ff..de28e882 100755 | ||
| 3 | --- a/copy-firmware.sh | ||
| 4 | +++ b/copy-firmware.sh | ||
| 5 | @@ -69,11 +69,6 @@ if [ -z "$destdir" ]; then | ||
| 6 | exit 1 | ||
| 7 | fi | ||
| 8 | |||
| 9 | -if ! which rdfind 2>/dev/null >/dev/null; then | ||
| 10 | - echo "ERROR: rdfind is not installed" | ||
| 11 | - exit 1 | ||
| 12 | -fi | ||
| 13 | - | ||
| 14 | # shellcheck disable=SC2162 # file/folder name can include escaped symbols | ||
| 15 | grep -E '^(RawFile|File):' WHENCE | sed -E -e 's/^(RawFile|File): */\1 /;s/"//g' | while read k f; do | ||
| 16 | test -f "$f" || continue | ||
| 17 | @@ -87,14 +82,6 @@ grep -E '^(RawFile|File):' WHENCE | sed -E -e 's/^(RawFile|File): */\1 /;s/"//g' | ||
| 18 | fi | ||
| 19 | done | ||
| 20 | |||
| 21 | -$verbose "Finding duplicate files" | ||
| 22 | -rdfind -makesymlinks true -makeresultsfile false "$destdir" >/dev/null | ||
| 23 | -find "$destdir" -type l | while read -r l; do | ||
| 24 | - target="$(realpath "$l")" | ||
| 25 | - $verbose "Correcting path for $l" | ||
| 26 | - ln -fs "$(realpath --relative-to="$(dirname "$(realpath -s "$l")")" "$target")" "$l" | ||
| 27 | -done | ||
| 28 | - | ||
| 29 | # shellcheck disable=SC2162 # file/folder name can include escaped symbols | ||
| 30 | grep -E '^Link:' WHENCE | sed -e 's/^Link: *//g;s/-> //g' | while read f d; do | ||
| 31 | if test -L "$f$compext"; then | ||
