Re: [Buildroot] [PATCH 1/1] package/gocryptfs: fix build against riscv

[Thomas Petazzoni via buildroot <buildroot@buildroot.org>]

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