From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-4.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.4 Received: by atuin.qyliss.net (Postfix, from userid 496) id B6C651BBA9; Fri, 2 Apr 2021 15:54:18 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id EEE3F1BB6C; Fri, 2 Apr 2021 15:53:56 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 4091E1BB67; Fri, 2 Apr 2021 15:53:55 +0000 (UTC) Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by atuin.qyliss.net (Postfix) with ESMTPS id A7DF91BB65 for ; Fri, 2 Apr 2021 15:53:50 +0000 (UTC) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id E293E5C00B4; Fri, 2 Apr 2021 11:53:49 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Fri, 02 Apr 2021 11:53:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h= from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm2; bh=ZuZWMLOtQ/xTElR3eM8mBOCjHD 24drWWJ+FHMXce0sA=; b=DnGgqt9xS9SVqVa+jLOIYtAFYnww01Vk+VimhwWIiI JGw/emj9f+eBsGXDb17riJ6BCEB9mXOxOgXlSUqh7g+STIfXcInRany3b1r6XmPd g1hEjPK30DctPmOdjjGVaDekjh72v4kUq08L8IheCl4Dn+S5w4KLTbFsW04zQ7mP MfKibp8hhCjIOurGqsj73jbqgfENjUkTRfIsIKub2fFqE37zGrAcK9DKlbQICD4S fBS7bRNkEyjMj5ai5bgY4zivoFy7BbU0yjiw6BoAFBEq0evtvJaQ6cA6d6hbMliI nY/PxUHKIPRG1w4aS301dDBcRCEqwK081XUpi9CzLvXA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=ZuZWML OtQ/xTElR3eM8mBOCjHD24drWWJ+FHMXce0sA=; b=OH6hkEnyA+6An1oZWSDuHg YnCG7BkyTK1i5RMJnRQlDWuIgZtrUHybWXM1GKFOi3xk+X4wRs1jMQjTWbqiRrsZ CoWgAMiKiZ7TImWE9D3XvxJYnqQBT8tEdpCVhVohw9FZy6zDWBoLoRkq38VbZ8ie vPPfrEGP/v637qRzscm384YrVuz01KIJ9P06JbcfUONkYn5LyIO4b8ZBi9Vg/9dn aSfHRkjmAuqVDaYI0pXm7HrEvTxyW4mG3Idtc8zTONwQFi+U3Alq823vakAI7s9j yDVIvmlYMedG3eXHa8bmA6jsgQ2ZfUDFWYDGYi6sGVb/eoi4PN+98LGWZvJQxTlQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudeiiedgledvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufgjfhffkfggtgesghdtreertddttdenucfhrhhomheptehlhihsshgr ucftohhsshcuoehhihesrghlhihsshgrrdhisheqnecuggftrfgrthhtvghrnhepueelve elgfekiefgtefghfegvdffffeludeuffffjeetueelgfdutdefvdeugeefnecuffhomhgr ihhnpehpsgdrtggtnecukfhppeejledrvdefuddrvdegfedrvddtudenucevlhhushhtvg hrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehhihesrghlhihsshgrrdhi sh X-ME-Proxy: Received: from x220.qyliss.net (p4fe7f3c9.dip0.t-ipconnect.de [79.231.243.201]) by mail.messagingengine.com (Postfix) with ESMTPA id 2B5711080066; Fri, 2 Apr 2021 11:53:49 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id C17AE580; Fri, 2 Apr 2021 15:53:47 +0000 (UTC) From: Alyssa Ross To: Jamie McClymont Subject: Re: [RFC PATCH 3/8] chromiumOSPackages.vm_protos: drop GN patch In-Reply-To: <0100017891d37021-77171648-c191-43da-b065-6eabe8fd7842-000000@email.amazonses.com> References: <20210402090042.2020627-1-jamie@kwiius.com> <0100017891d37021-77171648-c191-43da-b065-6eabe8fd7842-000000@email.amazonses.com> Date: Fri, 02 Apr 2021 15:53:45 +0000 Message-ID: <87pmzc8yye.fsf@alyssa.is> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Message-ID-Hash: NWW4MPEA2G2W7VPU6D5CAJ5KHGIRFXKD X-Message-ID-Hash: NWW4MPEA2G2W7VPU6D5CAJ5KHGIRFXKD X-MailFrom: hi@alyssa.is X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: devel@spectrum-os.org X-Mailman-Version: 3.3.1 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Jamie McClymont 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 Tested-by: Alyssa Ross 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-p= roto-fix-parallel-build.patch b/pkgs/os-specific/linux/chromium-os/vm_proto= s/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-fi= x-parallel-build.patch > +++ /dev/null > @@ -1,39 +0,0 @@ > -From dfed9458bf7abc1dc8f33a3e16ee179cde88e4e2 Mon Sep 17 00:00:00 2001 > -From: Alyssa Ross > -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/libfuzz= er-protos.fuzzer.grpc.pb.o > -FAILED: obj/out/Release/gen/include/vm_protos/proto_bindings/libfuzzer-p= rotos.fuzzer.grpc.pb.o > -c++ -MMD -MF obj/out/Release/gen/include/vm_protos/proto_bindings/libfuz= zer-protos.fuzzer.grpc.pb.o.d -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_= FILE_OFFSET_BITS=3D64 -Igen/include -I../../common-mk -I/usr/include -Igen = -Igen -Igen -Igen -Wall -Wunused -Wno-unused-parameter -Wunreachable-code -= ggdb3 -fstack-protector-strong -Wformat=3D2 -fvisibility=3Dinternal -Wa,--n= oexecstack -Wimplicit-fallthrough -Werror --sysroot=3D -fPIE -fvisibility= =3Ddefault -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/inclu= de -pthread -I/nix/store/pjl2q3lny3c18ypqjcv0q3akyq89hg2i-grpc-1.28.1/inclu= de -I/nix/store/hya0y6slws66h99njc2yiz02irfv4n62-openssl-1.1.1g-dev/include= -I/nix/store/mfpg3sk5vk9rm99hbpmd3dgvxqybd391-protobuf-3.8.0/include -Wno-= unreachable-code -std=3Dgnu++14 -fno-exceptions -fno-unwind-tables -fno-asy= nchronous-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/l= ibfuzzer-protos.fuzzer.grpc.pb.o > -In file included from gen/include/vm_protos/proto_bindings/fuzzer.grpc.p= b.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 > -Reviewed-by: Cole Helbling > ---- > - 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 =3D [ > - ":container-rpcs", > - ":tremplin-rpcs", > -+ ":vm-crash-rpcs", > - ] > - sources =3D [ > - "${proto_in_dir}/fuzzer.proto", > ---=20 > -2.26.2 > - > diff --git a/pkgs/os-specific/linux/chromium-os/vm_protos/default.nix b/p= kgs/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=3Ddeprecated-declarations" > ]; >=20=20 > - platform2Patches =3D [ ./0003-vm_tools-proto-fix-parallel-build.patch = ]; > - > postPatch =3D '' > substituteInPlace common-mk/proto_library.gni \ > --replace /usr/bin/grpc_cpp_plugin ${grpc}/bin/grpc_cpp_plugin > --=20 > 2.31.1 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEH9wgcxqlHM/ARR3h+dvtSFmyccAFAmBnPgoACgkQ+dvtSFmy ccAFDQ/9FajX5tm1xGQxQra41h1Y1SOg7QwqGosRhkadST8MqkD8I4uhWXVSB7Rp J6XW/RtaTiwEffJzg8Ze33m+ImjChh7vjLABp/KnZz01hQzGhjCDMmomWcEkM2Hl Im7gUXKT9u/z/nuuQG/+jaCNZTGCuDPz7YsR2PJr8JPqQmSyC/YpFwG+CwM4sm/D SwIj2wd/xkMPPm5I46cO2UkHBkhoMUDXYourm3h0awk4+xGM7fdqrr3r4hax3eo2 4c1An2SsWHRHcGALJyfQYI3yUqm1PRCatMw7uLZvWQX5be406LZbVVyK6alOxcQe /AJHCv+IezgsdPOFXE3SmWM4i+LIGnbLEmGQq7WFJc+l5kTQhbjRuk/TPqoKdZ1z 9KIa0//YqqkvQ8RmMb2S7UyHT5kFoROEQ2BLdJaf6qJ5+apFC0uYUoRrTgtSVJZ/ 3aoH3rE41Tg5Ho/3cAguc92Mu9wPRJtBy1A067QCBpeuF9Aj6bZxp2MPkeSw6zfa vHx1AiJw9OX9SC4hp+BCg5MKC8pMLEM4ZHJCcmRLMckaWSPYtRoKJh8EU+hjg2N7 zHUhqXgmlOeDC1qN273HIsL5DdDk90pgOsvCMUA2ONMh/0vzdgptxKbHAA/dvsGI TtuxLInO7trdrklQJfP8XwzKE/mA/Nc2n6SMj9E/AtfGKUIopGY= =sgOf -----END PGP SIGNATURE----- --=-=-=--