firefox: Use Rust from lts-mixins for Scarthgap

Now that there is an updated Rust version for Scarthgap in the
meta-lts-mixins repository, the previously vendored Rust recipe is
not required anymore.

Author: OldManYellsAtCloud

meta-firefox/README.md

@@ -22,26 +22,35 @@ OpenEmbedded/Yocto BSP layer for Firefox Browser
 This layer provides web browser recipes for use with OpenEmbedded
 and/or Yocto.
 
-##Dependencies
+## Dependencies
 
-This layer depends on poky, meta-oe, meta-clang and meta-rust (only for Kirkstone). To see the tested revision/release
-combinations, see the contents of the `kas` folder - that contains all the branch/revision information used for
-testing.
+This layer depends on oe-core (poky), meta-oe and meta-clang. Additionally, the Rust version
+shipped with Kirkstone and Scarthgap oe-core is out of date, which can be remediated by other
+third-party layers: when using Kirkstone either meta-rust or meta-lts-mixins (kirkstone/rust
+branch) is required, and when using Scarthgap, meta-lts-mixins (scarthgap/rust branch) is
+recommended. (The Rust-providing layers are not enforced currently, since there are multiple
+actively maintained layers. Use the one that works the best for the rest of your project.)
 
-`meta-clang` layer requires `libstdc++` to be installed on the build machine - make sure to install it, in case it is missing 
-(e.g. on Debian based systems install `libstdc++-dev` or on Fedora install `libstdc++-devel`)
+For the tested revision/release combinations, see the contents of the `kas` folder - that 
+contains all the branch/revision information used for testing.
+
+`meta-clang` layer requires `libstdc++` to be installed on the build machine - make sure to 
+install it, in case it is missing  (e.g. on Debian based systems install `libstdc++-dev` or
+on Fedora install `libstdc++-devel`)
 
 Note: Make sure to add `RUST_PANIC_STRATEGY = "abort"` to local.conf before compiling Rust.
 
-Note: Firefox requires at least Rust 1.76 starting from version 127. meta-rust layer provides 1.78, however this layer is not compatible with Scarthgap (nor newer).
-Due to this, Rust 1.76 recipes are also shipped as part of this layer (original Scarthgap recipes for Rust 1.75 adapted for the newer version). 
+Note: Firefox requires at least Rust 1.76 starting from version 127. meta-rust layer provides
+1.78, however this layer is not compatible with Scarthgap (nor newer). Fortunately lately a
+meta-lts-mixins layer has been created with a more up to date version of Rust, for Scarthgap.
 
-Unfortunately this needs some caution when it comes to the Rust version used, and its provider. Testing is performed using the following combinations:
+The state of Rust needs some caution when it comes to the the version used, and its provider.
+Testing is performed using the following combinations:
 
 | Yocto version | Rust version |
 | ---------------- | ----- |
-| Kirkstone | Rust 1.78 from meta-rust (along with adding rust from oe-core to BBMASK) |
-| Scarthgap | Rust 1.76 shipped with this layer (along with adding rust oe-core to BBMASK) |
+| Kirkstone | Rust 1.78 from meta-rust |
+| Scarthgap | Rust 1.80.1 from meta-lts-mixins (scarthgap/rust branch) |
 | Styhead | Rust 1.79 from oe-core |
 | Walnascar | Rust 1.80.1 from oe-core |
 

meta-firefox/conf/layer.conf

@@ -118,3 +118,10 @@ LAYERVERSION_firefox-browser-layer = "2"
 LAYERSERIES_COMPAT_firefox-browser-layer = "kirkstone scarthgap styhead walnascar"
 
 LAYERDEPENDS_firefox-browser-layer = "clang-layer core openembedded-layer"
+
+# Don't enforce the Rust layer dependency for now, as there are multiple
+# actively maintained Rust-providing layers (e.g. Kirkstone has at least 2:
+# meta-rust and meta-lts-mixins).
+
+# LAYERDEPENDS_firefox-browser-layer:append = '${@" rust-layer " if "kirkstone" in d.getVar("LAYERSERIES_CORENAMES") else ""}'
+# LAYERDEPENDS_firefox-browser-layer:append = '${@" scarthgap-rust-mixin " if "scarthgap" in d.getVar("LAYERSERIES_CORENAMES") else ""}'

meta-firefox/kas/repos/lts-mixins.yml

@@ -0,0 +1,8 @@
+header:
+  version: 11
+
+repos:
+  meta-lts-mixins:
+    url: https://git.yoctoproject.org/git/meta-lts-mixins
+    layers:
+      .:

meta-firefox/kas/repos/scarthgap.yml

@@ -2,6 +2,7 @@ header:
   version: 11
   includes:
     - meta-firefox/kas/repos/common-repos.yml
+    - meta-firefox/kas/repos/lts-mixins.yml
 
 repos:
   meta-oe:
@@ -14,3 +15,10 @@ repos:
         path: meta-firefox/kas/scarthgap-poky-patches
   meta-clang:
     refspec: "989ff6a4e7db59f01d511727135610006124ead2"
+  meta-lts-mixins:
+    refspec: "a5fc9344ebd80d36326bde082aea33f0c7873291"
+
+
+local_conf_header:
+  scarthgap: |
+    BBMASK += "poky/meta/recipes-devtools/rust"

meta-firefox/kas/scarthgap-esr-aarch64-test.yml

@@ -15,11 +15,11 @@ repos:
 # use rust version shipped with meta-browser, poky one is too old
 local_conf_header:
   scarthgap-esr-aarch64: |
-    REQUIRED_VERSION_rust = "1.76.0"
-    REQUIRED_VERSION_rust-native = "1.76.0"
-    REQUIRED_VERSION_libstd-rs = "1.76.0"
-    REQUIRED_VERSION_cargo = "1.76.0"
-    REQUIRED_VERSION_cargo-native = "1.76.0"
-    REQUIRED_VERSION_rust-llvm = "1.76.0"
-    REQUIRED_VERSION_rust-llvm-native = "1.76.0"
+    REQUIRED_VERSION_rust = "1.80.1"
+    REQUIRED_VERSION_rust-native = "1.80.1"
+    REQUIRED_VERSION_libstd-rs = "1.80.1"
+    REQUIRED_VERSION_cargo = "1.80.1"
+    REQUIRED_VERSION_cargo-native = "1.80.1"
+    REQUIRED_VERSION_rust-llvm = "1.80.1"
+    REQUIRED_VERSION_rust-llvm-native = "1.80.1"
     BBMASK += "poky/meta/recipes-devtools/rust"

meta-firefox/kas/scarthgap-esr-arm-test.yml

@@ -16,11 +16,11 @@ repos:
 # use rust version shipped with meta-browser, poky one is too old
 local_conf_header:
   scarthgap-esr-arm: |
-    REQUIRED_VERSION_rust = "1.76.0"
-    REQUIRED_VERSION_rust-native = "1.76.0"
-    REQUIRED_VERSION_libstd-rs = "1.76.0"
-    REQUIRED_VERSION_cargo = "1.76.0"
-    REQUIRED_VERSION_cargo-native = "1.76.0"
-    REQUIRED_VERSION_rust-llvm = "1.76.0"
-    REQUIRED_VERSION_rust-llvm-native = "1.76.0"
+    REQUIRED_VERSION_rust = "1.80.1"
+    REQUIRED_VERSION_rust-native = "1.80.1"
+    REQUIRED_VERSION_libstd-rs = "1.80.1"
+    REQUIRED_VERSION_cargo = "1.80.1"
+    REQUIRED_VERSION_cargo-native = "1.80.1"
+    REQUIRED_VERSION_rust-llvm = "1.80.1"
+    REQUIRED_VERSION_rust-llvm-native = "1.80.1"
     BBMASK += "poky/meta/recipes-devtools/rust"

meta-firefox/kas/scarthgap-esr-riscv-test.yml

@@ -11,11 +11,11 @@ machine: star64
 # use rust version shipped with meta-browser, poky one is too old
 local_conf_header:
   scarthgap-esr-riscv: |
-    REQUIRED_VERSION_rust = "1.76.0"
-    REQUIRED_VERSION_rust-native = "1.76.0"
-    REQUIRED_VERSION_libstd-rs = "1.76.0"
-    REQUIRED_VERSION_cargo = "1.76.0"
-    REQUIRED_VERSION_cargo-native = "1.76.0"
-    REQUIRED_VERSION_rust-llvm = "1.76.0"
-    REQUIRED_VERSION_rust-llvm-native = "1.76.0"
+    REQUIRED_VERSION_rust = "1.80.1"
+    REQUIRED_VERSION_rust-native = "1.80.1"
+    REQUIRED_VERSION_libstd-rs = "1.80.1"
+    REQUIRED_VERSION_cargo = "1.80.1"
+    REQUIRED_VERSION_cargo-native = "1.80.1"
+    REQUIRED_VERSION_rust-llvm = "1.80.1"
+    REQUIRED_VERSION_rust-llvm-native = "1.80.1"
     BBMASK += "poky/meta/recipes-devtools/rust"

meta-firefox/kas/scarthgap-esr-x86_64-test.yml

@@ -10,12 +10,12 @@ machine: qemux86-64
 # use rust version shipped with meta-browser, poky one is too old
 local_conf_header:
   scarthgap-esr-x86_64: |
-    REQUIRED_VERSION_rust = "1.76.0"
-    REQUIRED_VERSION_rust-native = "1.76.0"
-    REQUIRED_VERSION_libstd-rs = "1.76.0"
-    REQUIRED_VERSION_cargo = "1.76.0"
-    REQUIRED_VERSION_cargo-native = "1.76.0"
-    REQUIRED_VERSION_rust-llvm = "1.76.0"
-    REQUIRED_VERSION_rust-llvm-native = "1.76.0"
+    REQUIRED_VERSION_rust = "1.80.1"
+    REQUIRED_VERSION_rust-native = "1.80.1"
+    REQUIRED_VERSION_libstd-rs = "1.80.1"
+    REQUIRED_VERSION_cargo = "1.80.1"
+    REQUIRED_VERSION_cargo-native = "1.80.1"
+    REQUIRED_VERSION_rust-llvm = "1.80.1"
+    REQUIRED_VERSION_rust-llvm-native = "1.80.1"
     BBMASK += "poky/meta/recipes-devtools/rust"
 

meta-firefox/kas/scarthgap-latest-aarch64-test.yml

@@ -14,11 +14,11 @@ repos:
 
 local_conf_header:
   scarthgap-latest-aarch64: |
-    REQUIRED_VERSION_rust = "1.76.0"
-    REQUIRED_VERSION_rust-native = "1.76.0"
-    REQUIRED_VERSION_libstd-rs = "1.76.0"
-    REQUIRED_VERSION_cargo = "1.76.0"
-    REQUIRED_VERSION_cargo-native = "1.76.0"
-    REQUIRED_VERSION_rust-llvm = "1.76.0"
-    REQUIRED_VERSION_rust-llvm-native = "1.76.0"
+    REQUIRED_VERSION_rust = "1.80.1"
+    REQUIRED_VERSION_rust-native = "1.80.1"
+    REQUIRED_VERSION_libstd-rs = "1.80.1"
+    REQUIRED_VERSION_cargo = "1.80.1"
+    REQUIRED_VERSION_cargo-native = "1.80.1"
+    REQUIRED_VERSION_rust-llvm = "1.80.1"
+    REQUIRED_VERSION_rust-llvm-native = "1.80.1"
     BBMASK += "poky/meta/recipes-devtools/rust"

meta-firefox/kas/scarthgap-latest-arm-test.yml

@@ -14,11 +14,11 @@ repos:
 
 local_conf_header:
   scarthgap-latest-arm: |
-    REQUIRED_VERSION_rust = "1.76.0"
-    REQUIRED_VERSION_rust-native = "1.76.0"
-    REQUIRED_VERSION_libstd-rs = "1.76.0"
-    REQUIRED_VERSION_cargo = "1.76.0"
-    REQUIRED_VERSION_cargo-native = "1.76.0"
-    REQUIRED_VERSION_rust-llvm = "1.76.0"
-    REQUIRED_VERSION_rust-llvm-native = "1.76.0"
+    REQUIRED_VERSION_rust = "1.80.1"
+    REQUIRED_VERSION_rust-native = "1.80.1"
+    REQUIRED_VERSION_libstd-rs = "1.80.1"
+    REQUIRED_VERSION_cargo = "1.80.1"
+    REQUIRED_VERSION_cargo-native = "1.80.1"
+    REQUIRED_VERSION_rust-llvm = "1.80.1"
+    REQUIRED_VERSION_rust-llvm-native = "1.80.1"
     BBMASK += "poky/meta/recipes-devtools/rust"