Skip to content

layer.conf: Update to whinlatter (5.3) layer/release series #897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

layer.conf: Update to whinlatter (5.3) layer/release series #897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32133d6
chromium: Apply fixes required by oe-core changes
jcalvinowens Sep 23, 2025
1f60fdb
chromium: Remove gitfiles present in chromium tarball
jcalvinowens Jun 26, 2025
750da00
layer.conf: Update chromium to whinlatter (5.3) layer/release series
jcalvinowens Jun 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion meta-chromium/conf/layer.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ BBFILE_PATTERN_chromium-browser-layer := "^${LAYERDIR}/"
BBFILE_PRIORITY_chromium-browser-layer = "7"

LAYERVERSION_chromium-browser-layer = "1"
LAYERSERIES_COMPAT_chromium-browser-layer = "scarthgap styhead walnascar"
LAYERSERIES_COMPAT_chromium-browser-layer = "scarthgap styhead walnascar whinlatter"

LAYERDEPENDS_chromium-browser-layer = "clang-layer core openembedded-layer"
14 changes: 13 additions & 1 deletion meta-chromium/recipes-browser/chromium/chromium.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CVE_PRODUCT = "chromium:chromium google:chrome"
SRC_URI = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${PV}.tar.xz"
SRC_URI[sha256sum] = "7c765bd13df842a28bb52279b8d711411ac6082151473e07bd70b9a482c0a0ac"

S = "${WORKDIR}/chromium-${PV}"
S = "${UNPACKDIR}/chromium-${PV}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change alone makes meta-chromium incompatible with scarthgap. See #918

But now, with all the changes to merge meta-clang into oe-core, it's not enough. There is a failure in do_copy_clang_library() in chromium-gn.inc because the directory structure is different now.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I think I'm still overriding to use meta-clang, which would explain why I'm not hitting that, I'll fix that.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also this:

chromium-ozone-wayland-136.0.7103.113-r0 do_check_llvm_version: Unable to determine LLVM version. Chromium may not be compiled successfully if the LLVM version is below 14.0.0.


# GCC is not tested or officially supported upstream, and supporting it here
# requires an ever-growing amount of backports and custom patches, without any
Expand Down Expand Up @@ -604,3 +604,15 @@ LIC_FILES_CHKSUM = "\
file://${S}/url/third_party/mozilla/LICENSE.txt;md5=437ced1e9b232651b0912a9594da43b2 \
file://${S}/v8/LICENSE;md5=3f722db07a0a940a6c859c5c9c2c78fd \
"

unlink_gitfiles() {
rm -f ${S}/.git-blame-ignore-revs
rm -f ${S}/.gitallowed
rm -f ${S}/.gitattributes
rm -f ${S}/.gitignore
rm -f ${S}/.gitmodules
}

do_unpack:append() {
bb.build.exec_func('unlink_gitfiles', d)
}
2 changes: 1 addition & 1 deletion meta-chromium/recipes-browser/chromium/gn-native_136.0.7103.113.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require chromium.inc

inherit native

S = "${WORKDIR}/chromium-${PV}"
S = "${UNPACKDIR}/chromium-${PV}"

# bootstrap.py --no_clean hardcodes the build location to out_bootstrap.
# Omitting --no_clean causes the script to create a temporary directory with a
Expand Down