From: Alyssa Ross <hi@alyssa.is>
To: Jamie McClymont <jamie@kwiius.com>
Cc: devel@spectrum-os.org
Subject: Re: [RFC PATCH 3/8] chromiumOSPackages.vm_protos: drop GN patch
Date: Fri, 02 Apr 2021 15:53:45 +0000 [thread overview]
Message-ID: <87pmzc8yye.fsf@alyssa.is> (raw)
In-Reply-To: <0100017891d37021-77171648-c191-43da-b065-6eabe8fd7842-000000@email.amazonses.com>
[-- Attachment #1: Type: text/plain, Size: 4272 bytes --]
Jamie McClymont <jamie@kwiius.com> writes:
> The missing dependency has been added upstream
> ---
> ...03-vm_tools-proto-fix-parallel-build.patch | 39 -------------------
> .../linux/chromium-os/vm_protos/default.nix | 2 -
> 2 files changed, 41 deletions(-)
> delete mode 100644 pkgs/os-specific/linux/chromium-os/vm_protos/0003-vm_tools-proto-fix-parallel-build.patch
Reviewed-by: Alyssa Ross <hi@alyssa.is>
Tested-by: Alyssa Ross <hi@alyssa.is>
FWIW, I had to apply patch 4/8 before I could get to the error this was
causing.
> diff --git a/pkgs/os-specific/linux/chromium-os/vm_protos/0003-vm_tools-proto-fix-parallel-build.patch b/pkgs/os-specific/linux/chromium-os/vm_protos/0003-vm_tools-proto-fix-parallel-build.patch
> deleted file mode 100644
> index 93fa535ac7e..00000000000
> --- a/pkgs/os-specific/linux/chromium-os/vm_protos/0003-vm_tools-proto-fix-parallel-build.patch
> +++ /dev/null
> @@ -1,39 +0,0 @@
> -From dfed9458bf7abc1dc8f33a3e16ee179cde88e4e2 Mon Sep 17 00:00:00 2001
> -From: Alyssa Ross <hi@alyssa.is>
> -Date: Tue, 2 Jun 2020 00:21:08 +0000
> -Subject: [PATCH 3/6] vm_tools: proto: fix parallel build
> -
> -fuzzer-protos depends on vm-crash-rpcs, but this dependency wasn't
> -declared, causing build failures like the following:
> -
> -[26/52] CXX obj/out/Release/gen/include/vm_protos/proto_bindings/libfuzzer-protos.fuzzer.grpc.pb.o
> -FAILED: obj/out/Release/gen/include/vm_protos/proto_bindings/libfuzzer-protos.fuzzer.grpc.pb.o
> -c++ -MMD -MF obj/out/Release/gen/include/vm_protos/proto_bindings/libfuzzer-protos.fuzzer.grpc.pb.o.d -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Igen/include -I../../common-mk -I/usr/include -Igen -Igen -Igen -Igen -Wall -Wunused -Wno-unused-parameter -Wunreachable-code -ggdb3 -fstack-protector-strong -Wformat=2 -fvisibility=internal -Wa,--noexecstack -Wimplicit-fallthrough -Werror --sysroot= -fPIE -fvisibility=default -pthread -I/nix/store/pjl2q3lny3c18ypqjcv0q3akyq89hg2i-grpc-1.28.1/include -I/nix/store/hya0y6slws66h99njc2yiz02irfv4n62-openssl-1.1.1g-dev/include -I/nix/store/mfpg3sk5vk9rm99hbpmd3dgvxqybd391-protobuf-3.8.0/include -pthread -I/nix/store/pjl2q3lny3c18ypqjcv0q3akyq89hg2i-grpc-1.28.1/include -I/nix/store/hya0y6slws66h99njc2yiz02irfv4n62-openssl-1.1.1g-dev/include -I/nix/store/mfpg3sk5vk9rm99hbpmd3dgvxqybd391-protobuf-3.8.0/include -Wno-unreachable-code -std=gnu++14 -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -Wno-psabi -c gen/include/vm_protos/proto_bindings/fuzzer.grpc.pb.cc -o obj/out/Release/gen/include/vm_protos/proto_bindings/libfuzzer-protos.fuzzer.grpc.pb.o
> -In file included from gen/include/vm_protos/proto_bindings/fuzzer.grpc.pb.cc:5:
> -gen/include/vm_protos/proto_bindings/fuzzer.pb.h:38:10: fatal error: vm_crash.pb.h: No such file or directory
> - 38 | #include "vm_crash.pb.h"
> - | ^~~~~~~~~~~~~~~
> -compilation terminated.
> -ninja: build stopped: subcommand failed.
> -
> -Reported-by: Cole Helbling <cole.e.helbling@outlook.com>
> -Reviewed-by: Cole Helbling <cole.e.helbling@outlook.com>
> ----
> - vm_tools/proto/BUILD.gn | 1 +
> - 1 file changed, 1 insertion(+)
> -
> -diff --git a/vm_tools/proto/BUILD.gn b/vm_tools/proto/BUILD.gn
> -index 713b81853..a25265cab 100644
> ---- a/vm_tools/proto/BUILD.gn
> -+++ b/vm_tools/proto/BUILD.gn
> -@@ -70,6 +70,7 @@ proto_library("fuzzer-protos") {
> - deps = [
> - ":container-rpcs",
> - ":tremplin-rpcs",
> -+ ":vm-crash-rpcs",
> - ]
> - sources = [
> - "${proto_in_dir}/fuzzer.proto",
> ---
> -2.26.2
> -
> diff --git a/pkgs/os-specific/linux/chromium-os/vm_protos/default.nix b/pkgs/os-specific/linux/chromium-os/vm_protos/default.nix
> index 4f0aae3be38..e87d0c57e78 100644
> --- a/pkgs/os-specific/linux/chromium-os/vm_protos/default.nix
> +++ b/pkgs/os-specific/linux/chromium-os/vm_protos/default.nix
> @@ -12,8 +12,6 @@ common-mk {
> "-Wno-error=deprecated-declarations"
> ];
>
> - platform2Patches = [ ./0003-vm_tools-proto-fix-parallel-build.patch ];
> -
> postPatch = ''
> substituteInPlace common-mk/proto_library.gni \
> --replace /usr/bin/grpc_cpp_plugin ${grpc}/bin/grpc_cpp_plugin
> --
> 2.31.1
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
next prev parent reply other threads:[~2021-04-02 15:54 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20210402090042.2020627-1-jamie@kwiius.com>
2021-04-02 9:04 ` [RFC PATCH 4/8] chromiumOSPackages.common-mk: update patches Jamie McClymont
2021-04-02 15:47 ` Alyssa Ross
2021-04-02 9:04 ` [RFC PATCH 3/8] chromiumOSPackages.vm_protos: drop GN patch Jamie McClymont
2021-04-02 15:53 ` Alyssa Ross [this message]
2021-04-02 9:04 ` [RFC PATCH 2/8] chromiumOSPackages.cros_linux: fix config Jamie McClymont
2021-04-02 15:35 ` Alyssa Ross
2021-04-02 9:04 ` [RFC PATCH 1/8] chromiumOSPackages: update 83->89 Jamie McClymont
2021-04-02 14:58 ` Alyssa Ross
2021-04-02 9:04 ` [RFC PATCH 5/8] chromiumOSPackages.common-mk: disable clang-only warnings Jamie McClymont
2021-04-02 15:54 ` Alyssa Ross
2021-04-02 9:04 ` [RFC PATCH 7/8] chromiumOSPackages.crosvm: add platform2 dep Jamie McClymont
2021-04-02 9:04 ` [RFC PATCH 8/8] chromiumOSPackages.crosvm: bump cargoSha256 Jamie McClymont
2021-04-02 9:04 ` [RFC PATCH 6/8] chromiumOSPackages.sommelier: drop unneeded patches Jamie McClymont
2021-04-02 16:11 ` Alyssa Ross
2021-04-02 17:28 ` Alyssa Ross
2021-04-02 17:18 ` Thomas Leonard
2021-04-02 21:00 ` [PATCH platform2] Revert "Revert "vm_tools: sommelier: Switch to the stable version of xdg-shell"" Alyssa Ross
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=87pmzc8yye.fsf@alyssa.is \
--to=hi@alyssa.is \
--cc=devel@spectrum-os.org \
--cc=jamie@kwiius.com \
/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.
Code repositories for project(s) associated with this public inbox
https://spectrum-os.org/git/crosvm
https://spectrum-os.org/git/doc
https://spectrum-os.org/git/mktuntap
https://spectrum-os.org/git/nixpkgs
https://spectrum-os.org/git/spectrum
https://spectrum-os.org/git/ucspi-vsock
https://spectrum-os.org/git/www
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).