Skip to content

Commit 7ff22c9

Browse files
committed
chromium: update to 97.0.4692.71
Release notes - https://chromereleases.googleblog.com/2022/01/stable-channel-update-for-desktop.html License changes: --------------- No changes. --------------- Test-built with: * chromium-ozone-wayland: * honister, clang, MACHINE="intel-corei7-64" * honister, clang, MACHINE="raspberrypi3 * hardknott, clang, MACHINE="raspberrypi3 * dunfell, clang**, MACHINE="qemuarm64" * dunfell, clang**, MACHINE="m3ulcb" * chromium-x11 * honister, clang, MACHINE="raspberrypi3" * hardknott, clang, MACHINE="raspberrypi3" * dunfell, clang**, MACHINE="raspberrypi3" ** Please note that Chromium requires clang version to be >= 12. For that, when on dunfell branch, use meta-clang/clang12 branch.
1 parent d25d8ee commit 7ff22c9

20 files changed

+225
-229
lines changed

meta-chromium/recipes-browser/chromium/chromium-gn.inc

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@ SRC_URI += " \
1818
file://0007-Delete-compiler-options-not-available-in-release-ver.patch \
1919
file://0008-avoid-link-latomic-failure-on-CentOS-8-host.patch \
2020
file://0009-nomerge-attribute-on-declaration-is-only-available-s.patch \
21-
file://0011-exception_handler.cc-Match-the-types-for-SIGSTKSZ.patch \
22-
file://0013-Revert-Use-ffile-compilation-dir-instead-of-fdebug-c.patch \
23-
file://0014-ozone-wayland-don-t-build-xcb-for-pure-wayland-build.patch \
24-
file://0015-IWYU-add-memory-for-std-unique_ptr-in-base-CommandLi.patch \
21+
file://0010-exception_handler.cc-Match-the-types-for-SIGSTKSZ.patch \
22+
file://0011-Revert-Use-ffile-compilation-dir-instead-of-fdebug-c.patch \
23+
file://0012-ozone-wayland-don-t-build-xcb-for-pure-wayland-build.patch \
2524
"
2625

2726
SRC_URI:append:libc-musl = "\
@@ -363,6 +362,26 @@ python do_create_v8_qemu_wrapper () {
363362
do_create_v8_qemu_wrapper[dirs] = "${B}"
364363
addtask create_v8_qemu_wrapper after do_patch before do_configure
365364

365+
# Check the LLVMVERSION defined in the meta-clang layer. Given Chromium is
366+
# developed using new C++ features, the LLVMVERSION has to be >= 12. Otherwise,
367+
# it is not guaranteed that Chromium will compile.
368+
python do_check_llvm_version () {
369+
from distutils.version import LooseVersion
370+
371+
min_llvm_version = "12.0.0"
372+
llvm_version = d.getVar('LLVMVERSION', False)
373+
if not llvm_version:
374+
bb.warn("Unable to determine LLVM version. Chromium may not be compiled "
375+
"successfully if the LLVM version is below %s." % min_llvm_version)
376+
return
377+
378+
if LooseVersion(llvm_version) < LooseVersion(min_llvm_version):
379+
bb.fatal("Your LLVMVERSION (%s) is lower than the minimum required "
380+
"LLVMVERSION (%s). If you are using dunfell, make sure you "
381+
"use clang12 branch." % (llvm_version, min_llvm_version))
382+
}
383+
addtask check_llvm_version before do_configure
384+
366385
python do_write_toolchain_file () {
367386
"""Writes a BUILD.gn file for Yocto detailing its toolchains."""
368387
toolchain_dir = d.expand("${S}/build/toolchain/yocto")

meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_96.0.4664.110.bb renamed to meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_97.0.4692.71.bb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ DEPENDS += "\
1111

1212
SRC_URI += "\
1313
file://chromium-wayland/0001-ozone-add-va-api-support-to-wayland.patch \
14-
file://chromium-wayland/0001-ozone-wayland-fix-re-initialization-of-WBMG.patch \
15-
file://chromium-wayland/0001-ozone-wayland-fixed-terminate-caused-by-binding-to-wrong-version.patch \
14+
file://chromium-wayland/0002-ozone-wayland-fix-re-initialization-of-WBMG.patch \
15+
file://chromium-wayland/0003-ozone-wayland-fixed-terminate-caused-by-binding-to-wrong-version.patch \
1616
"
1717

1818
GN_ARGS += "\

meta-chromium/recipes-browser/chromium/chromium.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ HOMEPAGE = "https://www.chromium.org/Home"
44
CVE_PRODUCT = "chromium:chromium google:chrome"
55

66
SRC_URI = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${PV}.tar.xz"
7-
SRC_URI[sha256sum] = "36a99d29c2e93a9975be53648f2cd3ffa4ee43730f217a2e7ed88c1901a671e8"
7+
SRC_URI[sha256sum] = "8ae189d44b782fe4d4942962260dbf5f753abf141148727d9fe82852778dfd7c"
88

99
S = "${WORKDIR}/chromium-${PV}"
1010

meta-chromium/recipes-browser/chromium/files/0001-limit-number-of-LTO-jobs.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ Thus, use the previously used number of threads.
1616
2 files changed, 11 insertions(+), 6 deletions(-)
1717

1818
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
19-
index 219a2be0e1a1f..ae42271d99e49 100644
19+
index bd1fefeff6f60..93e947ad300ab 100644
2020
--- a/build/config/compiler/BUILD.gn
2121
+++ b/build/config/compiler/BUILD.gn
22-
@@ -664,7 +664,7 @@ config("compiler") {
22+
@@ -665,7 +665,7 @@ config("compiler") {
2323

2424
if (is_win) {
2525
ldflags += [
@@ -28,7 +28,7 @@ index 219a2be0e1a1f..ae42271d99e49 100644
2828
"-mllvm:-import-instr-limit=$import_instr_limit",
2929
"/lldltocache:" +
3030
rebase_path("$root_out_dir/thinlto-cache", root_build_dir),
31-
@@ -677,11 +677,11 @@ config("compiler") {
31+
@@ -678,11 +678,11 @@ config("compiler") {
3232
# usage in crbug.com/1038040. Note this will increase build time in
3333
# Chrome OS.
3434

@@ -46,7 +46,7 @@ index 219a2be0e1a1f..ae42271d99e49 100644
4646
ldflags +=
4747
[ "-Wl,-cache_path_lto," +
4848
diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
49-
index 932d4dff2cf81..20d8773d27525 100644
49+
index 62133447a298a..99b395e106f02 100644
5050
--- a/build/config/compiler/compiler.gni
5151
+++ b/build/config/compiler/compiler.gni
5252
@@ -80,6 +80,11 @@ declare_args() {

meta-chromium/recipes-browser/chromium/files/0002-Remove-the-GN-settings-done-for-clang-that-conflict-.patch

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ Upstream-Status: Inappropriate [OE-Specific]
1515
Signed-off-by: Khem Raj <raj.khem@gmail.com>
1616
Rebased-by: Maksim Sisov <msisov@igalia.com>
1717
---
18-
build/config/compiler/BUILD.gn | 36 ----------------------------------
19-
1 file changed, 36 deletions(-)
18+
build/config/compiler/BUILD.gn | 35 ----------------------------------
19+
1 file changed, 35 deletions(-)
2020

2121
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
22-
index ae42271d99e49..eb397d8722994 100644
22+
index 93e947ad300ab..0a4606bc2caac 100644
2323
--- a/build/config/compiler/BUILD.gn
2424
+++ b/build/config/compiler/BUILD.gn
25-
@@ -895,10 +895,6 @@ config("compiler_cpu_abi") {
25+
@@ -896,10 +896,6 @@ config("compiler_cpu_abi") {
2626
]
2727
}
2828
} else if (current_cpu == "arm") {
@@ -33,19 +33,18 @@ index ae42271d99e49..eb397d8722994 100644
3333
if (!is_nacl) {
3434
cflags += [
3535
"-march=$arm_arch",
36-
@@ -908,11 +904,6 @@ config("compiler_cpu_abi") {
37-
if (arm_tune != "") {
36+
@@ -910,10 +906,6 @@ config("compiler_cpu_abi") {
3837
cflags += [ "-mtune=$arm_tune" ]
3938
}
40-
- } else if (current_cpu == "arm64") {
39+
} else if (current_cpu == "arm64") {
4140
- if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
4241
- cflags += [ "--target=aarch64-linux-gnu" ]
4342
- ldflags += [ "--target=aarch64-linux-gnu" ]
4443
- }
45-
} else if (current_cpu == "mipsel" && !is_nacl) {
46-
ldflags += [ "-Wl,--hash-style=sysv" ]
47-
if (custom_toolchain == "") {
48-
@@ -920,9 +911,6 @@ config("compiler_cpu_abi") {
44+
if (is_android) {
45+
# Outline atomics crash on Exynos 9810. http://crbug.com/1272795
46+
cflags += [ "-mno-outline-atomics" ]
47+
@@ -925,9 +917,6 @@ config("compiler_cpu_abi") {
4948
if (is_android) {
5049
cflags += [ "--target=mipsel-linux-android" ]
5150
ldflags += [ "--target=mipsel-linux-android" ]
@@ -55,7 +54,7 @@ index ae42271d99e49..eb397d8722994 100644
5554
}
5655
} else {
5756
cflags += [ "-EL" ]
58-
@@ -1002,8 +990,6 @@ config("compiler_cpu_abi") {
57+
@@ -1007,8 +996,6 @@ config("compiler_cpu_abi") {
5958
ldflags += [ "-Wl,--hash-style=sysv" ]
6059
if (custom_toolchain == "") {
6160
if (is_clang) {
@@ -64,7 +63,7 @@ index ae42271d99e49..eb397d8722994 100644
6463
} else {
6564
cflags += [ "-EB" ]
6665
ldflags += [ "-EB" ]
67-
@@ -1051,9 +1037,6 @@ config("compiler_cpu_abi") {
66+
@@ -1056,9 +1043,6 @@ config("compiler_cpu_abi") {
6867
if (is_android) {
6968
cflags += [ "--target=mips64el-linux-android" ]
7069
ldflags += [ "--target=mips64el-linux-android" ]
@@ -74,7 +73,7 @@ index ae42271d99e49..eb397d8722994 100644
7473
}
7574
} else {
7675
cflags += [
77-
@@ -1111,8 +1094,6 @@ config("compiler_cpu_abi") {
76+
@@ -1116,8 +1100,6 @@ config("compiler_cpu_abi") {
7877
ldflags += [ "-Wl,--hash-style=sysv" ]
7978
if (custom_toolchain == "") {
8079
if (is_clang) {
@@ -83,7 +82,7 @@ index ae42271d99e49..eb397d8722994 100644
8382
} else {
8483
cflags += [
8584
"-EB",
86-
@@ -1284,23 +1265,6 @@ config("compiler_deterministic") {
85+
@@ -1289,23 +1271,6 @@ config("compiler_deterministic") {
8786
}
8887
}
8988
}

meta-chromium/recipes-browser/chromium/files/0003-v8-qemu-wrapper.patch

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,48 +16,47 @@ Signed-off-by: Maksim Sisov <msisov@igalia.com>
1616
2 files changed, 5 insertions(+)
1717

1818
diff --git a/tools/v8_context_snapshot/BUILD.gn b/tools/v8_context_snapshot/BUILD.gn
19-
index 6e86a543558c9..eee89b37064e2 100644
19+
index d868696dbf28b..3bf1fe3f1558e 100644
2020
--- a/tools/v8_context_snapshot/BUILD.gn
2121
+++ b/tools/v8_context_snapshot/BUILD.gn
22-
@@ -56,6 +56,7 @@ if (use_v8_context_snapshot) {
23-
output_path = rebase_path(output_file, root_build_dir)
22+
@@ -72,6 +72,7 @@ if (use_v8_context_snapshot) {
23+
output_path = rebase_path(output_file, root_build_dir)
2424

25-
args = [
26-
+ "./v8-qemu-wrapper.sh",
27-
"./" + rebase_path(
28-
get_label_info(
29-
":v8_context_snapshot_generator($v8_snapshot_toolchain)",
25+
args = [
26+
+ "./v8-qemu-wrapper.sh",
27+
"./" + rebase_path(get_label_info(":v8_context_snapshot_generator",
28+
"root_out_dir") +
29+
"/v8_context_snapshot_generator",
3030

3131
diff --git a/v8/BUILD.gn b/v8/BUILD.gn
32-
index 5c7d931b27..aad8800dce 100644
32+
index bca5b5356b..85fcb7fdc4 100644
3333
--- a/v8/BUILD.gn
3434
+++ b/v8/BUILD.gn
35-
diff --git a/v8/BUILD.gn b/v8/BUILD.gn
36-
@@ -1721,6 +1721,7 @@ template("run_torque") {
35+
@@ -1878,6 +1878,7 @@ template("run_torque") {
3736
}
3837

3938
args = [
4039
+ "./v8-qemu-wrapper.sh",
4140
"./" + rebase_path(
4241
get_label_info(":torque($toolchain)", "root_out_dir") + "/torque",
4342
root_build_dir),
44-
@@ -1853,6 +1854,7 @@ action("generate_bytecode_builtins_list") {
43+
@@ -2010,6 +2011,7 @@ action("generate_bytecode_builtins_list") {
4544
outputs = [ "$target_gen_dir/builtins-generated/bytecodes-builtins-list.h" ]
4645
deps = [ ":bytecode_builtins_list_generator($v8_generator_toolchain)" ]
4746
args = [
4847
+ "./v8-qemu-wrapper.sh",
4948
"./" + rebase_path(
5049
get_label_info(
5150
":bytecode_builtins_list_generator($v8_generator_toolchain)",
52-
@@ -1898,6 +1900,7 @@ template("run_mksnapshot") {
51+
@@ -2055,6 +2057,7 @@ template("run_mksnapshot") {
5352
data = []
5453

5554
args = [
5655
+ "./v8-qemu-wrapper.sh",
5756
"./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
5857
"root_out_dir") + "/mksnapshot",
5958
root_build_dir),
60-
@@ -5611,6 +5614,7 @@ if (v8_enable_i18n_support) {
59+
@@ -5802,6 +5805,7 @@ if (v8_enable_i18n_support) {
6160
outputs = [ output_file ]
6261

6362
args = [

meta-chromium/recipes-browser/chromium/files/0004-wrapper-extra-flags.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
1414
1 file changed, 3 insertions(+), 1 deletion(-)
1515

1616
diff --git a/chrome/installer/linux/common/wrapper b/chrome/installer/linux/common/wrapper
17-
index dbbeb27ea037a..03c7ac4a77154 100755
17+
index 63699e047f3ac..0295e9879de78 100755
1818
--- a/chrome/installer/linux/common/wrapper
1919
+++ b/chrome/installer/linux/common/wrapper
2020
@@ -45,5 +45,7 @@ exec < /dev/null

meta-chromium/recipes-browser/chromium/files/0005-BUILD-do-not-specify-march-on-arm.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1818
1 file changed, 10 deletions(-)
1919

2020
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
21-
index eb397d8722994..e1f4b3cef6be3 100644
21+
index 0a4606bc2caac..9c62f481f1db2 100644
2222
--- a/build/config/compiler/BUILD.gn
2323
+++ b/build/config/compiler/BUILD.gn
24-
@@ -894,16 +894,6 @@ config("compiler_cpu_abi") {
24+
@@ -895,16 +895,6 @@ config("compiler_cpu_abi") {
2525
"-msse3",
2626
]
2727
}
@@ -35,6 +35,6 @@ index eb397d8722994..e1f4b3cef6be3 100644
3535
- if (arm_tune != "") {
3636
- cflags += [ "-mtune=$arm_tune" ]
3737
- }
38-
} else if (current_cpu == "mipsel" && !is_nacl) {
39-
ldflags += [ "-Wl,--hash-style=sysv" ]
40-
if (custom_toolchain == "") {
38+
} else if (current_cpu == "arm64") {
39+
if (is_android) {
40+
# Outline atomics crash on Exynos 9810. http://crbug.com/1272795

meta-chromium/recipes-browser/chromium/files/0007-Delete-compiler-options-not-available-in-release-ver.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1111
1 file changed, 5 insertions(+)
1212

1313
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
14-
index e1f4b3cef6be3..794bad82720c0 100644
14+
index 9c62f481f1db2..2ecb077962518 100644
1515
--- a/build/config/compiler/BUILD.gn
1616
+++ b/build/config/compiler/BUILD.gn
17-
@@ -1609,6 +1609,11 @@ config("default_warnings") {
17+
@@ -1479,6 +1479,11 @@ config("default_warnings") {
1818
cflags += [
1919
"-Wenum-compare-conditional",
2020

0 commit comments

Comments
 (0)