Skip to content

Commit a360dc2

Browse files
OldManYellsAtCloudOldManYellsAtCloud
committed
firefox: update tested and compatible layer versions
Add Wrynose, remove Kirkstone and Whinlatter due to the end of their upstream support. The master branch of oe-core's codename has been updated to blacksail, add it as a compatible version. Also adapt the README, remove references about Kirkstone and Whinlatter. Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
1 parent e07817d commit a360dc2

3 files changed

Lines changed: 11 additions & 42 deletions

File tree

‎.github/workflows/firefox.yml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,10 @@ jobs:
2727
if: ${{ github.repository_owner == 'OSSystems' }}
2828
strategy:
2929
matrix:
30-
yocto_version: [kirkstone, scarthgap, whinlatter, master]
30+
yocto_version: [scarthgap, wrynose, master]
3131
ff_version: [esr, latest]
3232
libc_flavour: [glibc, musl]
3333
arch: [arm, aarch64, riscv, x86-64]
34-
exclude:
35-
- yocto_version: kirkstone
36-
arch: riscv
3734
runs-on: [self-hosted, firefox]
3835
container:
3936
image: skandigraun/yocto:latest
@@ -62,13 +59,10 @@ jobs:
6259
needs: build
6360
strategy:
6461
matrix:
65-
yocto_version: [kirkstone, scarthgap, whinlatter, master]
62+
yocto_version: [scarthgap, wrynose, master]
6663
ff_version: [esr, latest]
6764
libc_flavour: [glibc, musl]
6865
arch: [arm, aarch64, riscv, x86-64]
69-
exclude:
70-
- yocto_version: kirkstone
71-
arch: riscv
7266
steps:
7367
- run: |
7468
cd /yocto/${{ matrix.yocto_version }}

‎meta-firefox/README.md‎

Lines changed: 7 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,8 @@
55

66
| x | aarch64 | arm | riscv64 | x86-64 |
77
| ---- | ---- | ---- | ---- | ---- |
8-
| Kirkstone - 140.10.2esr | ![](https://sarvari.me/meta-browser/badges/kirkstone/aarch64/glibc/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/kirkstone/aarch64/glibc/140.10.2esr/test) | ![](https://sarvari.me/meta-browser/badges/kirkstone/arm/glibc/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/kirkstone/arm/glibc/140.10.2esr/test) | N/A | ![](https://sarvari.me/meta-browser/badges/kirkstone/x86-64/glibc/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/kirkstone/x86-64/glibc/140.10.2esr/test) |
9-
| Kirkstone - 150.0.3 | ![](https://sarvari.me/meta-browser/badges/kirkstone/aarch64/glibc/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/kirkstone/aarch64/glibc/150.0.3/test) | ![](https://sarvari.me/meta-browser/badges/kirkstone/arm/glibc/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/kirkstone/arm/glibc/150.0.3/test) | N/A | ![](https://sarvari.me/meta-browser/badges/kirkstone/x86-64/glibc/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/kirkstone/x86-64/glibc/150.0.3/test) |
108
| Scarthgap - 140.10.2esr | ![](https://sarvari.me/meta-browser/badges/scarthgap/aarch64/glibc/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/scarthgap/aarch64/glibc/140.10.2esr/test) | ![](https://sarvari.me/meta-browser/badges/scarthgap/arm/glibc/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/scarthgap/arm/glibc/140.10.2esr/test) |![](https://sarvari.me/meta-browser/badges/scarthgap/riscv/glibc/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/scarthgap/riscv/glibc/140.10.2esr/test) | ![](https://sarvari.me/meta-browser/badges/scarthgap/x86-64/glibc/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/scarthgap/x86-64/glibc/140.10.2esr/test) |
119
| Scarthgap - 150.0.3 | ![](https://sarvari.me/meta-browser/badges/scarthgap/aarch64/glibc/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/scarthgap/aarch64/glibc/150.0.3/test) | ![](https://sarvari.me/meta-browser/badges/scarthgap/arm/glibc/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/scarthgap/arm/glibc/150.0.3/test) | ![](https://sarvari.me/meta-browser/badges/scarthgap/riscv/glibc/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/scarthgap/riscv/glibc/150.0.3/test) | ![](https://sarvari.me/meta-browser/badges/scarthgap/x86-64/glibc/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/scarthgap/x86-64/glibc/150.0.3/test) |
12-
| Whinlatter - 140.10.2esr | ![](https://sarvari.me/meta-browser/badges/whinlatter/aarch64/glibc/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/whinlatter/aarch64/glibc/140.10.2esr/test) | ![](https://sarvari.me/meta-browser/badges/whinlatter/arm/glibc/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/whinlatter/arm/glibc/140.10.2esr/test) |![](https://sarvari.me/meta-browser/badges/whinlatter/riscv/glibc/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/whinlatter/riscv/glibc/140.10.2esr/test) | ![](https://sarvari.me/meta-browser/badges/whinlatter/x86-64/glibc/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/whinlatter/x86-64/glibc/140.10.2esr/test) |
13-
| Whinlatter - 150.0.3 | ![](https://sarvari.me/meta-browser/badges/whinlatter/aarch64/glibc/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/whinlatter/aarch64/glibc/150.0.3/test) | ![](https://sarvari.me/meta-browser/badges/whinlatter/arm/glibc/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/whinlatter/arm/glibc/150.0.3/test) | ![](https://sarvari.me/meta-browser/badges/whinlatter/riscv/glibc/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/whinlatter/riscv/glibc/150.0.3/test) | ![](https://sarvari.me/meta-browser/badges/whinlatter/x86-64/glibc/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/whinlatter/x86-64/glibc/150.0.3/test) |
1410
| Master - 140.10.2esr | ![](https://sarvari.me/meta-browser/badges/master/aarch64/glibc/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/master/aarch64/glibc/140.10.2esr/test) | ![](https://sarvari.me/meta-browser/badges/master/arm/glibc/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/master/arm/glibc/140.10.2esr/test) |![](https://sarvari.me/meta-browser/badges/master/riscv/glibc/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/master/riscv/glibc/140.10.2esr/test) | ![](https://sarvari.me/meta-browser/badges/master/x86-64/glibc/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/master/x86-64/glibc/140.10.2esr/test) |
1511
| Master - 150.0.3 | ![](https://sarvari.me/meta-browser/badges/master/aarch64/glibc/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/master/aarch64/glibc/150.0.3/test) | ![](https://sarvari.me/meta-browser/badges/master/arm/glibc/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/master/arm/glibc/150.0.3/test) | ![](https://sarvari.me/meta-browser/badges/master/riscv/glibc/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/master/riscv/glibc/150.0.3/test) | ![](https://sarvari.me/meta-browser/badges/master/x86-64/glibc/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/master/x86-64/glibc/150.0.3/test) |
1612

@@ -19,12 +15,8 @@
1915

2016
| x | aarch64 | arm | riscv64 | x86-64 |
2117
| ---- | ---- | ---- | ---- | ---- |
22-
| Kirkstone - 140.10.2esr | ![](https://sarvari.me/meta-browser/badges/kirkstone/aarch64/musl/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/kirkstone/aarch64/musl/140.10.2esr/test) | ![](https://sarvari.me/meta-browser/badges/kirkstone/arm/musl/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/kirkstone/arm/musl/140.10.2esr/test) | N/A | ![](https://sarvari.me/meta-browser/badges/kirkstone/x86-64/musl/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/kirkstone/x86-64/musl/140.10.2esr/test) |
23-
| Kirkstone - 150.0.3 | ![](https://sarvari.me/meta-browser/badges/kirkstone/aarch64/musl/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/kirkstone/aarch64/musl/150.0.3/test) | ![](https://sarvari.me/meta-browser/badges/kirkstone/arm/musl/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/kirkstone/arm/musl/150.0.3/test) | N/A | ![](https://sarvari.me/meta-browser/badges/kirkstone/x86-64/musl/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/kirkstone/x86-64/musl/150.0.3/test) |
2418
| Scarthgap - 140.10.2esr | ![](https://sarvari.me/meta-browser/badges/scarthgap/aarch64/musl/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/scarthgap/aarch64/musl/140.10.2esr/test) | ![](https://sarvari.me/meta-browser/badges/scarthgap/arm/musl/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/scarthgap/arm/musl/140.10.2esr/test) |![](https://sarvari.me/meta-browser/badges/scarthgap/riscv/musl/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/scarthgap/riscv/musl/140.10.2esr/test) | ![](https://sarvari.me/meta-browser/badges/scarthgap/x86-64/musl/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/scarthgap/x86-64/musl/140.10.2esr/test) |
2519
| Scarthgap - 150.0.3 | ![](https://sarvari.me/meta-browser/badges/scarthgap/aarch64/musl/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/scarthgap/aarch64/musl/150.0.3/test) | ![](https://sarvari.me/meta-browser/badges/scarthgap/arm/musl/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/scarthgap/arm/musl/150.0.3/test) | ![](https://sarvari.me/meta-browser/badges/scarthgap/riscv/musl/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/scarthgap/riscv/musl/150.0.3/test) | ![](https://sarvari.me/meta-browser/badges/scarthgap/x86-64/musl/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/scarthgap/x86-64/musl/150.0.3/test) |
26-
| Whinlatter - 140.10.2esr | ![](https://sarvari.me/meta-browser/badges/whinlatter/aarch64/musl/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/whinlatter/aarch64/musl/140.10.2esr/test) | ![](https://sarvari.me/meta-browser/badges/whinlatter/arm/musl/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/whinlatter/arm/musl/140.10.2esr/test) |![](https://sarvari.me/meta-browser/badges/whinlatter/riscv/musl/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/whinlatter/riscv/musl/140.10.2esr/test) | ![](https://sarvari.me/meta-browser/badges/whinlatter/x86-64/musl/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/whinlatter/x86-64/musl/140.10.2esr/test) |
27-
| Whinlatter - 150.0.3 | ![](https://sarvari.me/meta-browser/badges/whinlatter/aarch64/musl/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/whinlatter/aarch64/musl/150.0.3/test) | ![](https://sarvari.me/meta-browser/badges/whinlatter/arm/musl/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/whinlatter/arm/musl/150.0.3/test) | ![](https://sarvari.me/meta-browser/badges/whinlatter/riscv/musl/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/whinlatter/riscv/musl/150.0.3/test) | ![](https://sarvari.me/meta-browser/badges/whinlatter/x86-64/musl/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/whinlatter/x86-64/musl/150.0.3/test) |
2820
| Master - 140.10.2esr | ![](https://sarvari.me/meta-browser/badges/master/aarch64/musl/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/master/aarch64/musl/140.10.2esr/test) | ![](https://sarvari.me/meta-browser/badges/master/arm/musl/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/master/arm/musl/140.10.2esr/test) |![](https://sarvari.me/meta-browser/badges/master/riscv/musl/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/master/riscv/musl/140.10.2esr/test) | ![](https://sarvari.me/meta-browser/badges/master/x86-64/musl/140.10.2esr/build) <br/> ![](https://sarvari.me/meta-browser/badges/master/x86-64/musl/140.10.2esr/test) |
2921
| Master - 150.0.3 | ![](https://sarvari.me/meta-browser/badges/master/aarch64/musl/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/master/aarch64/musl/150.0.3/test) | ![](https://sarvari.me/meta-browser/badges/master/arm/musl/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/master/arm/musl/150.0.3/test) | ![](https://sarvari.me/meta-browser/badges/master/riscv/musl/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/master/riscv/musl/150.0.3/test) | ![](https://sarvari.me/meta-browser/badges/master/x86-64/musl/150.0.3/build) <br/> ![](https://sarvari.me/meta-browser/badges/master/x86-64/musl/150.0.3/test) |
3022

@@ -40,13 +32,13 @@ and/or Yocto.
4032
This layer depends on oe-core, meta-oe and meta-clang (only pre-Whinlatter). This layer supports
4133
multiple Yocto releases, the branches should match each other.
4234

43-
Starting version 144 Firefox requires at least Clang 17 to compile. (For Kirkstone current testing is
44-
performed using Clang 14 for the ESR version and Clang 18 for the latest version).
35+
Each compatible Yocto versions are supported by the master branch of this layer.
4536

46-
Additionally, the Rust version shipped with Kirkstone and Scarthgap oe-core is out of date,
47-
which can be remediated by other third-party layers: for Kirkstone and Scarthgap version the
48-
corresponding branch of meta-lts-mixins is required for up to date Rust compiler. Additionally,
49-
for Kirkstone, meta-rust layer can be used also to get an up-to-date Rust compiler.
37+
Starting version 144 Firefox requires at least Clang 17 to compile.
38+
39+
Additionally, the Rust version shipped with Scarthgap oe-core is out of date,
40+
which can be remediated by other third-party layers: for Scarthgap version the
41+
corresponding branch of meta-lts-mixins is required for up to date Rust compiler.
5042

5143
For the tested revision/release combinations, see meta-firefox-test repository, especially
5244
the kas folder - that contains all the branch/revision information used for testing.
@@ -56,33 +48,16 @@ install it, in case it is missing (e.g. on Debian based systems install `libstd
5648
on Fedora install `libstdc++-devel`)
5749

5850
By default `disable-sandboxed-libraries` PACKAGECONFIG is *disabled*. Which means that wasi-sdk
59-
is a build dependency. Starting Firefox 145, wasi-sdk requires at least Clang 18 to be built:
60-
make sure to use kirkstone-clang18 branch of meta-clang. Without wasi-sdk (when `disable-sanboxed-libraries`
61-
PACKAGECONFIG is enabled), Firefox should still build with Clang 14. With ther branches
62-
this restriction is meaningless, since they all use at least Clang 18.
51+
is a build dependency. Starting Firefox 145, wasi-sdk requires at least Clang 18 to be built.
6352

6453
Firefox requires at least Rust 1.82 from version 137.
6554

66-
When using meta-rust, make sure to add the following to a bbappend or local.conf:
67-
68-
```
69-
# when using a bbappend
70-
RUST_HOST = "${BUILD_SYS}"
71-
RUST_TARGET = "${TARGET_SYS}"
72-
73-
# when using local.conf
74-
RUST_HOST:pn-firefox = "${BUILD_SYS}"
75-
RUST_TARGET:pn-firefox = "${TARGET_SYS}"
76-
```
77-
7855
Due to this, the selection of Rust provider needs some caution.
7956
Testing is performed using the following combinations (the "latest" version should also be able to compile "ESR"):
8057

8158
| Yocto version | Rust version ESR | Rust version latest |
8259
| ---------------- | ----- | ---- |
83-
| Kirkstone | Rust 1.92.0 from meta-lts-mixins (kirkstone/rust branch) | Rust 1.92.0 from meta-lts-mixins (kirkstone/rust branch) |
8460
| Scarthgap | Rust 1.92.0 from meta-lts-mixins (scarthgap/rust branch) | Rust 1.92.0 from meta-lts-mixins (scarthgap/rust branch) |
85-
| Whinlatter | Rust 1.90.0 from oe-core | Rust 1.90.0 from oe-core |
8661
| Master | Rust 1.94.0 from oe-core | Rust 1.94.0 from oe-core |
8762

8863
Contributing

‎meta-firefox/conf/layer.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ BBFILE_PATTERN_firefox-browser-layer := "^${LAYERDIR}/"
115115
BBFILE_PRIORITY_firefox-browser-layer = "7"
116116

117117
LAYERVERSION_firefox-browser-layer = "2"
118-
LAYERSERIES_COMPAT_firefox-browser-layer = "kirkstone scarthgap whinlatter wrynose"
118+
LAYERSERIES_COMPAT_firefox-browser-layer = "scarthgap wrynose blacksail"
119119

120120
LAYERDEPENDS_firefox-browser-layer = "core openembedded-layer"
121-
LAYERDEPENDS_firefox-browser-layer:append = '${@bb.utils.contains_any("LAYERSERIES_CORENAMES", "whinlatter wrynose", "", " clang-layer", d)}'
121+
LAYERDEPENDS_firefox-browser-layer:append = '${@bb.utils.contains("LAYERSERIES_CORENAMES", "scarthgap", " clang-layer", "", d)}'
122122

123123
require conf/post-whinlatter-s-config.inc

0 commit comments

Comments
 (0)