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

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

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
4 commits
Select commit Hold shift + click to select a range
450f8ee
treewide: Apply fixes required by oe-core changes
jcalvinowens Jun 26, 2025
b6f5901
chromium: Remove gitfiles present in chromium tarball
jcalvinowens Jun 26, 2025
dd3afe4
firefox: Move AS=${CC} to mozilla_run_mach()
jcalvinowens Jun 26, 2025
b7dca08
layer.conf: Update 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] = "f98315eacbf3be106feca37f8243d8c4092d4fd832c918aa36dc229eb6ab39e0"

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

# 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 @@ -452,3 +452,15 @@ LIC_FILES_CHKSUM = "\
file://${S}/url/third_party/mozilla/LICENSE.txt;md5=437ced1e9b232651b0912a9594da43b2 \
file://${S}/v8/LICENSE;md5=f38a2942edcfe4abb45e9a83a1ad2f82 \
"

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_132.0.6834.83.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
1 change: 1 addition & 0 deletions meta-firefox/classes/mozilla.bbclass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ mozilla_run_mach() {
export SHELL="/bin/sh"
export RUSTFLAGS="${RUSTFLAGS} -Clinker=${WORKDIR}/wrapper/target-rust-ccld --sysroot=${RECIPE_SYSROOT}"

export AS="${CC}"
export RUST_HOST=${RUST_HOST}
export RUST_TARGET=${RUST_TARGET}

Expand Down
2 changes: 1 addition & 1 deletion meta-firefox/conf/layer.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,6 @@ BBFILE_PATTERN_firefox-browser-layer := "^${LAYERDIR}/"
BBFILE_PRIORITY_firefox-browser-layer = "7"

LAYERVERSION_firefox-browser-layer = "2"
LAYERSERIES_COMPAT_firefox-browser-layer = "kirkstone scarthgap walnascar"
LAYERSERIES_COMPAT_firefox-browser-layer = "kirkstone scarthgap walnascar whinlatter"

LAYERDEPENDS_firefox-browser-layer = "clang-layer core openembedded-layer"
1 change: 0 additions & 1 deletion meta-firefox/recipes-browser/firefox/firefox.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'forbid-multiple-compositors',
', '', d)}"

TOOLCHAIN:pn-firefox = "clang"
AS = "${CC}"

DISABLE_STATIC = ""

Expand Down
1 change: 0 additions & 1 deletion meta-firefox/recipes-devtools/cbindgen/cbindgen_0.28.0.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3"

SRC_URI += "git://github.com/mozilla/cbindgen.git;protocol=https;branch=master"
SRCREV = "bd78bbe59b10eda6ef1255e4acda95c56c6d0279"
S = "${WORKDIR}/git"

inherit cargo pkgconfig

Expand Down
2 changes: 1 addition & 1 deletion meta-firefox/recipes-devtools/python-zstandard/python-zstandard_0.21.0.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SRC_URI = "https://files.pythonhosted.org/packages/4d/70/1f883646641d7ad39441815
SRC_URI[md5sum] = "7baafeb332651d70881ce692edf912b3"
SRC_URI[sha256sum] = "f08e3a10d01a247877e4cb61a82a319ea746c356a3786558bed2481e6c405546"

S = "${WORKDIR}/zstandard-0.21.0"
S = "${UNPACKDIR}/zstandard-0.21.0"
Copy link
Collaborator

Choose a reason for hiding this comment

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

I believe that this S declaration can be removed altogether to make it work on all Yocto versions. I'm almost sure that the recipe is happy with whatever the default value is, I just most probably generated this recipe with pipoe or similar, and didn't remove it. (Though I will try to test this theory soon)

Copy link
Collaborator

Choose a reason for hiding this comment

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

Nope, I was wrong, it's a load-bearing variable :(
Then I think this should be also something to the same effect as for the wasi-sdk and cbindgen recipes to maintain compatibility, unless you (or anyone else) have a better idea.

Copy link
Collaborator

@OldManYellsAtCloud OldManYellsAtCloud Jul 8, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Meanwhile I got a better idea for this particular recipe:
remove SRC_URI* (except for sha256), S, RDEPENDS, and add pypi to the inherits. It should make it work in all versions, without specifying anything extra.


RDEPENDS_${PN} = ""

Expand Down
1 change: 0 additions & 1 deletion meta-firefox/recipes-devtools/wasi-sdk/wasi-sdk-native_git.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ inherit native

DEPENDS = "clang-native cmake-native ninja-native"

S = "${WORKDIR}/git"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Unfortunately this will make the layer only compatible with Whinlatter, and with none of the others.
Currently I can't really think of anything better than something like

WHINLATTER_S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"
NON_WHINLATTER_S = "${WORKDIR}/git"
S = '${@bb.utils.contains_any("LAYERSERIES_CORENAMES", "whinlatter", "${WHINLATTER_S}", "${NON_WHINLATTER_S}", d)}'

But still thinking if there is some other solution. The same for the cbindgen recipe.

(This comment is only valid for the Firefox layer. The Chromium folks might have a very different opinion about this)


SRC_URI = "gitsm://github.com/WebAssembly/wasi-sdk.git;protocol=https;branch=main"
SRC_URI += "file://0001-disable-exceptions-and-bulk-memory.patch"
Expand Down
Loading