From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Christian Melki <christian.melki@t2data.com>
Subject: Re: [ptxdist] [APPLIED] linux-firmware: Version bump. 20240909 -> 2024107
Date: Wed, 30 Oct 2024 09:00:41 +0100 [thread overview]
Message-ID: <20241030080041.4189933-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20241023163424.3764778-1-christian.melki@t2data.com>
Thanks, applied as 06a457619853539acef03eaf7a3f42461de08864.
Michael
[sent from post-receive hook]
On Wed, 30 Oct 2024 09:00:41 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> The usual updates. GPU, wifi, sound.
> https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/?h=20241017
>
> * Remove the old special install target. Dedup was splitted out.
> Use a normal install target.
>
> * Add patch to fix errors during install that didn't make it to the release.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20241023163424.3764778-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/linux-firmware-20241017/0001-check_whence.py-skip-some-validation-if-git-ls-files.patch b/patches/linux-firmware-20241017/0001-check_whence.py-skip-some-validation-if-git-ls-files.patch
> new file mode 100644
> index 000000000000..074e7e605fc0
> --- /dev/null
> +++ b/patches/linux-firmware-20241017/0001-check_whence.py-skip-some-validation-if-git-ls-files.patch
> @@ -0,0 +1,58 @@
> +From: Emil Velikov <emil.l.velikov@gmail.com>
> +Date: Fri, 18 Oct 2024 13:58:01 +0100
> +Subject: [PATCH] check_whence.py: skip some validation if git ls-files fails
> +
> +Recently we started running check_whence.py to validate WHENCE before
> +installing files with copy-firmware.sh. It did not consider the fact
> +that people may be using the distribution tarball, which lacks the
> +relevant git metadata.
> +
> +Throw a warning and skip the relevant validation.
> +
> +Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
> +---
> + check_whence.py | 15 +++++++++------
> + 1 file changed, 9 insertions(+), 6 deletions(-)
> +
> +diff --git a/check_whence.py b/check_whence.py
> +index c3d4a2e38f09..1fece4f4920a 100755
> +--- a/check_whence.py
> ++++ b/check_whence.py
> +@@ -60,9 +60,12 @@ def list_links_list():
> +
> +
> + def list_git():
> +- with os.popen("git ls-files") as git_files:
> +- for line in git_files:
> +- yield line.rstrip("\n")
> ++ git_files = os.popen("git ls-files")
> ++ for line in git_files:
> ++ yield line.rstrip("\n")
> ++
> ++ if git_files.close():
> ++ sys.stderr.write("W: git file listing failed, skipping some validation\n")
> +
> +
> + def main():
> +@@ -135,7 +138,7 @@ def main():
> + )
> + ret = 1
> +
> +- for name in sorted(list(known_files - git_files)):
> ++ for name in sorted(list(known_files - git_files) if len(git_files) else list()):
> + sys.stderr.write("E: %s listed in WHENCE does not exist\n" % name)
> + ret = 1
> +
> +@@ -151,10 +154,10 @@ def main():
> + break
> + valid_targets.add(dirname)
> +
> +- for link, target in sorted(links_list):
> ++ for link, target in sorted(links_list if len(git_files) else list()):
> + if target not in valid_targets:
> + sys.stderr.write(
> +- "E: target %s of link %s in WHENCE" " does not exist\n" % (target, link)
> ++ "E: target %s of link %s in WHENCE does not exist\n" % (target, link)
> + )
> + ret = 1
> +
> diff --git a/patches/linux-firmware-20241017/series b/patches/linux-firmware-20241017/series
> new file mode 100644
> index 000000000000..c83cdb9eae2b
> --- /dev/null
> +++ b/patches/linux-firmware-20241017/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-check_whence.py-skip-some-validation-if-git-ls-files.patch
> +# c47d7f72a2f42b318b3433058f841747 - git-ptx-patches magic
> diff --git a/rules/linux-firmware.make b/rules/linux-firmware.make
> index ff9a4042481d..062ec1197697 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 := 20240909
> -LINUX_FIRMWARE_MD5 := 91dce7e5d4a4ce1402d706a2ce30029e
> +LINUX_FIRMWARE_VERSION := 20241017
> +LINUX_FIRMWARE_MD5 := 4562b39dd76bbdfd1b05fa1b992fac06
> 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))
> @@ -120,13 +120,6 @@ endif
>
> LINUX_FIRMWARE_SELECTED_FIRMWARES = $(call remove_quotes, $(PTXCONF_LINUX_FIRMWARE_SELECTED_FIRMWARES))
>
> -# ----------------------------------------------------------------------------
> -# Prepare
> -# ----------------------------------------------------------------------------
> -
> -LINUX_FIRMWARE_INSTALL_OPT := \
> - install-nodedup
> -
> # ----------------------------------------------------------------------------
> # Compile
> # ----------------------------------------------------------------------------
prev parent reply other threads:[~2024-10-30 8:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-23 16:34 [ptxdist] [PATCH v2] " Christian Melki
2024-10-30 8:00 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241030080041.4189933-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=christian.melki@t2data.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox