Skip to content

Commit d3e31d3

Browse files
authored
Merge pull request #210 from eclipse-leda/remove_backports_layer
remove layer meta-leda backports in favour of meta-lts-mixins
2 parents 84edcd9 + 13b4f6c commit d3e31d3

40 files changed

+40
-2103
lines changed

.config.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ local_conf_header:
4141
RAUC_CERT_FILE = "${TOPDIR}/../examples/rauc/development-1.cert.pem"
4242
RAUC_KEYRING_URI = "file://${TOPDIR}/../examples/rauc/ca.cert.pem"
4343
RAUC_KEYRING_FILE = "${TOPDIR}/../examples/rauc/ca.cert.pem"
44+
meta-clang: |
45+
# mask the llvm recipe provided by kirkstone to avoid warnings:
46+
BBMASK += "/poky/meta/recipes-devtools/llvm/"
4447
repos:
4548
# This entry includes the repository where the config file is located
4649
# to the bblayers.conf:
@@ -53,9 +56,12 @@ repos:
5356
meta:
5457
meta-poky:
5558
meta-yocto-bsp:
56-
meta-lts-mixins:
59+
meta-lts-mixins-rust:
5760
url: "https://git.yoctoproject.org/git/meta-lts-mixins"
5861
refspec: kirkstone/rust-1.68
62+
meta-lts-mixins-go:
63+
url: "https://git.yoctoproject.org/git/meta-lts-mixins"
64+
refspec: kirkstone/go
5965
meta-clang:
6066
url: https://github.com/kraj/meta-clang
6167
refspec: kirkstone
@@ -85,7 +91,6 @@ repos:
8591
path: ./
8692
layers:
8793
meta-leda-bsp:
88-
meta-leda-backports:
8994
meta-leda-components:
9095
meta-leda-distro:
9196
meta-leda-distro-container:

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ build/
44
# Metalayer folders are created by running "kas build" and we don't
55
# want to commit them as git submodules.
66
meta-kanto
7-
meta-lts-mixins
7+
meta-lts-mixins-rust
8+
meta-lts-mixins-go
89
meta-openembedded
910
meta-rauc
1011
meta-rauc-community

conf/layer.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
2121
BBFILE_COLLECTIONS += "meta-leda"
2222
BBFILE_PATTERN_meta-leda := "^${LAYERDIR}/"
2323
BBFILE_PRIORITY_meta-leda = "7"
24-
LAYERDEPENDS_meta-leda += "core meta-leda-bsp meta-leda-components meta-leda-distro meta-leda-backports"
24+
LAYERDEPENDS_meta-leda += "core meta-leda-bsp meta-leda-components meta-leda-distro"
2525
LAYERSERIES_COMPAT_meta-leda = "kirkstone"

kas/.config-components.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ local_conf_header:
3030
needed-features: |
3131
DISTRO_FEATURES += " sdv rauc virtualization"
3232
INHERIT += " rm_work"
33+
meta-clang: |
34+
# mask the llvm recipe provided by kirkstone to avoid warnings:
35+
BBMASK += "/poky/meta/recipes-devtools/llvm/"
3336
repos:
3437
poky:
3538
url: "https://git.yoctoproject.org/git/poky"
@@ -38,9 +41,12 @@ repos:
3841
meta:
3942
meta-poky:
4043
meta-yocto-bsp:
41-
meta-lts-mixins:
44+
meta-lts-mixins-rust:
4245
url: "https://git.yoctoproject.org/git/meta-lts-mixins"
4346
refspec: kirkstone/rust-1.68
47+
meta-lts-mixins-go:
48+
url: "https://git.yoctoproject.org/git/meta-lts-mixins"
49+
refspec: kirkstone/go
4450
meta-clang:
4551
url: https://github.com/kraj/meta-clang
4652
refspec: kirkstone
@@ -64,5 +70,4 @@ repos:
6470
meta-leda:
6571
path: ./
6672
layers:
67-
meta-leda-backports:
6873
meta-leda-components:

kas/.config-kirkstone-rpi4.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ local_conf_header:
4141
RAUC_CERT_FILE = "${COREBASE}/../examples/rauc/development-1.cert.pem"
4242
RAUC_KEYRING_URI = "file://${TOPDIR}/../examples/rauc/ca.cert.pem"
4343
RAUC_KEYRING_FILE = "${TOPDIR}/../examples/rauc/ca.cert.pem"
44+
meta-clang: |
45+
# mask the llvm recipe provided by kirkstone to avoid warnings:
46+
BBMASK += "/poky/meta/recipes-devtools/llvm/"
4447
repos:
4548
# This entry includes the repository where the config file is located
4649
# to the bblayers.conf:
@@ -53,9 +56,12 @@ repos:
5356
meta:
5457
meta-poky:
5558
meta-yocto-bsp:
56-
meta-lts-mixins:
59+
meta-lts-mixins-rust:
5760
url: "https://git.yoctoproject.org/git/meta-lts-mixins"
5861
refspec: kirkstone/rust-1.68
62+
meta-lts-mixins-go:
63+
url: "https://git.yoctoproject.org/git/meta-lts-mixins"
64+
refspec: kirkstone/go
5965
meta-clang:
6066
url: https://github.com/kraj/meta-clang
6167
refspec: kirkstone
@@ -88,7 +94,6 @@ repos:
8894
path: ./
8995
layers:
9096
meta-leda-bsp:
91-
meta-leda-backports:
9297
meta-leda-components:
9398
meta-leda-distro:
9499
meta-leda-distro-container:

kas/.config-kirkstone.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ local_conf_header:
4141
RAUC_CERT_FILE = "${TOPDIR}/../examples/rauc/development-1.cert.pem"
4242
RAUC_KEYRING_URI = "file://${TOPDIR}/../examples/rauc/ca.cert.pem"
4343
RAUC_KEYRING_FILE = "${TOPDIR}/../examples/rauc/ca.cert.pem"
44+
meta-clang: |
45+
# mask the llvm recipe provided by kirkstone to avoid warnings:
46+
BBMASK += "/poky/meta/recipes-devtools/llvm/"
4447
repos:
4548
# This entry includes the repository where the config file is located
4649
# to the bblayers.conf:
@@ -53,9 +56,12 @@ repos:
5356
meta:
5457
meta-poky:
5558
meta-yocto-bsp:
56-
meta-lts-mixins:
59+
meta-lts-mixins-rust:
5760
url: "https://git.yoctoproject.org/git/meta-lts-mixins"
5861
refspec: kirkstone/rust-1.68
62+
meta-lts-mixins-go:
63+
url: "https://git.yoctoproject.org/git/meta-lts-mixins"
64+
refspec: kirkstone/go
5965
meta-clang:
6066
url: https://github.com/kraj/meta-clang
6167
refspec: kirkstone
@@ -85,7 +91,6 @@ repos:
8591
path: ./
8692
layers:
8793
meta-leda-bsp:
88-
meta-leda-backports:
8994
meta-leda-components:
9095
meta-leda-distro:
9196
meta-leda-distro-container:

kas/.config-master.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ local_conf_header:
4141
RAUC_CERT_FILE = "${TOPDIR}/../examples/rauc/development-1.cert.pem"
4242
RAUC_KEYRING_URI = "file://${TOPDIR}/../examples/rauc/ca.cert.pem"
4343
RAUC_KEYRING_FILE = "${TOPDIR}/../examples/rauc/ca.cert.pem"
44+
meta-clang: |
45+
# mask the llvm recipe provided by kirkstone to avoid warnings:
46+
BBMASK += "/poky/meta/recipes-devtools/llvm/"
4447
repos:
4548
# This entry includes the repository where the config file is located
4649
# to the bblayers.conf:
@@ -53,9 +56,12 @@ repos:
5356
meta:
5457
meta-poky:
5558
meta-yocto-bsp:
56-
meta-lts-mixins:
59+
meta-lts-mixins-rust:
5760
url: "https://git.yoctoproject.org/git/meta-lts-mixins"
5861
refspec: kirkstone/rust-1.68
62+
meta-lts-mixins-go:
63+
url: "https://git.yoctoproject.org/git/meta-lts-mixins"
64+
refspec: kirkstone/go
5965
meta-clang:
6066
url: https://github.com/kraj/meta-clang
6167
refspec: kirkstone
@@ -85,7 +91,6 @@ repos:
8591
path: ./
8692
layers:
8793
meta-leda-bsp:
88-
meta-leda-backports:
8994
meta-leda-components:
9095
meta-leda-distro:
9196
meta-leda-distro-container:

meta-leda-backports/conf/layer.conf

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

meta-leda-backports/recipes-devtools/COPYING.MIT

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

meta-leda-backports/recipes-devtools/go-1.20.1/go-1.20.1.inc

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

0 commit comments

Comments
 (0)