Re: [PATCH v2 2/2] chromiumOSPackages: 81.12871.0.0-rc1 -> 83.13020.0.0-rc1

Cole Helbling
2020-05-31T23:54:37Z

On Sun May 31, 2020 at 3:01 AM, Alyssa Ross wrote:
> crosvm now needs the Minijail sources. However, it'll notice that a
> Minijail package is provided via pkg-config, and then not actually use
> those sources or build its own Minijail. It would be nice if the
> Minijail we provide could be the same version as in Chromium OS, which
> means bringing Minijail under chromiumOSPackages.
>
> A couple of backports are no longer required; one to common-mk and one
> to Linux.
> ---
> v1 of this patch was corrupt, due to an editor misconfiguration that
> made it strip trailing whitespace when I saved the patch after
> annotating it.
>
> Additionally, I've now DRYed the fetchFromGitiles calls in crosvm.
>
> ...ommon-mk-.gn-don-t-hardcode-env-path.patch | 4 +-
> ...-Suppress-Wrange-loop-analysis-warni.patch | 72 -----
> .../linux/chromium-os/common-mk/default.nix | 1 -
> .../linux/chromium-os/crosvm/default.nix | 34 ++-
> .../os-specific/linux/chromium-os/default.nix | 4 +-
> .../linux/chromium-os/modem-manager/next.nix | 5 +-
> ...er-don-t-leak-source-absolute-paths.patch} | 4 +-
> ...elier-use-stable-xdg-shell-protocol.patch} | 54 ++--
> ...melier-make-building-demos-optional.patch} | 4 +-
> ...er-Log-the-value-of-strerror-when-as.patch | 245 ------------------
> .../linux/chromium-os/sommelier/default.nix | 7 +-
> pkgs/os-specific/linux/chromium-os/update.py | 1 +
> .../linux/chromium-os/upstream-info.json | 42 +--
> ...virtwl-Support-multiple-host-sockets.patch | 126 ---------
> pkgs/os-specific/linux/kernel/patches.nix | 5 -
> 16 files changed, 83 insertions(+), 529 deletions(-)

When running `nix-build . -A spectrumPackages.spectrum-vm` with these
two patches applied, vm_protos fails to build:

[23/52] ACTION //vm_tools/proto:fuzzer-protos_gen(//common-mk/toolchain:toolchain)
/usr/share/proto: warning: directory does not exist.
[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.
builder for '/nix/store/8asskz117p1nhirxaa4pwa0caayxg6c5-vm_protos-83.13020.0.0-rc1.drv' failed with exit code 1

Cole