All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [git commit] package/googlefontdirectory: fix command to generate license file hashes
@ 2024-03-26 14:28 Thomas Petazzoni via buildroot
  2024-04-28 11:01 ` Peter Korsgaard
  0 siblings, 1 reply; 2+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-03-26 14:28 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=f139aab6fedfe1d9924fc205c0a61c51351e4972
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

In commit ebe5d9edfe8d07eafd7b61c4f77ce509bb98a0ad ("boot, package,
support, toolchain: switch to 2 spaces for the hash file"), all hash
files were migrated to use 2 spaces as the separator.

However, in the googlefontdirectory hash file, a command is present in
a comment to indicate how to generate the part of the hash file that
provides the list of license file hashes. This command was not updated
as part of ebe5d9edfe8d07eafd7b61c4f77ce509bb98a0ad, so it still emits
a result in which a single space is used a separator between the hash
type (sha256) and the hash value.

This commit fixes that by using a 2-space separator.

Signed-off-by: Christian Hitz <christian.hitz@bbv.ch>
[Thomas: extracted from
https://patchwork.ozlabs.org/project/buildroot/patch/20240228145013.411919-2-christian@klarinett.li/
into a separate patch]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 package/googlefontdirectory/googlefontdirectory.hash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/googlefontdirectory/googlefontdirectory.hash b/package/googlefontdirectory/googlefontdirectory.hash
index 10f3bf60b1..a92015f509 100644
--- a/package/googlefontdirectory/googlefontdirectory.hash
+++ b/package/googlefontdirectory/googlefontdirectory.hash
@@ -1,7 +1,7 @@
 # Locally calculated
 sha256  ec2ddbeee673cce1b0796e3b20fbff5fd836ce9ba6d88deed8b59154fa255f06  googlefontdirectory-94dff3eaa9301b6640cccc63c56d6ff33d82882c.tar.gz
 # Locally calculated with
-# for i in $(find apache/ ofl/ ufl/ -name 'LICENSE.txt' -o -name 'OFL.txt' -o -name 'LICENCE.txt') ; do printf "sha256 %s\n" "$(sha256sum $i)" ; done
+# for i in $(find apache/ ofl/ ufl/ -name 'LICENSE.txt' -o -name 'OFL.txt' -o -name 'LICENCE.txt') ; do printf "sha256  %s\n" "$(sha256sum $i)" ; done
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/robotocondensed/LICENSE.txt
 sha256  3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5  apache/opensanscondensed/LICENSE.txt
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/walterturncoat/LICENSE.txt
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [Buildroot] [git commit] package/googlefontdirectory: fix command to generate license file hashes
  2024-03-26 14:28 [Buildroot] [git commit] package/googlefontdirectory: fix command to generate license file hashes Thomas Petazzoni via buildroot
@ 2024-04-28 11:01 ` Peter Korsgaard
  0 siblings, 0 replies; 2+ messages in thread
From: Peter Korsgaard @ 2024-04-28 11:01 UTC (permalink / raw)
  To: Thomas Petazzoni via buildroot; +Cc: Thomas Petazzoni

>>>>> "Thomas" == Thomas Petazzoni via buildroot <buildroot@buildroot.org> writes:

 > commit: https://git.buildroot.net/buildroot/commit/?id=f139aab6fedfe1d9924fc205c0a61c51351e4972
 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

 > In commit ebe5d9edfe8d07eafd7b61c4f77ce509bb98a0ad ("boot, package,
 > support, toolchain: switch to 2 spaces for the hash file"), all hash
 > files were migrated to use 2 spaces as the separator.

 > However, in the googlefontdirectory hash file, a command is present in
 > a comment to indicate how to generate the part of the hash file that
 > provides the list of license file hashes. This command was not updated
 > as part of ebe5d9edfe8d07eafd7b61c4f77ce509bb98a0ad, so it still emits
 > a result in which a single space is used a separator between the hash
 > type (sha256) and the hash value.

 > This commit fixes that by using a 2-space separator.

 > Signed-off-by: Christian Hitz <christian.hitz@bbv.ch>
 > [Thomas: extracted from
 > https://patchwork.ozlabs.org/project/buildroot/patch/20240228145013.411919-2-christian@klarinett.li/
 > into a separate patch]
 > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Committed to 2024.02.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-04-28 11:01 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-26 14:28 [Buildroot] [git commit] package/googlefontdirectory: fix command to generate license file hashes Thomas Petazzoni via buildroot
2024-04-28 11:01 ` Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.