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 78EB419761; Sat, 29 May 2021 14:43:30 +0000 (UTC) Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 4E73919572; Sat, 29 May 2021 14:42:00 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id AEE601943A; Sat, 29 May 2021 14:41:53 +0000 (UTC) Received: from wforward1-smtp.messagingengine.com (wforward1-smtp.messagingengine.com [64.147.123.30]) by atuin.qyliss.net (Postfix) with ESMTPS id 0497D1949F 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 189A811E4; 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=Po3CJtoXOvNOVBb6X6DlsG1qefld1xeAeEqZimdwL8g=; b=pVHJ84A0 59BddDvp0usTj7tgRx/C9JQY49yE1Ve6BYuqBglRcwipfPC/uRdOixSbWKBfNdVZ OpOHCxXpbXxVNE45EEJytY3E7V9ShZ1nUwfi6kBJ1rvyKZIAZxGgAdr6jKovypCd vbcL2TXqravnRO+quNlWnft/QyNDWaOYS6mRDES06kvxpW6SnS9GgmhkyVa1J3fG gwtb7/oddxHgHfey0XFhgwxNQqrzu0tMAR7mVvX1KGfTFoS/UDM38gxYjvUzXo25 tnXu9SKbTJzcAvmqD93kl5UbNRvFUwNP32Efrt3w/bulM+ILhau5HEe3C9J0+29X ov5FrYjgcxuDpw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvdekledgkedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeetlhihshhs rgcutfhoshhsuceohhhisegrlhihshhsrgdrihhsqeenucggtffrrghtthgvrhhnpeevje eutdefleekgfffueeghedtheelfeduueeggedthfdvffehudeukeffjeekvdenucffohhm rghinhepghhithhhuhgsrdgtohhmnecukfhppeegiedrkedtrddufeekrdejfeenucevlh hushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehqhihlihhsshes gidvvddtrdhqhihlihhsshdrnhgvth 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 4339A1868; Sat, 29 May 2021 14:41:39 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH nixpkgs v2 3/8] chromiumOSPackages.common-mk: update patches Date: Sat, 29 May 2021 14:41:12 +0000 Message-Id: <20210529144117.571353-4-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: 8bit Message-ID-Hash: LXFJIA7RRAI6WTGJGRE7LQDRDNH63YJJ X-Message-ID-Hash: LXFJIA7RRAI6WTGJGRE7LQDRDNH63YJJ 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 Reviewed-by: Alyssa Ross Tested-by: Alyssa Ross --- ...-mk-don-t-leak-source-absolute-paths.patch | 115 ++++++++++++++---- ...ommon-mk-.gn-don-t-hardcode-env-path.patch | 8 +- 2 files changed, 95 insertions(+), 28 deletions(-) diff --git a/pkgs/os-specific/linux/chromium-os/common-mk/0001-common-mk-don-t-leak-source-absolute-paths.patch b/pkgs/os-specific/linux/chromium-os/common-mk/0001-common-mk-don-t-leak-source-absolute-paths.patch index 4b7a2f34779..479cb96eddf 100644 --- a/pkgs/os-specific/linux/chromium-os/common-mk/0001-common-mk-don-t-leak-source-absolute-paths.patch +++ b/pkgs/os-specific/linux/chromium-os/common-mk/0001-common-mk-don-t-leak-source-absolute-paths.patch @@ -1,23 +1,25 @@ -From 22f33cfdfacc8c4536a8bf883b4c8b54e30599a3 Mon Sep 17 00:00:00 2001 +From 8b87e0d6ee0e645d1ac2b27c2fba0c97f2929e31 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 24 Nov 2019 16:56:11 +0000 -Subject: [PATCH 1/6] common-mk: don't leak source-absolute paths +Subject: [PATCH 1/4] common-mk: don't leak source-absolute paths Source-absolute paths like //vm_tools/whatever were being leaked to subprocesses, which of course didn't know how to understand them. With this patch, source-absolute paths are only used to tell GN the outputs, and normal Unix paths are passed to subprocesses. --- - common-mk/external_dependencies/BUILD.gn | 3 ++- - common-mk/pkg_config.gni | 7 +++---- - common-mk/proto_library.gni | 21 +++++++++++---------- - 3 files changed, 16 insertions(+), 15 deletions(-) + common-mk/external_dependencies/BUILD.gn | 3 ++- + common-mk/mojom_bindings_generator.gni | 12 ++++++------ + common-mk/mojom_type_mappings_generator.gni | 2 +- + common-mk/pkg_config.gni | 5 +++-- + common-mk/proto_library.gni | 21 +++++++++++---------- + 5 files changed, 23 insertions(+), 20 deletions(-) diff --git a/common-mk/external_dependencies/BUILD.gn b/common-mk/external_dependencies/BUILD.gn -index 61f571b38..4cb7b93cf 100644 +index dbf45368ff..94aae4e2e2 100644 --- a/common-mk/external_dependencies/BUILD.gn +++ b/common-mk/external_dependencies/BUILD.gn -@@ -47,6 +47,7 @@ genxml2cpp("dbus-proxies") { +@@ -45,6 +45,7 @@ genxml2cpp("dbus-proxies") { action("cloud_policy_proto_generator") { policy_resources_dir = "${sysroot}/usr/share/policy_resources" proto_out_dir = "${target_gen_dir}/proto" @@ -25,26 +27,91 @@ index 61f571b38..4cb7b93cf 100644 policy_tools_dir = "${sysroot}/usr/share/policy_tools" script = "${policy_tools_dir}/generate_policy_source.py" -@@ -58,7 +59,7 @@ action("cloud_policy_proto_generator") { - "${proto_out_dir}/cloud_policy.proto", +@@ -54,7 +55,7 @@ action("cloud_policy_proto_generator") { ] + outputs = [ "${proto_out_dir}/cloud_policy.proto" ] args = [ - "--cloud-policy-protobuf=${proto_out_dir}/cloud_policy.proto", + "--cloud-policy-protobuf=${cloud_policy_protobuf_dir}/cloud_policy.proto", "--chrome-version-file=${policy_resources_dir}/VERSION", "--target-platform=chromeos", "--policy-templates-file=${policy_resources_dir}/policy_templates.json", +diff --git a/common-mk/mojom_bindings_generator.gni b/common-mk/mojom_bindings_generator.gni +index 038c20ed36..205d7d3037 100644 +--- a/common-mk/mojom_bindings_generator.gni ++++ b/common-mk/mojom_bindings_generator.gni +@@ -100,7 +100,7 @@ template("generate_mojom_bindings_gen") { + args = [ + "mkdir", + "-p", +- mojo_templates_dir, ++ rebase_path(mojo_templates_dir), + ] + } + +@@ -116,7 +116,7 @@ template("generate_mojom_bindings_gen") { + args = [ + "--use_bundled_pylibs", + "-o", +- mojo_templates_dir, ++ rebase_path(mojo_templates_dir), + "precompile", + ] + deps = [ ":${mojo_templates_dir_action_name}" ] +@@ -143,7 +143,7 @@ template("generate_mojom_bindings_gen") { + args = [ + "--mojom-file-list={{response_file_name}}", + "--output-root", +- _mojo_output_base, ++ rebase_path(_mojo_output_base), + "--input-root", + mojo_root, # Mojo depth. + "--input-root", +@@ -188,11 +188,11 @@ template("generate_mojom_bindings_gen") { + mojom_bindings_generator, + "--use_bundled_pylibs", + "--output_dir", +- _mojo_output_base, ++ rebase_path(_mojo_output_base), + "generate", + "--filelist={{response_file_name}}", + "--bytecode_path", +- mojo_templates_dir, ++ rebase_path(mojo_templates_dir), + "-I", + mojo_root, # Mojo include path. + "-d", +@@ -216,7 +216,7 @@ template("generate_mojom_bindings_gen") { + foreach(typemap, invoker.typemaps) { + args += [ + "--typemap", +- typemap, ++ rebase_path(typemap), + ] + } + } +diff --git a/common-mk/mojom_type_mappings_generator.gni b/common-mk/mojom_type_mappings_generator.gni +index ff09397111..959a8b6ca9 100644 +--- a/common-mk/mojom_type_mappings_generator.gni ++++ b/common-mk/mojom_type_mappings_generator.gni +@@ -21,7 +21,7 @@ template("generate_mojom_type_mappings") { + outputs = [ "$target_gen_dir/${target_name}_typemapping" ] + args = [ + "--output", +- "$target_gen_dir/${target_name}_typemapping", ++ rebase_path("$target_gen_dir/${target_name}_typemapping"), + ] + rebase_path(sources, root_build_dir) + } + } diff --git a/common-mk/pkg_config.gni b/common-mk/pkg_config.gni -index af3c3fb4c..151c49e56 100644 +index 24e2cf1401..151c49e560 100644 --- a/common-mk/pkg_config.gni +++ b/common-mk/pkg_config.gni -@@ -81,12 +81,11 @@ template("generate_pkg_config") { +@@ -81,10 +81,11 @@ template("generate_pkg_config") { if (!defined(output_name)) { output_name = name } -- outputs = [ -- "${target_out_dir}/${output_name}.pc", -- ] +- outputs = [ "${target_out_dir}/${output_name}.pc" ] + lib_path = "${target_out_dir}/${output_name}.pc" + outputs = [ lib_path ] @@ -55,7 +122,7 @@ index af3c3fb4c..151c49e56 100644 args += [ "--description=" + description ] } diff --git a/common-mk/proto_library.gni b/common-mk/proto_library.gni -index 7fcb08341..692704288 100644 +index 68b7904acc..2bef5f44ef 100644 --- a/common-mk/proto_library.gni +++ b/common-mk/proto_library.gni @@ -56,7 +56,7 @@ template("proto_library") { @@ -106,7 +173,7 @@ index 7fcb08341..692704288 100644 outputs += [ "${cc_dir}/{{source_name_part}}.pb.cc", "${cc_dir}/{{source_name_part}}.pb.h", -@@ -208,7 +207,9 @@ template("goproto_library") { +@@ -218,7 +217,9 @@ template("goproto_library") { # otherwise file descriptor var name will conflict. # cf) https://github.com/golang/protobuf/issues/109 @@ -116,16 +183,16 @@ index 7fcb08341..692704288 100644 # Build protoc command line to run. script = "//common-mk/file_generator_wrapper.py" -@@ -224,7 +225,7 @@ template("goproto_library") { - "--proto_path", - "${sysroot}/usr/share/proto", +@@ -258,7 +259,7 @@ template("goproto_library") { "--go_out", -- "${go_out_prefix}${root_gen_dir}/${proto_out_dir}", -+ "${go_out_prefix}${proto_out_dir}", + + # go_out_prefix can be empty, so we can always add a colon here. +- "${go_out_prefix}:${root_gen_dir}/${proto_out_dir}", ++ "${go_out_prefix}:${proto_out_dir}", ] foreach(source, sources) { args += [ rebase_path(source) ] -@@ -234,7 +235,7 @@ template("goproto_library") { +@@ -268,7 +269,7 @@ template("goproto_library") { outputs = [] foreach(source, invoker.sources) { name = get_path_info(source, "name") @@ -135,5 +202,5 @@ index 7fcb08341..692704288 100644 } } -- -2.26.2 +2.30.0 diff --git a/pkgs/os-specific/linux/chromium-os/common-mk/0002-common-mk-.gn-don-t-hardcode-env-path.patch b/pkgs/os-specific/linux/chromium-os/common-mk/0002-common-mk-.gn-don-t-hardcode-env-path.patch index 592002c406f..feac017d253 100644 --- a/pkgs/os-specific/linux/chromium-os/common-mk/0002-common-mk-.gn-don-t-hardcode-env-path.patch +++ b/pkgs/os-specific/linux/chromium-os/common-mk/0002-common-mk-.gn-don-t-hardcode-env-path.patch @@ -1,7 +1,7 @@ -From 51ed7b957069bd3765222a466473c696755caa5e Mon Sep 17 00:00:00 2001 +From 1589ff7aa30d61be9ebe4b53a1b8d504b72ff4de Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 24 Nov 2019 17:20:46 +0000 -Subject: [PATCH 2/6] common-mk: .gn: don't hardcode env path +Subject: [PATCH 2/4] common-mk: .gn: don't hardcode env path This is needlessly non-portable. --- @@ -9,7 +9,7 @@ This is needlessly non-portable. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gn b/.gn -index e7dba8c91..e29fcd61e 100644 +index e7dba8c91c..e29fcd61ee 100644 --- a/.gn +++ b/.gn @@ -7,4 +7,4 @@ root = "//common-mk/gn_root/:" @@ -19,5 +19,5 @@ index e7dba8c91..e29fcd61e 100644 -script_executable = "/usr/bin/env" +script_executable = "env" -- -2.26.2 +2.30.0 -- 2.31.1