diff options
| author | Ada Stevenson <adanskana@gmail.com> | 2023-12-20 14:33:37 +0800 |
|---|---|---|
| committer | Jonathan Brielmaier <jonathan.brielmaier@web.de> | 2023-12-21 12:52:01 +0100 |
| commit | f0c8465ed2a0eff5e2411e0f22b0146a386fee69 (patch) | |
| tree | ce3df5a66db3f473ebc24613644488bf1d064e03 /nongnu | |
| parent | 75541ecc299ad884e1e9dc04e8d4a347bfe40cbf (diff) | |
nongnu: linux-firmware: Update to 20231211.
* nongnu/packages/linux.scm (linux-firmware): Update to 20231211.
[source]: Remove no longer needed patch.
[arguments]: Replace 'install phase to not call rdfind.
* nongnu/packages/patches/copy-firmware-rdfind.patch: Remove file.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
Diffstat (limited to 'nongnu')
| -rw-r--r-- | nongnu/packages/linux.scm | 9 | ||||
| -rw-r--r-- | nongnu/packages/patches/copy-firmware-rdfind.patch | 31 |
2 files changed, 5 insertions, 35 deletions
diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index 3300609..0094b1c 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -245,22 +245,23 @@ stable, responsive and smooth desktop experience.")))) (define-public linux-firmware (package (name "linux-firmware") - (version "20231111") + (version "20231211") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/kernel/firmware/" "linux-firmware-" version ".tar.xz")) (sha256 (base32 - "165hrdwfvkqngmdf5s759wzfk8wpa8h6bln31bjady1z570mjjcd")) - (patches - (search-patches "nongnu/packages/patches/copy-firmware-rdfind.patch")))) + "1fz8vflidayal6gpjvmp75ni04b9ndxbpp5krmlpilxbbr5pxbwn")))) (build-system gnu-build-system) (arguments `(#:tests? #f #:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases + (replace 'install + (lambda* (#:key (make-flags '()) #:allow-other-keys) + (apply invoke "make" "install-nodedup" make-flags))) (delete 'validate-runpath)))) (home-page "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git") diff --git a/nongnu/packages/patches/copy-firmware-rdfind.patch b/nongnu/packages/patches/copy-firmware-rdfind.patch deleted file mode 100644 index 08ccfad..0000000 --- a/nongnu/packages/patches/copy-firmware-rdfind.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/copy-firmware.sh b/copy-firmware.sh -index f9b1f0ff..de28e882 100755 ---- a/copy-firmware.sh -+++ b/copy-firmware.sh -@@ -69,11 +69,6 @@ if [ -z "$destdir" ]; then - exit 1 - fi - --if ! which rdfind 2>/dev/null >/dev/null; then -- echo "ERROR: rdfind is not installed" -- exit 1 --fi -- - # shellcheck disable=SC2162 # file/folder name can include escaped symbols - grep -E '^(RawFile|File):' WHENCE | sed -E -e 's/^(RawFile|File): */\1 /;s/"//g' | while read k f; do - test -f "$f" || continue -@@ -87,14 +82,6 @@ grep -E '^(RawFile|File):' WHENCE | sed -E -e 's/^(RawFile|File): */\1 /;s/"//g' - fi - done - --$verbose "Finding duplicate files" --rdfind -makesymlinks true -makeresultsfile false "$destdir" >/dev/null --find "$destdir" -type l | while read -r l; do -- target="$(realpath "$l")" -- $verbose "Correcting path for $l" -- ln -fs "$(realpath --relative-to="$(dirname "$(realpath -s "$l")")" "$target")" "$l" --done -- - # shellcheck disable=SC2162 # file/folder name can include escaped symbols - grep -E '^Link:' WHENCE | sed -e 's/^Link: *//g;s/-> //g' | while read f d; do - if test -L "$f$compext"; then |