uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
|
|
@ -0,0 +1,43 @@
|
|||
From e9ffd084ec1ff9f7bfc86879732953dc58256958 Mon Sep 17 00:00:00 2001
|
||||
From: Loko Kung <lokokung@google.com>
|
||||
Date: Tue, 3 May 2022 00:28:53 +0000
|
||||
Subject: [PATCH] Wrap get_gitHash in try-catch to prevent failures in tarball
|
||||
builds.
|
||||
|
||||
Bug: chromium:1321370
|
||||
Change-Id: If39d2236d1b4d965f7bd189f6bd1cdc70436c41d
|
||||
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/88582
|
||||
Commit-Queue: Loko Kung <lokokung@google.com>
|
||||
Reviewed-by: Austin Eng <enga@chromium.org>
|
||||
Kokoro: Kokoro <noreply+kokoro@google.com>
|
||||
(cherry picked from commit 03ddfbb81fb4127ca37ea53e70fcb34fe851e24e)
|
||||
---
|
||||
third_party/dawn/generator/dawn_version_generator.py | 13 ++++++++-----
|
||||
1 file changed, 8 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/third_party/dawn/generator/dawn_version_generator.py b/third_party/dawn/generator/dawn_version_generator.py
|
||||
index 1907e88da..3c1927bee 100644
|
||||
--- a/third_party/dawn/generator/dawn_version_generator.py
|
||||
+++ b/third_party/dawn/generator/dawn_version_generator.py
|
||||
@@ -23,11 +23,14 @@ def get_git():
|
||||
|
||||
|
||||
def get_gitHash(dawnDir):
|
||||
- result = subprocess.run([get_git(), 'rev-parse', 'HEAD'],
|
||||
- stdout=subprocess.PIPE,
|
||||
- cwd=dawnDir)
|
||||
- if result.returncode == 0:
|
||||
- return result.stdout.decode('utf-8').strip()
|
||||
+ try:
|
||||
+ result = subprocess.run([get_git(), "rev-parse", "HEAD"],
|
||||
+ stdout=subprocess.PIPE,
|
||||
+ cwd=dawnDir)
|
||||
+ if result.returncode == 0:
|
||||
+ return result.stdout.decode("utf-8").strip()
|
||||
+ except Exception:
|
||||
+ return ""
|
||||
# No hash was available (possibly) because the directory was not a git checkout. Dawn should
|
||||
# explicitly handle its absenece and disable features relying on the hash, i.e. caching.
|
||||
return ''
|
||||
--
|
||||
2.36.0
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
--- chromium-70.0.3538.67/build/compute_build_timestamp.py.orig 2018-11-02 16:00:34.368933077 +0200
|
||||
+++ chromium-70.0.3538.67/build/compute_build_timestamp.py 2018-11-08 04:06:21.658105129 +0200
|
||||
@@ -94,6 +94,14 @@
|
||||
'build_type', help='The type of build', choices=('official', 'default'))
|
||||
args = argument_parser.parse_args()
|
||||
|
||||
+ # I don't trust LASTCHANGE magic, and I definelly want something deterministic here
|
||||
+ SOURCE_DATE_EPOCH = os.getenv("SOURCE_DATE_EPOCH", None)
|
||||
+ if SOURCE_DATE_EPOCH is not None:
|
||||
+ print(SOURCE_DATE_EPOCH)
|
||||
+ return 0
|
||||
+ else:
|
||||
+ raise RuntimeError("SOURCE_DATE_EPOCH not set")
|
||||
+
|
||||
# The mtime of the revision in build/util/LASTCHANGE is stored in a file
|
||||
# next to it. Read it, to get a deterministic time close to "now".
|
||||
# That date is then modified as described at the top of the file so that
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/third_party/widevine/cdm/BUILD.gn b/third_party/widevine/cdm/BUILD.gn
|
||||
index ed0e2f5208b..5b431a030d5 100644
|
||||
--- a/third_party/widevine/cdm/BUILD.gn
|
||||
+++ b/third_party/widevine/cdm/BUILD.gn
|
||||
@@ -14,7 +14,7 @@ buildflag_header("buildflags") {
|
||||
|
||||
flags = [
|
||||
"ENABLE_WIDEVINE=$enable_widevine",
|
||||
- "BUNDLE_WIDEVINE_CDM=$bundle_widevine_cdm",
|
||||
+ "BUNDLE_WIDEVINE_CDM=true",
|
||||
"ENABLE_WIDEVINE_CDM_COMPONENT=$enable_widevine_cdm_component",
|
||||
]
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue