Skip to content
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.

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

remove layer meta-leda backports in favour of meta-lts-mixins #210

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions .config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ local_conf_header:
RAUC_CERT_FILE = "${TOPDIR}/../examples/rauc/development-1.cert.pem"
RAUC_KEYRING_URI = "file://${TOPDIR}/../examples/rauc/ca.cert.pem"
RAUC_KEYRING_FILE = "${TOPDIR}/../examples/rauc/ca.cert.pem"
meta-clang: |
# mask the llvm recipe provided by kirkstone to avoid warnings:
BBMASK += "/poky/meta/recipes-devtools/llvm/"
repos:
# This entry includes the repository where the config file is located
# to the bblayers.conf:
Expand All @@ -53,9 +56,12 @@ repos:
meta:
meta-poky:
meta-yocto-bsp:
meta-lts-mixins:
meta-lts-mixins-rust:
url: "https://git.yoctoproject.org/git/meta-lts-mixins"
refspec: kirkstone/rust-1.68
meta-lts-mixins-go:
url: "https://git.yoctoproject.org/git/meta-lts-mixins"
refspec: kirkstone/go
meta-clang:
url: https://github.com/kraj/meta-clang
refspec: kirkstone
Expand Down Expand Up @@ -85,7 +91,6 @@ repos:
path: ./
layers:
meta-leda-bsp:
meta-leda-backports:
meta-leda-components:
meta-leda-distro:
meta-leda-distro-container:
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ build/
# Metalayer folders are created by running "kas build" and we don't
# want to commit them as git submodules.
meta-kanto
meta-lts-mixins
meta-lts-mixins-rust
meta-lts-mixins-go
meta-openembedded
meta-rauc
meta-rauc-community
Expand Down
2 changes: 1 addition & 1 deletion conf/layer.conf
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
BBFILE_COLLECTIONS += "meta-leda"
BBFILE_PATTERN_meta-leda := "^${LAYERDIR}/"
BBFILE_PRIORITY_meta-leda = "7"
LAYERDEPENDS_meta-leda += "core meta-leda-bsp meta-leda-components meta-leda-distro meta-leda-backports"
LAYERDEPENDS_meta-leda += "core meta-leda-bsp meta-leda-components meta-leda-distro"
LAYERSERIES_COMPAT_meta-leda = "kirkstone"
9 changes: 7 additions & 2 deletions kas/.config-components.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ local_conf_header:
needed-features: |
DISTRO_FEATURES += " sdv rauc virtualization"
INHERIT += " rm_work"
meta-clang: |
# mask the llvm recipe provided by kirkstone to avoid warnings:
BBMASK += "/poky/meta/recipes-devtools/llvm/"
repos:
poky:
url: "https://git.yoctoproject.org/git/poky"
Expand All @@ -38,9 +41,12 @@ repos:
meta:
meta-poky:
meta-yocto-bsp:
meta-lts-mixins:
meta-lts-mixins-rust:
url: "https://git.yoctoproject.org/git/meta-lts-mixins"
refspec: kirkstone/rust-1.68
meta-lts-mixins-go:
url: "https://git.yoctoproject.org/git/meta-lts-mixins"
refspec: kirkstone/go
meta-clang:
url: https://github.com/kraj/meta-clang
refspec: kirkstone
Expand All @@ -64,5 +70,4 @@ repos:
meta-leda:
path: ./
layers:
meta-leda-backports:
meta-leda-components:
9 changes: 7 additions & 2 deletions kas/.config-kirkstone-rpi4.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ local_conf_header:
RAUC_CERT_FILE = "${COREBASE}/../examples/rauc/development-1.cert.pem"
RAUC_KEYRING_URI = "file://${TOPDIR}/../examples/rauc/ca.cert.pem"
RAUC_KEYRING_FILE = "${TOPDIR}/../examples/rauc/ca.cert.pem"
meta-clang: |
# mask the llvm recipe provided by kirkstone to avoid warnings:
BBMASK += "/poky/meta/recipes-devtools/llvm/"
repos:
# This entry includes the repository where the config file is located
# to the bblayers.conf:
Expand All @@ -53,9 +56,12 @@ repos:
meta:
meta-poky:
meta-yocto-bsp:
meta-lts-mixins:
meta-lts-mixins-rust:
url: "https://git.yoctoproject.org/git/meta-lts-mixins"
refspec: kirkstone/rust-1.68
meta-lts-mixins-go:
url: "https://git.yoctoproject.org/git/meta-lts-mixins"
refspec: kirkstone/go
meta-clang:
url: https://github.com/kraj/meta-clang
refspec: kirkstone
Expand Down Expand Up @@ -88,7 +94,6 @@ repos:
path: ./
layers:
meta-leda-bsp:
meta-leda-backports:
meta-leda-components:
meta-leda-distro:
meta-leda-distro-container:
9 changes: 7 additions & 2 deletions kas/.config-kirkstone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ local_conf_header:
RAUC_CERT_FILE = "${TOPDIR}/../examples/rauc/development-1.cert.pem"
RAUC_KEYRING_URI = "file://${TOPDIR}/../examples/rauc/ca.cert.pem"
RAUC_KEYRING_FILE = "${TOPDIR}/../examples/rauc/ca.cert.pem"
meta-clang: |
# mask the llvm recipe provided by kirkstone to avoid warnings:
BBMASK += "/poky/meta/recipes-devtools/llvm/"
repos:
# This entry includes the repository where the config file is located
# to the bblayers.conf:
Expand All @@ -53,9 +56,12 @@ repos:
meta:
meta-poky:
meta-yocto-bsp:
meta-lts-mixins:
meta-lts-mixins-rust:
url: "https://git.yoctoproject.org/git/meta-lts-mixins"
refspec: kirkstone/rust-1.68
meta-lts-mixins-go:
url: "https://git.yoctoproject.org/git/meta-lts-mixins"
refspec: kirkstone/go
meta-clang:
url: https://github.com/kraj/meta-clang
refspec: kirkstone
Expand Down Expand Up @@ -85,7 +91,6 @@ repos:
path: ./
layers:
meta-leda-bsp:
meta-leda-backports:
meta-leda-components:
meta-leda-distro:
meta-leda-distro-container:
9 changes: 7 additions & 2 deletions kas/.config-master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ local_conf_header:
RAUC_CERT_FILE = "${TOPDIR}/../examples/rauc/development-1.cert.pem"
RAUC_KEYRING_URI = "file://${TOPDIR}/../examples/rauc/ca.cert.pem"
RAUC_KEYRING_FILE = "${TOPDIR}/../examples/rauc/ca.cert.pem"
meta-clang: |
# mask the llvm recipe provided by kirkstone to avoid warnings:
BBMASK += "/poky/meta/recipes-devtools/llvm/"
repos:
# This entry includes the repository where the config file is located
# to the bblayers.conf:
Expand All @@ -53,9 +56,12 @@ repos:
meta:
meta-poky:
meta-yocto-bsp:
meta-lts-mixins:
meta-lts-mixins-rust:
url: "https://git.yoctoproject.org/git/meta-lts-mixins"
refspec: kirkstone/rust-1.68
meta-lts-mixins-go:
url: "https://git.yoctoproject.org/git/meta-lts-mixins"
refspec: kirkstone/go
meta-clang:
url: https://github.com/kraj/meta-clang
refspec: kirkstone
Expand Down Expand Up @@ -85,7 +91,6 @@ repos:
path: ./
layers:
meta-leda-bsp:
meta-leda-backports:
meta-leda-components:
meta-leda-distro:
meta-leda-distro-container:
27 changes: 0 additions & 27 deletions meta-leda-backports/conf/layer.conf

This file was deleted.

17 changes: 0 additions & 17 deletions meta-leda-backports/recipes-devtools/COPYING.MIT

This file was deleted.

21 changes: 0 additions & 21 deletions meta-leda-backports/recipes-devtools/go-1.20.1/go-1.20.1.inc

This file was deleted.

This file was deleted.

47 changes: 0 additions & 47 deletions meta-leda-backports/recipes-devtools/go-1.20.1/go-common.inc

This file was deleted.

Loading
Loading