Thanks, applied as 8fd6b0a605775742eebece81561d08f620cb8e73. Michael
[sent from post-receive hook] On Fri, 24 Nov 2023 08:28:23 +0100, Christian Melki <[email protected]> wrote: > A shorter release cycle. But otherwise, the usual stuff. > GPU, radio stuff. Nvidia firmware for Turing and later included. > > A fix in the copy-firmware.sh script forces installation to be > dependent on the rdfind (redundant data find) binary. > I can't see that it's strictly needed nor do I think it's > a good idea to depend on "exotic" binaries for installation. > The script doesn't fail even if it doesn't find rdfind, so > just let it complain and go on with life. Like it's done > in the previous releases. I've voiced my opinion to a > linux-firmware maintainer. > > * Add license for the old Intel ixp4xx series. > > * Add patch to remove strict dependency on finding rdfind. > https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/diff/copy-firmware.sh?id=cf8315ded9b422d2e8b620ffe8bb661221639c8f > > Signed-off-by: Christian Melki <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/linux-firmware-20231111/0001-copy-firmware.sh-Don-t-depend-on-exotic-binaries-tha.patch > > b/patches/linux-firmware-20231111/0001-copy-firmware.sh-Don-t-depend-on-exotic-binaries-tha.patch > new file mode 100644 > index 000000000000..de5fd03c063c > --- /dev/null > +++ > b/patches/linux-firmware-20231111/0001-copy-firmware.sh-Don-t-depend-on-exotic-binaries-tha.patch > @@ -0,0 +1,29 @@ > +From: Christian Melki <[email protected]> > +Date: Wed, 15 Nov 2023 08:52:11 +0100 > +Subject: [PATCH] copy-firmware.sh: Don't depend on exotic binaries that > aren't > + needed. > + > +We don't need this to do the install. I don't know why > +there is a hard requirement on it. > + > +Signed-off-by: Christian Melki <[email protected]> > +--- > + copy-firmware.sh | 5 ----- > + 1 file changed, 5 deletions(-) > + > +diff --git a/copy-firmware.sh b/copy-firmware.sh > +index f9b1f0ffc1c3..cca3913bd944 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 > diff --git a/patches/linux-firmware-20231111/series > b/patches/linux-firmware-20231111/series > new file mode 100644 > index 000000000000..587287c2c305 > --- /dev/null > +++ b/patches/linux-firmware-20231111/series > @@ -0,0 +1,4 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +0001-copy-firmware.sh-Don-t-depend-on-exotic-binaries-tha.patch > +# fb22468b2b68b60dc709a9c4ae5915e4 - git-ptx-patches magic > diff --git a/rules/linux-firmware.make b/rules/linux-firmware.make > index 7544ca7b9d60..1671677e10fa 100644 > --- a/rules/linux-firmware.make > +++ b/rules/linux-firmware.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LINUX_FIRMWARE) += linux-firmware > # > # Paths and names > # > -LINUX_FIRMWARE_VERSION := 20231030 > -LINUX_FIRMWARE_MD5 := db9f452bd4073ae2c2d353048cef9ae5 > +LINUX_FIRMWARE_VERSION := 20231111 > +LINUX_FIRMWARE_MD5 := 4e1b62642d8882781d66847133d2f0f0 > LINUX_FIRMWARE := linux-firmware-$(LINUX_FIRMWARE_VERSION) > LINUX_FIRMWARE_SUFFIX := tar.gz > LINUX_FIRMWARE_URL := $(call ptx/mirror, KERNEL, > kernel/firmware/$(LINUX_FIRMWARE).$(LINUX_FIRMWARE_SUFFIX)) > @@ -83,6 +83,7 @@ LINUX_FIRMWARE_LICENSE_FILES := \ > file://LICENSE.hfi1_firmware;md5=5e7b6e586ce7339d12689e49931ad444 \ > file://LICENSE.Lontium;md5=4ec8dc582ff7295f39e2ca6a7b0be2b6 \ > file://LICENCE.rockchip;md5=5fd70190c5ed39734baceada8ecced26 \ > + file://LICENSE.ixp4xx;md5=ddc5cd6cbc6745343926fe7ecc2cdeb2 \ > file://LICENCE.it913x;md5=1fbf727bfb6a949810c4dbfa7e6ce4f8 \ > file://LICENSE.qcom_yamato;md5=d0de0eeccaf1843a850bf7a6777eec5c \ > file://LICENCE.OLPC;md5=5b917f9d8c061991be4f6f5f108719cd \
