* Re: [ptxdist] [APPLIED] linux-firmware: Version bump. 20241017 -> 20241110
2024-11-13 17:40 [ptxdist] [PATCH] linux-firmware: Version bump. 20241017 -> 20241110 Christian Melki
@ 2024-11-15 9:13 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2024-11-15 9:13 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as 1d4c8857fa7b561bb2a5e7e2d268cf5da4d9b0cf.
Michael
[sent from post-receive hook]
On Fri, 15 Nov 2024 10:13:44 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/?h=20241110
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20241113174017.1602652-1-christian.melki@t2data.com>
> [mol: drop obsolete upstream patch]
> 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
> deleted file mode 100644
> index 074e7e605fc0..000000000000
> --- a/patches/linux-firmware-20241017/0001-check_whence.py-skip-some-validation-if-git-ls-files.patch
> +++ /dev/null
> @@ -1,58 +0,0 @@
> -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
> deleted file mode 100644
> index c83cdb9eae2b..000000000000
> --- a/patches/linux-firmware-20241017/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# 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 062ec1197697..6b571f95bb4f 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 := 20241017
> -LINUX_FIRMWARE_MD5 := 4562b39dd76bbdfd1b05fa1b992fac06
> +LINUX_FIRMWARE_VERSION := 20241110
> +LINUX_FIRMWARE_MD5 := 175bc2b90cb70c462ca4f2b4e550aacf
> 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))
^ permalink raw reply [flat|nested] 2+ messages in thread