A few changes: - Drop meta-clang since it was merged into oe-core - Move meta-arago-test to meta-ti-test - Drop meta-arago since this is a poky build
Signed-off-by: Ryan Eatmon <[email protected]> --- bitbake-setup/poky-master-config.conf.json | 13 +------------ bitbake-setup/poky-master-wip-config.conf.json | 13 +------------ configs/poky-master-config.txt | 4 +--- configs/poky-master-wip-config.txt | 4 +--- kas/poky-master-config.yml | 10 ++-------- kas/poky-master-wip-config.yml | 10 ++-------- src/configs/poky-master-config.xml | 11 ++--------- src/configs/poky-master-wip-config.xml | 11 ++--------- 8 files changed, 12 insertions(+), 64 deletions(-) diff --git a/bitbake-setup/poky-master-config.conf.json b/bitbake-setup/poky-master-config.conf.json index f01ca8e..4726117 100644 --- a/bitbake-setup/poky-master-config.conf.json +++ b/bitbake-setup/poky-master-config.conf.json @@ -67,17 +67,6 @@ "rev": "master" }, "path": "oe-core" - }, - "meta-arago": { - "git-remote": { - "remotes": { - "origin": { - "uri": "https://git.yoctoproject.org/meta-arago"; - } - }, - "rev": "master" - }, - "path": "meta-arago" } }, "bitbake-setup": { @@ -85,7 +74,7 @@ { "name": "poky", "description": "Yocto Project Poky reference distro build", - "bb-layers": [ "meta-yocto/meta-poky","meta-yocto/meta-yocto-bsp","meta-ti/meta-ti-extras","meta-ti/meta-ti-bsp","meta-arm/meta-arm","meta-arm/meta-arm-toolchain","oe-core/meta","meta-arago/meta-arago-extras","meta-arago/meta-arago-test","oe-layersetup" ], + "bb-layers": [ "meta-yocto/meta-poky","meta-yocto/meta-yocto-bsp","meta-ti/meta-ti-test","meta-ti/meta-ti-extras","meta-ti/meta-beagle","meta-ti/meta-ti-bsp","meta-arm/meta-arm","meta-arm/meta-arm-toolchain","oe-core/meta","oe-layersetup" ], "oe-fragments": [ "oe-layersetup/localconf/local-poky-v3" ], "oe-fragments-one-of": { "machine": { diff --git a/bitbake-setup/poky-master-wip-config.conf.json b/bitbake-setup/poky-master-wip-config.conf.json index 53a3df3..b949b3f 100644 --- a/bitbake-setup/poky-master-wip-config.conf.json +++ b/bitbake-setup/poky-master-wip-config.conf.json @@ -67,17 +67,6 @@ "rev": "master" }, "path": "oe-core" - }, - "meta-arago": { - "git-remote": { - "remotes": { - "origin": { - "uri": "https://git.yoctoproject.org/meta-arago"; - } - }, - "rev": "master-wip" - }, - "path": "meta-arago" } }, "bitbake-setup": { @@ -85,7 +74,7 @@ { "name": "poky", "description": "Yocto Project Poky reference distro build", - "bb-layers": [ "meta-yocto/meta-poky","meta-yocto/meta-yocto-bsp","meta-ti/meta-ti-extras","meta-ti/meta-ti-bsp","meta-arm/meta-arm","meta-arm/meta-arm-toolchain","oe-core/meta","meta-arago/meta-arago-extras","meta-arago/meta-arago-test","oe-layersetup" ], + "bb-layers": [ "meta-yocto/meta-poky","meta-yocto/meta-yocto-bsp","meta-ti/meta-ti-test","meta-ti/meta-ti-extras","meta-ti/meta-beagle","meta-ti/meta-ti-bsp","meta-arm/meta-arm","meta-arm/meta-arm-toolchain","oe-core/meta","oe-layersetup" ], "oe-fragments": [ "oe-layersetup/localconf/local-poky-v3" ], "oe-fragments-one-of": { "machine": { diff --git a/configs/poky-master-config.txt b/configs/poky-master-config.txt index 307d79d..45639a7 100644 --- a/configs/poky-master-config.txt +++ b/configs/poky-master-config.txt @@ -3,11 +3,9 @@ bitbake,https://git.openembedded.org/bitbake,master,HEAD meta-yocto,https://git.yoctoproject.org/meta-yocto,master,HEAD,layers=meta-poky:meta-yocto-bsp -meta-ti,https://git.yoctoproject.org/meta-ti,master,HEAD,layers=meta-ti-extras:meta-ti-bsp +meta-ti,https://git.yoctoproject.org/meta-ti,master,HEAD,layers=meta-ti-test:meta-ti-extras:meta-beagle:meta-ti-bsp meta-arm,https://git.yoctoproject.org/meta-arm,master,HEAD,layers=meta-arm:meta-arm-toolchain -#meta-clang,https://github.com/kraj/meta-clang,master,HEAD,layers= oe-core,https://git.openembedded.org/openembedded-core,master,HEAD,layers=meta -meta-arago,https://git.yoctoproject.org/meta-arago,master,HEAD,layers=meta-arago-extras:meta-arago-test OECORELAYERCONF=./sample-files/bblayers.conf.sample OECORELOCALCONF=./sample-files/local-poky-v3.conf.sample diff --git a/configs/poky-master-wip-config.txt b/configs/poky-master-wip-config.txt index 6602ce8..0a14f48 100644 --- a/configs/poky-master-wip-config.txt +++ b/configs/poky-master-wip-config.txt @@ -3,11 +3,9 @@ bitbake,https://git.openembedded.org/bitbake,master,HEAD meta-yocto,https://git.yoctoproject.org/meta-yocto,master,HEAD,layers=meta-poky:meta-yocto-bsp -meta-ti,https://git.yoctoproject.org/meta-ti,master-wip,HEAD,layers=meta-ti-extras:meta-ti-bsp +meta-ti,https://git.yoctoproject.org/meta-ti,master-wip,HEAD,layers=meta-ti-test:meta-ti-extras:meta-beagle:meta-ti-bsp meta-arm,https://git.yoctoproject.org/meta-arm,master,HEAD,layers=meta-arm:meta-arm-toolchain -#meta-clang,https://github.com/kraj/meta-clang,master,HEAD,layers= oe-core,https://git.openembedded.org/openembedded-core,master,HEAD,layers=meta -meta-arago,https://git.yoctoproject.org/meta-arago,master-wip,HEAD,layers=meta-arago-extras:meta-arago-test OECORELAYERCONF=./sample-files/bblayers.conf.sample OECORELOCALCONF=./sample-files/local-poky-v3.conf.sample diff --git a/kas/poky-master-config.yml b/kas/poky-master-config.yml index 7d66844..1b8035c 100644 --- a/kas/poky-master-config.yml +++ b/kas/poky-master-config.yml @@ -28,7 +28,9 @@ repos: branch: "master" path: "sources/meta-ti" layers: + meta-ti-test: meta-ti-extras: + meta-beagle: meta-ti-bsp: meta-arm: @@ -45,11 +47,3 @@ repos: path: "sources/oe-core" layers: meta: - - meta-arago: - url: "https://git.yoctoproject.org/meta-arago"; - branch: "master" - path: "sources/meta-arago" - layers: - meta-arago-extras: - meta-arago-test: diff --git a/kas/poky-master-wip-config.yml b/kas/poky-master-wip-config.yml index 7a92b90..ede97d9 100644 --- a/kas/poky-master-wip-config.yml +++ b/kas/poky-master-wip-config.yml @@ -28,7 +28,9 @@ repos: branch: "master-wip" path: "sources/meta-ti" layers: + meta-ti-test: meta-ti-extras: + meta-beagle: meta-ti-bsp: meta-arm: @@ -45,11 +47,3 @@ repos: path: "sources/oe-core" layers: meta: - - meta-arago: - url: "https://git.yoctoproject.org/meta-arago"; - branch: "master-wip" - path: "sources/meta-arago" - layers: - meta-arago-extras: - meta-arago-test: diff --git a/src/configs/poky-master-config.xml b/src/configs/poky-master-config.xml index f8fff75..8562f36 100644 --- a/src/configs/poky-master-config.xml +++ b/src/configs/poky-master-config.xml @@ -18,7 +18,9 @@ </repo> <repo name='meta-ti' url='https://git.yoctoproject.org/meta-ti' branch='master' commit='HEAD'> <layers> + <layer>meta-ti-test</layer> <layer>meta-ti-extras</layer> + <layer>meta-beagle</layer> <layer>meta-ti-bsp</layer> </layers> </repo> @@ -28,20 +30,11 @@ <layer>meta-arm-toolchain</layer> </layers> </repo> - <repo name='meta-clang' url='https://github.com/kraj/meta-clang' branch='master' commit='HEAD' disabled='true'> - <layers/> - </repo> <repo name='oe-core' url='https://git.openembedded.org/openembedded-core' branch='master' commit='HEAD'> <layers> <layer>meta</layer> </layers> </repo> - <repo name='meta-arago' url='https://git.yoctoproject.org/meta-arago' branch='master' commit='HEAD'> - <layers> - <layer>meta-arago-extras</layer> - <layer>meta-arago-test</layer> - </layers> - </repo> </repos> <tools> diff --git a/src/configs/poky-master-wip-config.xml b/src/configs/poky-master-wip-config.xml index 82375a6..9e4d6c0 100644 --- a/src/configs/poky-master-wip-config.xml +++ b/src/configs/poky-master-wip-config.xml @@ -18,7 +18,9 @@ </repo> <repo name='meta-ti' url='https://git.yoctoproject.org/meta-ti' branch='master-wip' commit='HEAD'> <layers> + <layer>meta-ti-test</layer> <layer>meta-ti-extras</layer> + <layer>meta-beagle</layer> <layer>meta-ti-bsp</layer> </layers> </repo> @@ -28,20 +30,11 @@ <layer>meta-arm-toolchain</layer> </layers> </repo> - <repo name='meta-clang' url='https://github.com/kraj/meta-clang' branch='master' commit='HEAD' disabled='true'> - <layers/> - </repo> <repo name='oe-core' url='https://git.openembedded.org/openembedded-core' branch='master' commit='HEAD'> <layers> <layer>meta</layer> </layers> </repo> - <repo name='meta-arago' url='https://git.yoctoproject.org/meta-arago' branch='master-wip' commit='HEAD'> - <layers> - <layer>meta-arago-extras</layer> - <layer>meta-arago-test</layer> - </layers> - </repo> </repos> <tools> -- 2.43.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#17543): https://lists.yoctoproject.org/g/meta-arago/message/17543 Mute This Topic: https://lists.yoctoproject.org/mt/119595922/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
