Skip to content

Commit 2a571a3

Browse files
[scarthgap] chromium: Drop patch to decrease minimum Rust version (#858)
chromium: Drop patch to decrease minimum Rust version Build and patch changes: ------------------------ Drop a patch to decrease the required version of Rust, and instead depend on meta-lts-mixins to provide a more up-to-date version of Rust than OE Core. License changes: ---------------- None. Test-built: ----------- * chromium-ozone-wayland: - scarthgap, clang, MACHINE=raspberrypi4-64 Signed-off-by: Max Ihlenfeldt <[email protected]>
1 parent 4eabfae commit 2a571a3

File tree

4 files changed

+26
-97
lines changed

4 files changed

+26
-97
lines changed

meta-chromium/README.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,16 @@ peculiarities:
6060
- Parts of the V8 (Chromium's JavaScript engine) build need to run binaries
6161
built for the target, for which we use QEMU.
6262

63+
## Supported OE/Yocto releases
64+
65+
We only support the master branch and the current LTS releases of OE/Yocto,
66+
using this repo's master branch for the former and separate branches for the
67+
latter.
68+
69+
Recent non-LTS releases should still work with our master branch, and we'll
70+
create branches capturing the last buildable version once they stop working with
71+
the latest version.
72+
6373
## Build requirements
6474

6575
This recipe requires clang, and GCC is not supported. Upstream Chromium has not
@@ -72,6 +82,21 @@ host. clang-native from the meta-clang layer is used to build those binaries.
7282
Additionally, make sure the machine being used to build Chromium is powerful
7383
enough: a x86-64 machine with at least 16GB RAM is recommended.
7484

85+
### scarthgap-specific requirements
86+
87+
The scarthgap OE/Yocto branch is an LTS release, which is often at odds with
88+
Chromium's release model because it often requires recent versions of certain
89+
recipes to build correctly.
90+
91+
This is particularly a problem for the toolchain (i.e. LLVM/clang and Rust).
92+
Chromium needs a more recent version of Rust than OE Core provides for
93+
scarthgap, which is why we depend on meta-lts-mixins' `scarthgap/rust` branch.
94+
95+
**Side note: For now, clang 18 provided by meta-clang is recent enough, but at
96+
some point during scarthgap's LTS lifetime Chromium won't be compilable with
97+
that version, and we'll have to create e.g. a scarthgap-clang20 branch for
98+
meta-clang and use that.**
99+
75100
## PACKAGECONFIG knobs
76101

77102
* component-build: (off by default)

meta-chromium/conf/layer.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ BBFILE_PRIORITY_chromium-browser-layer = "7"
1111
LAYERVERSION_chromium-browser-layer = "1"
1212
LAYERSERIES_COMPAT_chromium-browser-layer = "scarthgap styhead walnascar"
1313

14-
LAYERDEPENDS_chromium-browser-layer = "clang-layer core openembedded-layer"
14+
LAYERDEPENDS_chromium-browser-layer = "clang-layer core openembedded-layer lts-rust-mixin"

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ SRC_URI += "\
2727
file://0010-Don-t-require-profiler_builtins.rlib.patch \
2828
file://0011-Disable-crabbyavif-to-fix-build-errors.patch \
2929
file://0012-Revert-Allow-and-use-std-hardware_destructive_interf.patch \
30-
file://0013-Revert-Tell-rustc-that-we-will-always-be-providing-c.patch \
3130
"
3231
# ARM/AArch64-specific patches.
3332
SRC_URI:append:aarch64 = "${@bb.utils.contains('TUNE_FEATURES', 'crypto', '', ' file://arm/0001-Fix-AES-crypto-SIGILL-on-rpi4-64.patch', d)}"

meta-chromium/recipes-browser/chromium/files/0013-Revert-Tell-rustc-that-we-will-always-be-providing-c.patch

Lines changed: 0 additions & 95 deletions
This file was deleted.

0 commit comments

Comments
 (0)