commit 06031ecaf14ed96b964a794e34b3f611ec311727 Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Mon Jan 27 22:07:18 2025 +0100
- updated to 20250109 check-files.patch | 10 +++++----- linux-firmware.spec | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) --- diff --git a/linux-firmware.spec b/linux-firmware.spec index 85cc0b5..b11a2c0 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -5,7 +5,7 @@ # - subpackages for various firmwares? # - (since 5.3) compress firmware: https://git.kernel.org/linus/82fd7a8142a10b8eb41313074b3859d82c0857dc %define rel 1 -%define ver 20241210 +%define ver 20250109 Summary: Firmware files used by the Linux kernel Summary(pl.UTF-8): Pliki firmware'u używane przez jądro Linuksa Name: linux-firmware @@ -18,7 +18,7 @@ Group: Base/Kernel #Source0: https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/%{name}-%{snap}.tar.gz # upstream tarball Source0: https://www.kernel.org/pub/linux/kernel/firmware/%{name}-%{version}.tar.xz -# Source0-md5: 028900e25a71f9731088d88e21137220 +# Source0-md5: c2c2139408857c9cdde2e810b80a9e68 Patch0: check-files.patch URL: https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ BuildRequires: rdfind @@ -619,7 +619,7 @@ punktów sieci OLPC. %prep %setup -q -%patch0 -p1 +%patch -P0 -p1 # Remove firmware shipped in separate packages already # Perhaps these should be built as subpackages of linux-firmware? diff --git a/check-files.patch b/check-files.patch index 2d7496a..aae4535 100644 --- a/check-files.patch +++ b/check-files.patch @@ -1,6 +1,6 @@ ---- linux-firmware-20241017/copy-firmware.sh.orig 2024-10-23 13:41:31.664541337 +0200 -+++ linux-firmware-20241017/copy-firmware.sh 2024-10-23 13:51:38.989815246 +0200 -@@ -70,6 +70,7 @@ +--- linux-firmware-20250109/copy-firmware.sh.orig 2025-01-09 18:11:19.000000000 +0100 ++++ linux-firmware-20250109/copy-firmware.sh 2025-01-27 21:56:46.857597308 +0100 +@@ -92,6 +92,7 @@ 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 @@ -8,8 +8,8 @@ install -d "$destdir/$(dirname "$f")" $verbose "copying/compressing file $f$compext" if test "$compress" != "cat" && test "$k" = "RawFile"; then -@@ -82,6 +83,7 @@ - +@@ -116,6 +117,7 @@ fi + echo > "$parallel_args_file" # shellcheck disable=SC2162 # file/folder name can include escaped symbols grep -E '^Link:' WHENCE | sed -e 's/^Link: *//g;s/-> //g' | while read l t; do + test -e "$(dirname "$l")/$t" || continue ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/linux-firmware.git/commitdiff/06031ecaf14ed96b964a794e34b3f611ec311727 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit