From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.5 (2021-03-20) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-4.5 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_LOW,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.5 Received: by atuin.qyliss.net (Postfix, from userid 496) id CB782195F7; Sat, 29 May 2021 14:42:29 +0000 (UTC) Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 2B3F7194EE; Sat, 29 May 2021 14:41:53 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id E740C1940F; Sat, 29 May 2021 14:41:48 +0000 (UTC) Received: from wforward1-smtp.messagingengine.com (wforward1-smtp.messagingengine.com [64.147.123.30]) by atuin.qyliss.net (Postfix) with ESMTPS id F40E81940B for ; Sat, 29 May 2021 14:41:42 +0000 (UTC) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailforward.west.internal (Postfix) with ESMTP id 1892810E8; Sat, 29 May 2021 10:41:41 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sat, 29 May 2021 10:41:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding: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=SMR/IXdWSTRfzUYkld8UFuBjrLJzmvQkYcmWk+f4I9I=; b=gcKGPhYL 87NtJf5Z5kID8Dr7K74Wr8AJr0NUxyLYj5jXT9kGflSJ8OC32ggWR+lb4+QtZD8r /a3hYyIRD8xmxnM10VlTEQaiGUCkvMmGE6BEBQxD+Pa/1sb4K7YQbMdEz5v8GeIw 12IY2fINwzhMB3ER39FrZI37ir9XhRSnt6ctAGIHu94HbDL15zX0/didncdHw14N 5LIebQ6AlWuHbHLTs6pzHvjOIrqW0G28j656GaMP3r4QGBj/PJC/Jn8wJNeRYgCs 7f50diOM4vfYfheDQOoo8ksPq1Fs920X+l5tvR64/mhtKg0tbLrsbXPzsOq+rhdO /FJBldWOmAyZMg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvdekledgkedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtqhertdertddtnecuhfhrohhmpeetlhihshhs rgcutfhoshhsuceohhhisegrlhihshhsrgdrihhsqeenucggtffrrghtthgvrhhnpeefie ehteeijeetffetkefhiefftdfgtefhudetueeffeetfedvtdelteelgeeugfenucffohhm rghinhepphgsrdgttgenucfkphepgeeirdektddrudefkedrjeefnecuvehluhhsthgvrh fuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepqhihlhhishhsseigvddvtddr qhihlhhishhsrdhnvght X-ME-Proxy: Received: from x220.qyliss.net (p2e508a49.dip0.t-ipconnect.de [46.80.138.73]) by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 29 May 2021 10:41:40 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 5083F18BA; Sat, 29 May 2021 14:41:39 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH nixpkgs v2 4/8] chromiumOSPackages.vm_protos: drop GN patch Date: Sat, 29 May 2021 14:41:13 +0000 Message-Id: <20210529144117.571353-5-hi@alyssa.is> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210529144117.571353-1-hi@alyssa.is> References: <20210529144117.571353-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: EKWDSWBPHRMNO6LZUGIWOKQBDHIPVMTT X-Message-ID-Hash: EKWDSWBPHRMNO6LZUGIWOKQBDHIPVMTT X-MailFrom: qyliss@x220.qyliss.net 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; digests; suspicious-header CC: Jamie McClymont X-Mailman-Version: 3.3.4 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Jamie McClymont The missing dependency has been added upstream. Reviewed-by: Alyssa Ross Tested-by: Alyssa Ross --- ...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_to= ols-proto-fix-parallel-build.patch diff --git a/pkgs/os-specific/linux/chromium-os/vm_protos/0003-vm_tools-pro= to-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 -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-pro= tos.fuzzer.grpc.pb.o -c++ -MMD -MF obj/out/Release/gen/include/vm_protos/proto_bindings/libfuzze= r-protos.fuzzer.grpc.pb.o.d -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FI= LE_OFFSET_BITS=3D64 -Igen/include -I../../common-mk -I/usr/include -Igen -I= gen -Igen -Igen -Wall -Wunused -Wno-unused-parameter -Wunreachable-code -gg= db3 -fstack-protector-strong -Wformat=3D2 -fvisibility=3Dinternal -Wa,--noe= xecstack -Wimplicit-fallthrough -Werror --sysroot=3D -fPIE -fvisibility=3Dd= efault -pthread -I/nix/store/pjl2q3lny3c18ypqjcv0q3akyq89hg2i-grpc-1.28.1/i= nclude -I/nix/store/hya0y6slws66h99njc2yiz02irfv4n62-openssl-1.1.1g-dev/inc= lude -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-unre= achable-code -std=3Dgnu++14 -fno-exceptions -fno-unwind-tables -fno-asynchr= onous-unwind-tables -Wno-psabi -c gen/include/vm_protos/proto_bindings/fuzz= er.grpc.pb.cc -o obj/out/Release/gen/include/vm_protos/proto_bindings/libfu= zzer-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_cr= ash.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/pkg= s/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 - 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