From bb537ad65b8040ccff3f2218d3988960215ceda1 Mon Sep 17 00:00:00 2001 From: Josef Holzmayr Date: Tue, 12 Mar 2024 12:28:55 +0100 Subject: [PATCH] fix: kas: use poky as base distribution for all builds Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr --- kas/apalis-imx8-boot2qt.yml | 7 ------- kas/beaglebone.yml | 5 ----- kas/cubox-i.yml | 1 - kas/imx7d-pico.yml | 1 - kas/imx7s-warp.yml | 1 - kas/imx8mm-var-dart.yml | 1 - kas/include/mender-base.yml | 17 ++++++----------- kas/include/poky.yml | 11 ----------- kas/jetson-agx-xavier-devkit.yml | 1 - kas/jetson-nano-2gb-devkit.yml | 1 - kas/jetson-nano-devkit-emmc.yml | 1 - kas/jetson-nano-devkit.yml | 1 - kas/jetson-tx2-devkit-4gb.yml | 1 - kas/jetson-tx2-devkit-tx2i.yml | 1 - kas/jetson-tx2-devkit.yml | 1 - kas/jetson-xavier-nx-devkit-emmc.yml | 1 - kas/jetson-xavier-nx-devkit-tx2-nx.yml | 1 - kas/jetson-xavier-nx-devkit.yml | 1 - kas/nitrogen8m.yml | 1 - kas/nitrogen8mm.yml | 1 - kas/nitrogen8mn.yml | 1 - kas/nitrogen8mp.yml | 1 - kas/rock-pi-e.yml | 1 - 23 files changed, 6 insertions(+), 53 deletions(-) delete mode 100644 kas/include/poky.yml diff --git a/kas/apalis-imx8-boot2qt.yml b/kas/apalis-imx8-boot2qt.yml index 8250c94f..e5b1b992 100644 --- a/kas/apalis-imx8-boot2qt.yml +++ b/kas/apalis-imx8-boot2qt.yml @@ -5,13 +5,6 @@ header: - kas/include/nxp.yml repos: - openembedded-core: - refspec: f7766da462905ec67bf549d46b8017be36cd5b2a - meta-yocto: - url: https://git.yoctoproject.org/git/meta-yocto - refspec: ca9c465e37b693ab768ee8e21a929d1c18956e98 - layers: - meta-poky: meta-openembedded: refspec: a8055484f2829e8dfd03d5c8520b2c611aa7ebd2 layers: diff --git a/kas/beaglebone.yml b/kas/beaglebone.yml index 2eed8542..3c9a121e 100644 --- a/kas/beaglebone.yml +++ b/kas/beaglebone.yml @@ -4,11 +4,6 @@ header: - kas/include/mender-full.yml repos: - meta-yocto: - url: git://git.yoctoproject.org/meta-yocto - refspec: 15fd5faf510329a8022b60c53576eb76451d4358 - layers: - meta-yocto-bsp: meta-mender-community: layers: meta-mender-beaglebone: diff --git a/kas/cubox-i.yml b/kas/cubox-i.yml index db968f2e..b2d0ba28 100644 --- a/kas/cubox-i.yml +++ b/kas/cubox-i.yml @@ -2,7 +2,6 @@ header: version: 11 includes: - kas/include/mender-full.yml - - kas/include/poky.yml - kas/include/nxp.yml machine: cubox-i diff --git a/kas/imx7d-pico.yml b/kas/imx7d-pico.yml index 70266db2..428f1ba7 100644 --- a/kas/imx7d-pico.yml +++ b/kas/imx7d-pico.yml @@ -2,7 +2,6 @@ header: version: 11 includes: - kas/include/mender-full.yml - - kas/include/poky.yml - kas/include/nxp.yml machine: imx7d-pico diff --git a/kas/imx7s-warp.yml b/kas/imx7s-warp.yml index c66ef28a..9dd19c98 100644 --- a/kas/imx7s-warp.yml +++ b/kas/imx7s-warp.yml @@ -2,7 +2,6 @@ header: version: 11 includes: - kas/include/mender-full.yml - - kas/include/poky.yml - kas/include/nxp.yml machine: imx7s-warp diff --git a/kas/imx8mm-var-dart.yml b/kas/imx8mm-var-dart.yml index 31c6f41f..412a79b1 100644 --- a/kas/imx8mm-var-dart.yml +++ b/kas/imx8mm-var-dart.yml @@ -2,7 +2,6 @@ header: version: 11 includes: - kas/include/mender-full.yml - - kas/include/poky.yml - kas/include/nxp.yml - kas/include/variscite.yml diff --git a/kas/include/mender-base.yml b/kas/include/mender-base.yml index 6a08b103..e1974a85 100644 --- a/kas/include/mender-base.yml +++ b/kas/include/mender-base.yml @@ -1,21 +1,16 @@ header: version: 11 -distro: "" +distro: "poky" repos: - openembedded-core: - url: http://git.openembedded.org/openembedded-core - refspec: d63af11e92094487d6e358f27283e5385937e7a8 + poky: + url: http://git.yoctoproject.org/poky + refspec: d34002348374669528bb884c2d7be1b91938f471 layers: meta: - - bitbake: - url: http://git.openembedded.org/bitbake - refspec: 40fd5f4eef7460ca67f32cfce8e229e67e1ff607 - path: "openembedded-core/bitbake" - layers: - bitbake: excluded + meta-poky: + meta-yocto-bsp: meta-openembedded: url: https://git.openembedded.org/meta-openembedded diff --git a/kas/include/poky.yml b/kas/include/poky.yml deleted file mode 100644 index 312377e9..00000000 --- a/kas/include/poky.yml +++ /dev/null @@ -1,11 +0,0 @@ -header: - version: 11 - -repos: - meta-yocto: - url: https://git.yoctoproject.org/git/meta-yocto - refspec: 15fd5faf510329a8022b60c53576eb76451d4358 - layers: - meta-poky: - -distro: poky diff --git a/kas/jetson-agx-xavier-devkit.yml b/kas/jetson-agx-xavier-devkit.yml index 728531ef..31b36165 100644 --- a/kas/jetson-agx-xavier-devkit.yml +++ b/kas/jetson-agx-xavier-devkit.yml @@ -2,7 +2,6 @@ header: version: 11 includes: - kas/include/mender-full.yml - - kas/include/poky.yml - kas/include/tegra.yml machine: jetson-agx-xavier-devkit diff --git a/kas/jetson-nano-2gb-devkit.yml b/kas/jetson-nano-2gb-devkit.yml index 5151754d..89b99214 100644 --- a/kas/jetson-nano-2gb-devkit.yml +++ b/kas/jetson-nano-2gb-devkit.yml @@ -2,7 +2,6 @@ header: version: 11 includes: - kas/include/mender-full.yml - - kas/include/poky.yml - kas/include/tegra.yml machine: jetson-nano-2gb-devkit diff --git a/kas/jetson-nano-devkit-emmc.yml b/kas/jetson-nano-devkit-emmc.yml index f8ce00cf..c03e3f53 100644 --- a/kas/jetson-nano-devkit-emmc.yml +++ b/kas/jetson-nano-devkit-emmc.yml @@ -2,7 +2,6 @@ header: version: 11 includes: - kas/include/mender-full.yml - - kas/include/poky.yml - kas/include/tegra.yml machine: jetson-nano-devkit-emmc diff --git a/kas/jetson-nano-devkit.yml b/kas/jetson-nano-devkit.yml index 1df83837..df60e40f 100644 --- a/kas/jetson-nano-devkit.yml +++ b/kas/jetson-nano-devkit.yml @@ -2,7 +2,6 @@ header: version: 11 includes: - kas/include/mender-full.yml - - kas/include/poky.yml - kas/include/tegra.yml machine: jetson-nano-devkit diff --git a/kas/jetson-tx2-devkit-4gb.yml b/kas/jetson-tx2-devkit-4gb.yml index f0f384d7..b028223d 100644 --- a/kas/jetson-tx2-devkit-4gb.yml +++ b/kas/jetson-tx2-devkit-4gb.yml @@ -2,7 +2,6 @@ header: version: 11 includes: - kas/include/mender-full.yml - - kas/include/poky.yml - kas/include/tegra.yml machine: jetson-tx2-devkit-4gb diff --git a/kas/jetson-tx2-devkit-tx2i.yml b/kas/jetson-tx2-devkit-tx2i.yml index cfb0ff16..5dc0e743 100644 --- a/kas/jetson-tx2-devkit-tx2i.yml +++ b/kas/jetson-tx2-devkit-tx2i.yml @@ -2,7 +2,6 @@ header: version: 11 includes: - kas/include/mender-full.yml - - kas/include/poky.yml - kas/include/tegra.yml machine: jetson-tx2-devkit-tx2i diff --git a/kas/jetson-tx2-devkit.yml b/kas/jetson-tx2-devkit.yml index 3f58a649..c64d3a9e 100644 --- a/kas/jetson-tx2-devkit.yml +++ b/kas/jetson-tx2-devkit.yml @@ -2,7 +2,6 @@ header: version: 11 includes: - kas/include/mender-full.yml - - kas/include/poky.yml - kas/include/tegra.yml machine: jetson-tx2-devkit diff --git a/kas/jetson-xavier-nx-devkit-emmc.yml b/kas/jetson-xavier-nx-devkit-emmc.yml index e9fe749a..9d4ef906 100644 --- a/kas/jetson-xavier-nx-devkit-emmc.yml +++ b/kas/jetson-xavier-nx-devkit-emmc.yml @@ -2,7 +2,6 @@ header: version: 11 includes: - kas/include/mender-full.yml - - kas/include/poky.yml - kas/include/tegra.yml machine: jetson-xavier-nx-devkit-emmc diff --git a/kas/jetson-xavier-nx-devkit-tx2-nx.yml b/kas/jetson-xavier-nx-devkit-tx2-nx.yml index 40a53c88..07ce8fe1 100644 --- a/kas/jetson-xavier-nx-devkit-tx2-nx.yml +++ b/kas/jetson-xavier-nx-devkit-tx2-nx.yml @@ -2,7 +2,6 @@ header: version: 11 includes: - kas/include/mender-full.yml - - kas/include/poky.yml - kas/include/tegra.yml machine: jetson-xavier-nx-devkit-tx2-nx diff --git a/kas/jetson-xavier-nx-devkit.yml b/kas/jetson-xavier-nx-devkit.yml index 2cae99e7..5a1aed8d 100644 --- a/kas/jetson-xavier-nx-devkit.yml +++ b/kas/jetson-xavier-nx-devkit.yml @@ -2,7 +2,6 @@ header: version: 11 includes: - kas/include/mender-full.yml - - kas/include/poky.yml - kas/include/tegra.yml machine: jetson-xavier-nx-devkit diff --git a/kas/nitrogen8m.yml b/kas/nitrogen8m.yml index a70fd61a..9f2dde81 100644 --- a/kas/nitrogen8m.yml +++ b/kas/nitrogen8m.yml @@ -2,7 +2,6 @@ header: version: 11 includes: - kas/include/mender-full.yml - - kas/include/poky.yml - kas/include/nxp.yml - kas/include/boundarydevices.yml diff --git a/kas/nitrogen8mm.yml b/kas/nitrogen8mm.yml index 9c08c6d0..14d176ea 100644 --- a/kas/nitrogen8mm.yml +++ b/kas/nitrogen8mm.yml @@ -2,7 +2,6 @@ header: version: 11 includes: - kas/include/mender-full.yml - - kas/include/poky.yml - kas/include/nxp.yml - kas/include/boundarydevices.yml diff --git a/kas/nitrogen8mn.yml b/kas/nitrogen8mn.yml index a70fd61a..9f2dde81 100644 --- a/kas/nitrogen8mn.yml +++ b/kas/nitrogen8mn.yml @@ -2,7 +2,6 @@ header: version: 11 includes: - kas/include/mender-full.yml - - kas/include/poky.yml - kas/include/nxp.yml - kas/include/boundarydevices.yml diff --git a/kas/nitrogen8mp.yml b/kas/nitrogen8mp.yml index 9daad620..0cb26666 100644 --- a/kas/nitrogen8mp.yml +++ b/kas/nitrogen8mp.yml @@ -2,7 +2,6 @@ header: version: 11 includes: - kas/include/mender-full.yml - - kas/include/poky.yml - kas/include/nxp.yml - kas/include/boundarydevices.yml diff --git a/kas/rock-pi-e.yml b/kas/rock-pi-e.yml index a1b05f72..3ef59037 100644 --- a/kas/rock-pi-e.yml +++ b/kas/rock-pi-e.yml @@ -2,7 +2,6 @@ header: version: 11 includes: - kas/include/mender-full.yml - - kas/include/poky.yml - kas/include/rockchip.yml machine: rock-pi-e