Skip to content

[build] Update to latest revisions of upstream layers with new overrides syntax #900

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

Merged
shr-project merged 22 commits into from
Aug 5, 2021
Merged

[build] Update to latest revisions of upstream layers with new overrides syntax #900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
906148d
files/ros*-honister.mcf: Update layer pins for 2021-08-03 with new ov…
shr-project Aug 3, 2021
69975e6
files-contrib/webos-*-honister.mcf: Update layer pins for 2021-08-03 …
shr-project Aug 3, 2021
902a21b
files/ros*-honister.mcf: Update layer pins for 2021-08-04
shr-project Aug 4, 2021
6d0c202
files-contrib/webos-*-honister.mcf: Update layer pins for 2021-08-04
shr-project Aug 4, 2021
300ed9c
files-contrib/webos-*-gatesgarth.mcf: use gatesgarth-2021-08-05-ose-2…
shr-project Aug 3, 2021
5f02772
files-contrib/webos-*-hardknott.mcf: use hardknott-2021-08-05-ose-2.1…
shr-project Aug 3, 2021
76d2ecd
files-contrib/webos-*-honister.mcf: Update layer pins for 2021-08-04 …
shr-project Aug 4, 2021
c9186f4
files-contrib/webos-*-honister.mcf: Update layer pins for 2021-08-04 …
shr-project Aug 4, 2021
52ca85c
files/ros*-honister.mcf: Update layer pins for 2021-08-04
shr-project Aug 4, 2021
faea7d6
files-contrib/webos-*-honister.mcf: Update layer pins for 2021-08-04
shr-project Aug 4, 2021
d97f3be
files-contrib/webos-*-gatesgarth.mcf: Update layer pins for 2021-08-05
shr-project Aug 5, 2021
01968d4
files-contrib/webos-*-hardknott.mcf: Update layer pins for 2021-08-05
shr-project Aug 5, 2021
debd23d
files/ros*-honister.mcf: Update layer pins for 2021-08-05
shr-project Aug 5, 2021
f0bf95e
files-contrib/webos-*-honister.mcf: Update layer pins for 2021-08-05
shr-project Aug 5, 2021
2fd6b97
files/ros*-dunfell.mcf: use latest revision in dunfell branch for met…
shr-project Aug 5, 2021
433e3b1
files/webos-*-dunfell.mcf: use latest revisions in dunfell branch for…
shr-project Aug 5, 2021
027149a
files/ros*-gatesgarth.mcf: use latest revision in gatesgarth branch f…
shr-project Aug 5, 2021
bf7e933
files-contrib/webos-*-gatesgarth.mcf: use latest revision in gatesgar…
shr-project Aug 5, 2021
91f93de
files/ros*-hardknott.mcf: use latest revision in hardknott branch for…
shr-project Aug 5, 2021
adf3ba7
files-contrib/webos-*-hardknott.mcf: use latest revision in hardknott…
shr-project Aug 5, 2021
113a6c4
files/ros*-honister.mcf: use latest revision in master branch for met…
shr-project Aug 5, 2021
e9ee9c4
files-contrib/webos-*-honister.mcf: use latest revision in master bra…
shr-project Aug 5, 2021
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
8 changes: 4 additions & 4 deletions files-contrib/webos-dashing-gatesgarth.mcf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ Machines = ['qemux86', 'raspberrypi4']
from os import getenv
MetaRos_RepoURL = getenv('MCF_META_ROS_REPO_URL', 'git://github.com/ros/meta-ros.git')
MetaRos_Branch = getenv('MCF_META_ROS_BRANCH', OE_Branch)
MetaRos_Commit = getenv('MCF_META_ROS_COMMIT', 'a2126a3e8')
MetaRos_Commit = getenv('MCF_META_ROS_COMMIT', 'b1c75b190')

MetaRosWebos_RepoURL = getenv('MCF_META_ROS_WEBOS_REPO_URL', 'git://github.com/ros/meta-ros-webos.git')
MetaRosWebos_Branch = getenv('MCF_META_ROS_WEBOS_BRANCH', OE_Branch)
MetaRosWebos_Commit = getenv('MCF_META_ROS_WEBOS_COMMIT', '78f3e52')
MetaRosWebos_Commit = getenv('MCF_META_ROS_WEBOS_COMMIT', '4ffb8d0')

MetaWebos_RepoURL = getenv('MCF_META_WEBOS_REPO_URL', 'git://github.com/shr-project/meta-webosose.git')
MetaWebos_Branch = getenv('MCF_META_WEBOS_BRANCH', OE_Branch)
MetaWebos_Commit = getenv('MCF_META_WEBOS_COMMIT', OE_Branch + '-2021-07-30')
MetaWebos_Commit = getenv('MCF_META_WEBOS_COMMIT', OE_Branch + '-2021-08-05-ose-2.12')

# Layers = [
# (layer-name: str, priority: int, URL: str, fetch: dict, options: dict),
Expand All @@ -47,7 +47,7 @@ Layers = [
('meta-python', 13, 'git://github.com/openembedded/meta-openembedded.git', {}, {}),
('meta-filesystems', 14, 'git://github.com/openembedded/meta-openembedded.git', {}, {}),

('meta-updater', 15, 'git://github.com/advancedtelematic/meta-updater.git', {'branch': 'master', 'commit': 'a0d9835'}, {}),
('meta-updater', 15, 'git://github.com/advancedtelematic/meta-updater.git', {'branch': 'master', 'commit': 'f29bd46'}, {}),
('meta-virtualization', 16, 'git://git.yoctoproject.org/meta-virtualization', {'branch': OE_Branch, 'commit': 'fa09322'}, {}),
('meta-python2', 17, 'git://git.openembedded.org/meta-python2', {'branch': OE_Branch, 'commit': '3fae17a'}, {}),

Expand Down
8 changes: 4 additions & 4 deletions files-contrib/webos-dashing-hardknott.mcf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ Machines = ['qemux86', 'raspberrypi4']
from os import getenv
MetaRos_RepoURL = getenv('MCF_META_ROS_REPO_URL', 'git://github.com/ros/meta-ros.git')
MetaRos_Branch = getenv('MCF_META_ROS_BRANCH', OE_Branch)
MetaRos_Commit = getenv('MCF_META_ROS_COMMIT', '03efda228')
MetaRos_Commit = getenv('MCF_META_ROS_COMMIT', '0e1490e03')

MetaRosWebos_RepoURL = getenv('MCF_META_ROS_WEBOS_REPO_URL', 'git://github.com/ros/meta-ros-webos.git')
MetaRosWebos_Branch = getenv('MCF_META_ROS_WEBOS_BRANCH', OE_Branch)
MetaRosWebos_Commit = getenv('MCF_META_ROS_WEBOS_COMMIT', '78f3e52')
MetaRosWebos_Commit = getenv('MCF_META_ROS_WEBOS_COMMIT', '4ffb8d0')

MetaWebos_RepoURL = getenv('MCF_META_WEBOS_REPO_URL', 'git://github.com/shr-project/meta-webosose.git')
MetaWebos_Branch = getenv('MCF_META_WEBOS_BRANCH', OE_Branch)
MetaWebos_Commit = getenv('MCF_META_WEBOS_COMMIT', OE_Branch + '-2021-07-30')
MetaWebos_Commit = getenv('MCF_META_WEBOS_COMMIT', OE_Branch + '-2021-08-05-ose-2.12')

# Layers = [
# (layer-name: str, priority: int, URL: str, fetch: dict, options: dict),
Expand All @@ -47,7 +47,7 @@ Layers = [
('meta-python', 13, 'git://github.com/openembedded/meta-openembedded.git', {}, {}),
('meta-filesystems', 14, 'git://github.com/openembedded/meta-openembedded.git', {}, {}),

('meta-updater', 15, 'git://github.com/advancedtelematic/meta-updater.git', {'branch': 'master', 'commit': 'a0d9835'}, {}),
('meta-updater', 15, 'git://github.com/advancedtelematic/meta-updater.git', {'branch': 'master', 'commit': 'f29bd46'}, {}),
('meta-virtualization', 16, 'git://git.yoctoproject.org/meta-virtualization', {'branch': OE_Branch, 'commit': '679a22e'}, {}),
('meta-python2', 17, 'git://git.openembedded.org/meta-python2', {'branch': OE_Branch, 'commit': '8db9e4f'}, {}),

Expand Down
24 changes: 12 additions & 12 deletions files-contrib/webos-dashing-honister.mcf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ Machines = ['qemux86', 'raspberrypi4']
from os import getenv
MetaRos_RepoURL = getenv('MCF_META_ROS_REPO_URL', 'git://github.com/ros/meta-ros.git')
MetaRos_Branch = getenv('MCF_META_ROS_BRANCH', OE_Branch)
MetaRos_Commit = getenv('MCF_META_ROS_COMMIT', '52247cb88')
MetaRos_Commit = getenv('MCF_META_ROS_COMMIT', '78ed6154f')

MetaRosWebos_RepoURL = getenv('MCF_META_ROS_WEBOS_REPO_URL', 'git://github.com/ros/meta-ros-webos.git')
MetaRosWebos_Branch = getenv('MCF_META_ROS_WEBOS_BRANCH', OE_Branch)
MetaRosWebos_Commit = getenv('MCF_META_ROS_WEBOS_COMMIT', '78f3e52')
MetaRosWebos_Commit = getenv('MCF_META_ROS_WEBOS_COMMIT', '4ffb8d0')

MetaWebos_RepoURL = getenv('MCF_META_WEBOS_REPO_URL', 'git://github.com/shr-project/meta-webosose.git')
MetaWebos_Branch = getenv('MCF_META_WEBOS_BRANCH', OE_Branch)
MetaWebos_Commit = getenv('MCF_META_WEBOS_COMMIT', OE_Branch + '-2021-07-30')
MetaWebos_Commit = getenv('MCF_META_WEBOS_COMMIT', OE_Branch + '-2021-08-05-ose-2.12')

# Layers = [
# (layer-name: str, priority: int, URL: str, fetch: dict, options: dict),
Expand All @@ -37,37 +37,37 @@ MetaWebos_Commit = getenv('MCF_META_WEBOS_COMMIT', OE_Branch + '-2021-07-30')
# Note that the github.com/openembedded repositories are read-only mirrors of
# the authoritative repositories on git.openembedded.org .
Layers = [
('bitbake', -1, 'git://github.com/openembedded/bitbake.git', {'branch': Bitbake_Branch, 'commit': '01925164'}, {}),
('bitbake', -1, 'git://github.com/openembedded/bitbake.git', {'branch': Bitbake_Branch, 'commit': '01a63223'}, {}),

('meta', 5, 'git://github.com/openembedded/openembedded-core.git', {'branch': OE_Branch, 'commit': 'e6aa4b1f6f'}, {}),
('meta', 5, 'git://github.com/openembedded/openembedded-core.git', {'branch': OE_Branch, 'commit': '9adf897176'}, {}),

('meta-oe', 10, 'git://github.com/openembedded/meta-openembedded.git', {'branch': OE_Branch, 'commit': '86be1d8917'}, {}),
('meta-oe', 10, 'git://github.com/openembedded/meta-openembedded.git', {'branch': OE_Branch, 'commit': '566049b4f1'}, {}),
('meta-multimedia', 11, 'git://github.com/openembedded/meta-openembedded.git', {}, {}),
('meta-networking', 12, 'git://github.com/openembedded/meta-openembedded.git', {}, {}),
('meta-python', 13, 'git://github.com/openembedded/meta-openembedded.git', {}, {}),
('meta-filesystems', 14, 'git://github.com/openembedded/meta-openembedded.git', {}, {}),

('meta-updater', 15, 'git://github.com/advancedtelematic/meta-updater.git', {'branch': OE_Branch, 'commit': 'a0d9835'}, {}),
('meta-virtualization', 16, 'git://git.yoctoproject.org/meta-virtualization', {'branch': OE_Branch, 'commit': 'b975a66'}, {}),
('meta-python2', 17, 'git://git.openembedded.org/meta-python2', {'branch': OE_Branch, 'commit': '8db9e4f'}, {}),
('meta-updater', 15, 'git://github.com/advancedtelematic/meta-updater.git', {'branch': OE_Branch, 'commit': 'f29bd46'}, {}),
('meta-virtualization', 16, 'git://git.yoctoproject.org/meta-virtualization', {'branch': 'master-next', 'commit': '96712be'}, {}),
('meta-python2', 17, 'git://git.openembedded.org/meta-python2', {'branch': OE_Branch, 'commit': 'f522fa7'}, {}),

('meta-qt6', 20, 'git://code.qt.io/yocto/meta-qt6.git', {'branch': '6.2', 'commit': '9a4453a'}, {}),
('meta-qt6', 20, 'git://github.com/shr-project/meta-qt6.git', {'branch': 'jansa/6.2-9a4453a-overrides-syntax', 'commit': 'c9e58d2'}, {}),

('meta-ros-common', 37, MetaRos_RepoURL, {'branch': MetaRos_Branch, 'commit': MetaRos_Commit}, {}),
('meta-ros2', 38, MetaRos_RepoURL, {}, {}),
('meta-ros2-' + ROS_Distribution, 39, MetaRos_RepoURL, {}, {}),

('meta-webos', 40, MetaWebos_RepoURL, {'branch': MetaWebos_Branch, 'commit': MetaWebos_Commit}, {}),

('meta-raspberrypi', 50, 'git://git.yoctoproject.org/meta-raspberrypi', {'branch': OE_Branch, 'commit': '8dc3a31'}, {}),
('meta-raspberrypi', 50, 'git://git.yoctoproject.org/meta-raspberrypi', {'branch': OE_Branch, 'commit': '7fb784a'}, {}),
('meta-webos-raspberrypi', 51, MetaWebos_RepoURL, {}, {}),
('meta-webos-updater', 52, MetaWebos_RepoURL, {}, {}),
('meta-webos-virtualization', 53, MetaWebos_RepoURL, {}, {}),

('meta-ros-webos', 60, MetaRosWebos_RepoURL, {'branch': MetaRosWebos_Branch, 'commit': MetaRosWebos_Commit}, {}),

('meta-webos-smack', 75, MetaWebos_RepoURL, {}, {}),
('meta-security', 77, 'git://git.yoctoproject.org/meta-security', {'branch': OE_Branch, 'commit': 'd3a484a'}, {}),
('meta-security', 77, 'git://git.yoctoproject.org/meta-security', {'branch': OE_Branch, 'commit': 'c885d39'}, {}),
]

# BblayersConfExtraLines is a list of strings to be appended to the generated
Expand Down
8 changes: 4 additions & 4 deletions files-contrib/webos-eloquent-gatesgarth.mcf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ Machines = ['qemux86', 'raspberrypi4']
from os import getenv
MetaRos_RepoURL = getenv('MCF_META_ROS_REPO_URL', 'git://github.com/ros/meta-ros.git')
MetaRos_Branch = getenv('MCF_META_ROS_BRANCH', OE_Branch)
MetaRos_Commit = getenv('MCF_META_ROS_COMMIT', 'a2126a3e8')
MetaRos_Commit = getenv('MCF_META_ROS_COMMIT', 'b1c75b190')

MetaRosWebos_RepoURL = getenv('MCF_META_ROS_WEBOS_REPO_URL', 'git://github.com/ros/meta-ros-webos.git')
MetaRosWebos_Branch = getenv('MCF_META_ROS_WEBOS_BRANCH', OE_Branch)
MetaRosWebos_Commit = getenv('MCF_META_ROS_WEBOS_COMMIT', '78f3e52')
MetaRosWebos_Commit = getenv('MCF_META_ROS_WEBOS_COMMIT', '4ffb8d0')

MetaWebos_RepoURL = getenv('MCF_META_WEBOS_REPO_URL', 'git://github.com/shr-project/meta-webosose.git')
MetaWebos_Branch = getenv('MCF_META_WEBOS_BRANCH', OE_Branch)
MetaWebos_Commit = getenv('MCF_META_WEBOS_COMMIT', OE_Branch + '-2021-07-30')
MetaWebos_Commit = getenv('MCF_META_WEBOS_COMMIT', OE_Branch + '-2021-08-05-ose-2.12')

# Layers = [
# (layer-name: str, priority: int, URL: str, fetch: dict, options: dict),
Expand All @@ -47,7 +47,7 @@ Layers = [
('meta-python', 13, 'git://github.com/openembedded/meta-openembedded.git', {}, {}),
('meta-filesystems', 14, 'git://github.com/openembedded/meta-openembedded.git', {}, {}),

('meta-updater', 15, 'git://github.com/advancedtelematic/meta-updater.git', {'branch': 'master', 'commit': 'a0d9835'}, {}),
('meta-updater', 15, 'git://github.com/advancedtelematic/meta-updater.git', {'branch': 'master', 'commit': 'f29bd46'}, {}),
('meta-virtualization', 16, 'git://git.yoctoproject.org/meta-virtualization', {'branch': OE_Branch, 'commit': 'fa09322'}, {}),
('meta-python2', 17, 'git://git.openembedded.org/meta-python2', {'branch': OE_Branch, 'commit': '3fae17a'}, {}),

Expand Down
8 changes: 4 additions & 4 deletions files-contrib/webos-eloquent-hardknott.mcf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ Machines = ['qemux86', 'raspberrypi4']
from os import getenv
MetaRos_RepoURL = getenv('MCF_META_ROS_REPO_URL', 'git://github.com/ros/meta-ros.git')
MetaRos_Branch = getenv('MCF_META_ROS_BRANCH', OE_Branch)
MetaRos_Commit = getenv('MCF_META_ROS_COMMIT', '03efda228')
MetaRos_Commit = getenv('MCF_META_ROS_COMMIT', '0e1490e03')

MetaRosWebos_RepoURL = getenv('MCF_META_ROS_WEBOS_REPO_URL', 'git://github.com/ros/meta-ros-webos.git')
MetaRosWebos_Branch = getenv('MCF_META_ROS_WEBOS_BRANCH', OE_Branch)
MetaRosWebos_Commit = getenv('MCF_META_ROS_WEBOS_COMMIT', '78f3e52')
MetaRosWebos_Commit = getenv('MCF_META_ROS_WEBOS_COMMIT', '4ffb8d0')

MetaWebos_RepoURL = getenv('MCF_META_WEBOS_REPO_URL', 'git://github.com/shr-project/meta-webosose.git')
MetaWebos_Branch = getenv('MCF_META_WEBOS_BRANCH', OE_Branch)
MetaWebos_Commit = getenv('MCF_META_WEBOS_COMMIT', OE_Branch + '-2021-07-30')
MetaWebos_Commit = getenv('MCF_META_WEBOS_COMMIT', OE_Branch + '-2021-08-05-ose-2.12')

# Layers = [
# (layer-name: str, priority: int, URL: str, fetch: dict, options: dict),
Expand All @@ -47,7 +47,7 @@ Layers = [
('meta-python', 13, 'git://github.com/openembedded/meta-openembedded.git', {}, {}),
('meta-filesystems', 14, 'git://github.com/openembedded/meta-openembedded.git', {}, {}),

('meta-updater', 15, 'git://github.com/advancedtelematic/meta-updater.git', {'branch': 'master', 'commit': 'a0d9835'}, {}),
('meta-updater', 15, 'git://github.com/advancedtelematic/meta-updater.git', {'branch': 'master', 'commit': 'f29bd46'}, {}),
('meta-virtualization', 16, 'git://git.yoctoproject.org/meta-virtualization', {'branch': OE_Branch, 'commit': '679a22e'}, {}),
('meta-python2', 17, 'git://git.openembedded.org/meta-python2', {'branch': OE_Branch, 'commit': '8db9e4f'}, {}),

Expand Down
Loading