* [Buildroot] [PATCH 1/1] package/gocryptfs: fix build against riscv
@ 2022-06-25 22:42 Christian Stewart via buildroot
2022-07-23 16:41 ` Thomas Petazzoni via buildroot
2022-08-02 22:06 ` Thomas Petazzoni via buildroot
0 siblings, 2 replies; 10+ messages in thread
From: Christian Stewart via buildroot @ 2022-06-25 22:42 UTC (permalink / raw)
To: buildroot
Cc: Christian Stewart, Yann E . MORIN, Thomas Petazzoni,
Anisse Astier
Replace dependency jacobsa/crypto with a fork with support for riscv64.
Fixes:
- http://autobuild.buildroot.net/results/caa60874781c4077273884eb37281cc9e02ef9ac/
- https://github.com/rfjakob/gocryptfs/issues/666
Upstream PR: https://github.com/jacobsa/crypto/issues/13
Signed-off-by: Christian Stewart <christian@paral.in>
---
...-fix-jacobsa-crypto-build-on-riscv64.patch | 152 ++++++++++++++++++
1 file changed, 152 insertions(+)
create mode 100644 package/gocryptfs/0001-go.mod-fix-jacobsa-crypto-build-on-riscv64.patch
diff --git a/package/gocryptfs/0001-go.mod-fix-jacobsa-crypto-build-on-riscv64.patch b/package/gocryptfs/0001-go.mod-fix-jacobsa-crypto-build-on-riscv64.patch
new file mode 100644
index 0000000000..90e3cc262d
--- /dev/null
+++ b/package/gocryptfs/0001-go.mod-fix-jacobsa-crypto-build-on-riscv64.patch
@@ -0,0 +1,152 @@
+From e9b64ab75e8539a52d60ecb299fc5425f0d27dc7 Mon Sep 17 00:00:00 2001
+From: Christian Stewart <christian@paral.in>
+Date: Sat, 25 Jun 2022 14:57:38 -0700
+Subject: [PATCH] go.mod: fix jacobsa/crypto build on riscv64
+
+Replace dependency jacobsa/crypto with a fork with support for riscv64.
+
+Issue: https://github.com/rfjakob/gocryptfs/issues/666
+
+Upstream PR: https://github.com/jacobsa/crypto/issues/13
+
+Signed-off-by: Christian Stewart <christian@paral.in>
+---
+ go.mod | 9 ++---
+ go.sum | 4 +-
+ .../jacobsa/crypto/cmac/hash_generic.go | 40 +++++++++++++++++++
+ vendor/modules.txt | 13 +-----
+ 4 files changed, 48 insertions(+), 18 deletions(-)
+ create mode 100644 vendor/github.com/jacobsa/crypto/cmac/hash_generic.go
+
+diff --git a/go.mod b/go.mod
+index 29f7c2c..533fcdd 100644
+--- a/go.mod
++++ b/go.mod
+@@ -2,19 +2,18 @@ module github.com/rfjakob/gocryptfs/v2
+
+ go 1.16
+
++// Fixes build against risc-v
++// See: https://github.com/jacobsa/crypto/issues/13
++replace github.com/jacobsa/crypto => github.com/aperturerobotics/jacobsa-crypto v0.0.0-20220403053904-77863254e607 // xorblock-generic-1
++
+ require (
+ github.com/hanwen/go-fuse/v2 v2.1.1-0.20210825171523-3ab5d95a30ae
+ github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115
+- github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd // indirect
+- github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff // indirect
+- github.com/jacobsa/ogletest v0.0.0-20170503003838-80d50a735a11 // indirect
+- github.com/jacobsa/reqtrace v0.0.0-20150505043853-245c9e0234cb // indirect
+ github.com/pkg/xattr v0.4.3
+ github.com/rfjakob/eme v1.1.2
+ github.com/sabhiram/go-gitignore v0.0.0-20201211210132-54b8a0bf510f
+ github.com/spf13/pflag v1.0.5
+ golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
+- golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect
+ golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2
+ golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b
+ )
+diff --git a/go.sum b/go.sum
+index be0be5f..c26b80e 100644
+--- a/go.sum
++++ b/go.sum
+@@ -1,9 +1,9 @@
++github.com/aperturerobotics/jacobsa-crypto v0.0.0-20220403053904-77863254e607 h1:N8UVJlxKDhrvHTKXC7oVVfhVvGbgaw2mmlnCgGkfOFc=
++github.com/aperturerobotics/jacobsa-crypto v0.0.0-20220403053904-77863254e607/go.mod h1:Om5VFfyh5VipAEOOVoHAUa4hebUCKxQUjggFPTLeH08=
+ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+ github.com/hanwen/go-fuse/v2 v2.1.1-0.20210825171523-3ab5d95a30ae h1:4CB6T4YTUVvnro5ba8ju1QCbOuyGAeF3vvKlo50EJ4k=
+ github.com/hanwen/go-fuse/v2 v2.1.1-0.20210825171523-3ab5d95a30ae/go.mod h1:B1nGE/6RBFyBRC1RRnf23UpwCdyJ31eukw34oAKukAc=
+-github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115 h1:YuDUUFNM21CAbyPOpOP8BicaTD/0klJEKt5p8yuw+uY=
+-github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115/go.mod h1:LadVJg0XuawGk+8L1rYnIED8451UyNxEMdTWCEt5kmU=
+ github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd h1:9GCSedGjMcLZCrusBZuo4tyKLpKUPenUUqi34AkuFmA=
+ github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd/go.mod h1:TlmyIZDpGmwRoTWiakdr+HA1Tukze6C6XbRVidYq02M=
+ github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff h1:2xRHTvkpJ5zJmglXLRqHiZQNjUoOkhUyhTAhEQvPAWw=
+diff --git a/vendor/github.com/jacobsa/crypto/cmac/hash_generic.go b/vendor/github.com/jacobsa/crypto/cmac/hash_generic.go
+new file mode 100644
+index 0000000..235e3fc
+--- /dev/null
++++ b/vendor/github.com/jacobsa/crypto/cmac/hash_generic.go
+@@ -0,0 +1,40 @@
++// Copyright 2012 Aaron Jacobs. All Rights Reserved.
++// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
++//
++// Licensed under the Apache License, Version 2.0 (the "License");
++// you may not use this file except in compliance with the License.
++// You may obtain a copy of the License at
++//
++// http://www.apache.org/licenses/LICENSE-2.0
++//
++// Unless required by applicable law or agreed to in writing, software
++// distributed under the License is distributed on an "AS IS" BASIS,
++// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++// See the License for the specific language governing permissions and
++// limitations under the License.
++
++// +build riscv64
++
++// This code doesn't require that it's safe to perform unaligned word-sized loads, but has a poor performance.
++
++package cmac
++
++import (
++ "unsafe"
++)
++
++// XOR the blockSize bytes starting at a and b, writing the result over dst.
++func xorBlock(
++ dstPtr unsafe.Pointer,
++ aPtr unsafe.Pointer,
++ bPtr unsafe.Pointer) {
++ // Convert.
++ a := (*[blockSize]byte)(aPtr)
++ b := (*[blockSize]byte)(bPtr)
++ dst := (*[blockSize]byte)(dstPtr)
++
++ // Compute.
++ for i := 0; i < blockSize; i++ {
++ dst[i] = a[i] ^ b[i]
++ }
++}
+diff --git a/vendor/modules.txt b/vendor/modules.txt
+index 662f0c3..9b47daa 100644
+--- a/vendor/modules.txt
++++ b/vendor/modules.txt
+@@ -5,19 +5,11 @@ github.com/hanwen/go-fuse/v2/fuse
+ github.com/hanwen/go-fuse/v2/internal
+ github.com/hanwen/go-fuse/v2/internal/utimens
+ github.com/hanwen/go-fuse/v2/splice
+-# github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115
++# github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115 => github.com/aperturerobotics/jacobsa-crypto v0.0.0-20220403053904-77863254e607
+ ## explicit
+ github.com/jacobsa/crypto/cmac
+ github.com/jacobsa/crypto/common
+ github.com/jacobsa/crypto/siv
+-# github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd
+-## explicit
+-# github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff
+-## explicit
+-# github.com/jacobsa/ogletest v0.0.0-20170503003838-80d50a735a11
+-## explicit
+-# github.com/jacobsa/reqtrace v0.0.0-20150505043853-245c9e0234cb
+-## explicit
+ # github.com/pkg/xattr v0.4.3
+ ## explicit
+ github.com/pkg/xattr
+@@ -40,8 +32,6 @@ golang.org/x/crypto/pbkdf2
+ golang.org/x/crypto/poly1305
+ golang.org/x/crypto/scrypt
+ golang.org/x/crypto/ssh/terminal
+-# golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d
+-## explicit
+ # golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2
+ ## explicit
+ golang.org/x/sys/cpu
+@@ -52,3 +42,4 @@ golang.org/x/sys/windows
+ # golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b
+ ## explicit
+ golang.org/x/term
++# github.com/jacobsa/crypto => github.com/aperturerobotics/jacobsa-crypto v0.0.0-20220403053904-77863254e607
+--
+2.35.1
+
--
2.35.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [Buildroot] [PATCH 1/1] package/gocryptfs: fix build against riscv
2022-06-25 22:42 [Buildroot] [PATCH 1/1] package/gocryptfs: fix build against riscv Christian Stewart via buildroot
@ 2022-07-23 16:41 ` Thomas Petazzoni via buildroot
2022-07-23 19:44 ` Christian Stewart via buildroot
2022-08-02 22:06 ` Thomas Petazzoni via buildroot
1 sibling, 1 reply; 10+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-07-23 16:41 UTC (permalink / raw)
To: Christian Stewart
Cc: Anisse Astier, Yann E . MORIN, Christian Stewart via buildroot
Hello Christian,
On Sat, 25 Jun 2022 15:42:24 -0700
Christian Stewart via buildroot <buildroot@buildroot.org> wrote:
> Replace dependency jacobsa/crypto with a fork with support for riscv64.
>
> Fixes:
> - http://autobuild.buildroot.net/results/caa60874781c4077273884eb37281cc9e02ef9ac/
> - https://github.com/rfjakob/gocryptfs/issues/666
>
> Upstream PR: https://github.com/jacobsa/crypto/issues/13
>
> Signed-off-by: Christian Stewart <christian@paral.in>
> ---
> ...-fix-jacobsa-crypto-build-on-riscv64.patch | 152 ++++++++++++++++++
> 1 file changed, 152 insertions(+)
> create mode 100644 package/gocryptfs/0001-go.mod-fix-jacobsa-crypto-build-on-riscv64.patch
>
> diff --git a/package/gocryptfs/0001-go.mod-fix-jacobsa-crypto-build-on-riscv64.patch b/package/gocryptfs/0001-go.mod-fix-jacobsa-crypto-build-on-riscv64.patch
> new file mode 100644
> index 0000000000..90e3cc262d
> --- /dev/null
> +++ b/package/gocryptfs/0001-go.mod-fix-jacobsa-crypto-build-on-riscv64.patch
> @@ -0,0 +1,152 @@
> +From e9b64ab75e8539a52d60ecb299fc5425f0d27dc7 Mon Sep 17 00:00:00 2001
> +From: Christian Stewart <christian@paral.in>
> +Date: Sat, 25 Jun 2022 14:57:38 -0700
> +Subject: [PATCH] go.mod: fix jacobsa/crypto build on riscv64
> +
> +Replace dependency jacobsa/crypto with a fork with support for riscv64.
> +
> +Issue: https://github.com/rfjakob/gocryptfs/issues/666
> +
> +Upstream PR: https://github.com/jacobsa/crypto/issues/13
> +
> +Signed-off-by: Christian Stewart <christian@paral.in>
> +---
> + go.mod | 9 ++---
> + go.sum | 4 +-
You're patching go.mod/go.sum, and this patching happens after we have
done the vendoring of the dependencies in the download step (an issue
you have reported already), so how can this patch work? I am missing
something here?
> ++// Fixes build against risc-v
> ++// See: https://github.com/jacobsa/crypto/issues/13
> ++replace github.com/jacobsa/crypto => github.com/aperturerobotics/jacobsa-crypto v0.0.0-20220403053904-77863254e607 // xorblock-generic-1
This I understand of course.
> ++
> + require (
> + github.com/hanwen/go-fuse/v2 v2.1.1-0.20210825171523-3ab5d95a30ae
> + github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115
> +- github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd // indirect
> +- github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff // indirect
> +- github.com/jacobsa/ogletest v0.0.0-20170503003838-80d50a735a11 // indirect
> +- github.com/jacobsa/reqtrace v0.0.0-20150505043853-245c9e0234cb // indirect
But this?
> + github.com/pkg/xattr v0.4.3
> + github.com/rfjakob/eme v1.1.2
> + github.com/sabhiram/go-gitignore v0.0.0-20201211210132-54b8a0bf510f
> + github.com/spf13/pflag v1.0.5
> + golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
> +- golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect
And this? Why switching to a fork of the crypto library has impact on
other dependencies?
> +diff --git a/vendor/modules.txt b/vendor/modules.txt
> +index 662f0c3..9b47daa 100644
> +--- a/vendor/modules.txt
> ++++ b/vendor/modules.txt
> +@@ -5,19 +5,11 @@ github.com/hanwen/go-fuse/v2/fuse
> + github.com/hanwen/go-fuse/v2/internal
> + github.com/hanwen/go-fuse/v2/internal/utimens
> + github.com/hanwen/go-fuse/v2/splice
> +-# github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115
> ++# github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115 => github.com/aperturerobotics/jacobsa-crypto v0.0.0-20220403053904-77863254e607
> + ## explicit
> + github.com/jacobsa/crypto/cmac
> + github.com/jacobsa/crypto/common
> + github.com/jacobsa/crypto/siv
> +-# github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd
> +-## explicit
> +-# github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff
> +-## explicit
> +-# github.com/jacobsa/ogletest v0.0.0-20170503003838-80d50a735a11
> +-## explicit
> +-# github.com/jacobsa/reqtrace v0.0.0-20150505043853-245c9e0234cb
> +-## explicit
Same question here of course.
Thanks!
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/gocryptfs: fix build against riscv
2022-07-23 16:41 ` Thomas Petazzoni via buildroot
@ 2022-07-23 19:44 ` Christian Stewart via buildroot
2022-07-23 20:22 ` Thomas Petazzoni via buildroot
0 siblings, 1 reply; 10+ messages in thread
From: Christian Stewart via buildroot @ 2022-07-23 19:44 UTC (permalink / raw)
To: Thomas Petazzoni
Cc: Anisse Astier, Christian Stewart, Yann E . MORIN,
Christian Stewart via buildroot
[-- Attachment #1.1: Type: text/plain, Size: 1644 bytes --]
Hi Thomas,
On Sat, Jul 23, 2022, 9:41 AM Thomas Petazzoni <thomas.petazzoni@bootlin.com>
wrote:
>
> You're patching go.mod/go.sum, and this patching happens after we have
> done the vendoring of the dependencies in the download step (an issue
> you have reported already), so how can this patch work? I am missing
> something here?
>
The patch includes the changes to vendor/
> ++// Fixes build against risc-v
> > ++// See: https://github.com/jacobsa/crypto/issues/13
> > ++replace github.com/jacobsa/crypto =>
> github.com/aperturerobotics/jacobsa-crypto
> v0.0.0-20220403053904-77863254e607 // xorblock-generic-1
>
> This I understand of course.
>
> > ++
> > + require (
> > + github.com/hanwen/go-fuse/v2 v2.1.1-0.20210825171523-3ab5d95a30ae
> > + github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115
> > +- github.com/jacobsa/oglematchers
> v0.0.0-20150720000706-141901ea67cd // indirect
> > +- github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff //
> indirect
> > +- github.com/jacobsa/ogletest v0.0.0-20170503003838-80d50a735a11 //
> indirect
> > +- github.com/jacobsa/reqtrace v0.0.0-20150505043853-245c9e0234cb //
> indirect
>
> But this?
>
Go uses minimum version selection and indirect dependencies. If you change
the version of a dependency, it will also update any dependencies to be at
least the version selected by the updated dependency
That said if you check the patch to vendor/ these are really just
additional lines that explicitly say which version is imported, same
versions as before, there were no changes to vendor/ outside the one crypto
package.
Best,
Christian Stewart
[-- Attachment #1.2: Type: text/html, Size: 3318 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/gocryptfs: fix build against riscv
2022-07-23 19:44 ` Christian Stewart via buildroot
@ 2022-07-23 20:22 ` Thomas Petazzoni via buildroot
2022-07-24 23:42 ` Christian Stewart via buildroot
0 siblings, 1 reply; 10+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-07-23 20:22 UTC (permalink / raw)
To: Christian Stewart
Cc: Anisse Astier, Yann E . MORIN, Christian Stewart via buildroot
On Sat, 23 Jul 2022 12:44:01 -0700
Christian Stewart <christian@paral.in> wrote:
> > You're patching go.mod/go.sum, and this patching happens after we have
> > done the vendoring of the dependencies in the download step (an issue
> > you have reported already), so how can this patch work? I am missing
> > something here?
>
> The patch includes the changes to vendor/
Aaah, indeed, I missed that, but re-reading the patch it's now obvious.
> Go uses minimum version selection and indirect dependencies. If you change
> the version of a dependency, it will also update any dependencies to be at
> least the version selected by the updated dependency
Right.
> That said if you check the patch to vendor/ these are really just
> additional lines that explicitly say which version is imported, same
> versions as before, there were no changes to vendor/ outside the one crypto
> package.
But I see this:
-# github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd
-## explicit
-# github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff
-## explicit
-# github.com/jacobsa/ogletest v0.0.0-20170503003838-80d50a735a11
-## explicit
-# github.com/jacobsa/reqtrace v0.0.0-20150505043853-245c9e0234cb
-## explicit
So these lines are really removed.
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/gocryptfs: fix build against riscv
2022-07-23 20:22 ` Thomas Petazzoni via buildroot
@ 2022-07-24 23:42 ` Christian Stewart via buildroot
2022-07-25 6:25 ` Thomas Petazzoni via buildroot
0 siblings, 1 reply; 10+ messages in thread
From: Christian Stewart via buildroot @ 2022-07-24 23:42 UTC (permalink / raw)
To: Thomas Petazzoni
Cc: Anisse Astier, Christian Stewart, Yann E . MORIN,
Christian Stewart via buildroot
Thomas,
On Sat, Jul 23, 2022 at 1:22 PM Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
> But I see this:
>
> -# github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd
> -## explicit
> -# github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff
> -## explicit
> -# github.com/jacobsa/ogletest v0.0.0-20170503003838-80d50a735a11
> -## explicit
> -# github.com/jacobsa/reqtrace v0.0.0-20150505043853-245c9e0234cb
> -## explicit
>
> So these lines are really removed.
If you run 'go mod tidy' it removes these lines.
So, I guess they are unnecessary / not needed after the "replace" is added.
Because we're patching vendor/, if you want, you could drop all parts
of the go.mod and go.sum changes besides adding the "replace" line.
Best,
Christian
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/gocryptfs: fix build against riscv
2022-07-24 23:42 ` Christian Stewart via buildroot
@ 2022-07-25 6:25 ` Thomas Petazzoni via buildroot
2022-07-25 6:27 ` Christian Stewart via buildroot
0 siblings, 1 reply; 10+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-07-25 6:25 UTC (permalink / raw)
To: Christian Stewart
Cc: Anisse Astier, Yann E . MORIN, Christian Stewart via buildroot
On Sun, 24 Jul 2022 16:42:30 -0700
Christian Stewart <christian@paral.in> wrote:
> On Sat, Jul 23, 2022 at 1:22 PM Thomas Petazzoni
> <thomas.petazzoni@bootlin.com> wrote:
> > But I see this:
> >
> > -# github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd
> > -## explicit
> > -# github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff
> > -## explicit
> > -# github.com/jacobsa/ogletest v0.0.0-20170503003838-80d50a735a11
> > -## explicit
> > -# github.com/jacobsa/reqtrace v0.0.0-20150505043853-245c9e0234cb
> > -## explicit
> >
> > So these lines are really removed.
>
> If you run 'go mod tidy' it removes these lines.
>
> So, I guess they are unnecessary / not needed after the "replace" is added.
But that's precisely the part I don't understand: the fork of the
crypto lib is supposed to only have a fix to build with RISC-V... so why
does the fork has changes on its dependencies?
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/gocryptfs: fix build against riscv
2022-07-25 6:25 ` Thomas Petazzoni via buildroot
@ 2022-07-25 6:27 ` Christian Stewart via buildroot
2022-07-25 6:42 ` Thomas Petazzoni via buildroot
0 siblings, 1 reply; 10+ messages in thread
From: Christian Stewart via buildroot @ 2022-07-25 6:27 UTC (permalink / raw)
To: Thomas Petazzoni
Cc: Anisse Astier, Christian Stewart, Yann E . MORIN,
Christian Stewart via buildroot
Hi Thomas,
On Sun, Jul 24, 2022 at 11:26 PM Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
>
> On Sun, 24 Jul 2022 16:42:30 -0700
> Christian Stewart <christian@paral.in> wrote:
> > > So these lines are really removed.
> >
> > If you run 'go mod tidy' it removes these lines.
> >
> > So, I guess they are unnecessary / not needed after the "replace" is added.
>
> But that's precisely the part I don't understand: the fork of the
> crypto lib is supposed to only have a fix to build with RISC-V... so why
> does the fork has changes on its dependencies?
I don't think it's that the fork changed the deps, rather that the
newer version of Go (1.18) drops those lines whereas a previous
version would have kept them.
The dependencies didn't actually change or you would see more changes in vendor/
Best,
Christian
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/gocryptfs: fix build against riscv
2022-07-25 6:27 ` Christian Stewart via buildroot
@ 2022-07-25 6:42 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 10+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-07-25 6:42 UTC (permalink / raw)
To: Christian Stewart
Cc: Anisse Astier, Yann E . MORIN, Christian Stewart via buildroot
On Sun, 24 Jul 2022 23:27:46 -0700
Christian Stewart <christian@paral.in> wrote:
> I don't think it's that the fork changed the deps, rather that the
> newer version of Go (1.18) drops those lines whereas a previous
> version would have kept them.
Ah, ok, makes more sense to me, thanks for the explanation.
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/gocryptfs: fix build against riscv
2022-06-25 22:42 [Buildroot] [PATCH 1/1] package/gocryptfs: fix build against riscv Christian Stewart via buildroot
2022-07-23 16:41 ` Thomas Petazzoni via buildroot
@ 2022-08-02 22:06 ` Thomas Petazzoni via buildroot
2022-09-14 9:10 ` Peter Korsgaard
1 sibling, 1 reply; 10+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-08-02 22:06 UTC (permalink / raw)
To: Christian Stewart via buildroot; +Cc: Yann E . MORIN, Anisse Astier
On Sat, 25 Jun 2022 15:42:24 -0700
Christian Stewart via buildroot <buildroot@buildroot.org> wrote:
> Replace dependency jacobsa/crypto with a fork with support for riscv64.
>
> Fixes:
> - http://autobuild.buildroot.net/results/caa60874781c4077273884eb37281cc9e02ef9ac/
> - https://github.com/rfjakob/gocryptfs/issues/666
>
> Upstream PR: https://github.com/jacobsa/crypto/issues/13
>
> Signed-off-by: Christian Stewart <christian@paral.in>
> ---
> ...-fix-jacobsa-crypto-build-on-riscv64.patch | 152 ++++++++++++++++++
> 1 file changed, 152 insertions(+)
> create mode 100644 package/gocryptfs/0001-go.mod-fix-jacobsa-crypto-build-on-riscv64.patch
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-09-14 9:11 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-25 22:42 [Buildroot] [PATCH 1/1] package/gocryptfs: fix build against riscv Christian Stewart via buildroot
2022-07-23 16:41 ` Thomas Petazzoni via buildroot
2022-07-23 19:44 ` Christian Stewart via buildroot
2022-07-23 20:22 ` Thomas Petazzoni via buildroot
2022-07-24 23:42 ` Christian Stewart via buildroot
2022-07-25 6:25 ` Thomas Petazzoni via buildroot
2022-07-25 6:27 ` Christian Stewart via buildroot
2022-07-25 6:42 ` Thomas Petazzoni via buildroot
2022-08-02 22:06 ` Thomas Petazzoni via buildroot
2022-09-14 9:10 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox