From ef13b9fe2fa9dfa917c43ff97a82048b16c0c71b Mon Sep 17 00:00:00 2001 From: Florin Sarbu Date: Tue, 7 Sep 2021 14:36:45 +0200 Subject: [PATCH 01/10] layers/poky: Update to dunfell-23.0.6 Changelog-entry: Update poky to dunfell-23.0.6 Signed-off-by: Florin Sarbu --- layers/poky | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/poky b/layers/poky index f475afc..a13bda4 160000 --- a/layers/poky +++ b/layers/poky @@ -1 +1 @@ -Subproject commit f475afc5df0837532dcd0f3a831ddc3aec8941f1 +Subproject commit a13bda44fcda4e79e9aed39ca1495eabecb6a7b7 From 860984f253444979ad41f6533780374b46aa8a9c Mon Sep 17 00:00:00 2001 From: Florin Sarbu Date: Tue, 7 Sep 2021 14:37:09 +0200 Subject: [PATCH 02/10] layers/meta-openembedded: Update to latest dunfell Signed-off-by: Florin Sarbu --- layers/meta-openembedded | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/meta-openembedded b/layers/meta-openembedded index a24acf9..4a0d93d 160000 --- a/layers/meta-openembedded +++ b/layers/meta-openembedded @@ -1 +1 @@ -Subproject commit a24acf94d48d635eca668ea34598c6e5c857e3f8 +Subproject commit 4a0d93d250576177e1237fa559f55c4f9d371809 From 098b362c3fda7ef27399b01b5c8ad1812478e93a Mon Sep 17 00:00:00 2001 From: Florin Sarbu Date: Tue, 7 Sep 2021 14:38:01 +0200 Subject: [PATCH 03/10] layers/meta-rust: Update to a newer revision We choose this revision because it brings compatibility with the dunfell-23.0.6 tag in poky. Signed-off-by: Florin Sarbu --- layers/meta-rust | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/meta-rust b/layers/meta-rust index c5ff05d..aec6519 160000 --- a/layers/meta-rust +++ b/layers/meta-rust @@ -1 +1 @@ -Subproject commit c5ff05d1e99c1e80844c1673456e2368499918c7 +Subproject commit aec6519e23a9fe5b497d23053bdf408df5de4af6 From 6bd1bbf60ef8b3124e386d0e1d0e168425ef4890 Mon Sep 17 00:00:00 2001 From: Florin Sarbu Date: Tue, 7 Sep 2021 14:38:34 +0200 Subject: [PATCH 04/10] layers/meta-sunxi: Update to dunfell Signed-off-by: Florin Sarbu --- layers/meta-sunxi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/meta-sunxi b/layers/meta-sunxi index ee3a551..f367a1f 160000 --- a/layers/meta-sunxi +++ b/layers/meta-sunxi @@ -1 +1 @@ -Subproject commit ee3a551b8316328f72a29f36376bc85f1a0a2fb2 +Subproject commit f367a1ff2c329c801659c6de77910456a4167430 From 6f2246083b323062ce0340824ef7eb20b6fc740f Mon Sep 17 00:00:00 2001 From: Florin Sarbu Date: Tue, 7 Sep 2021 14:40:17 +0200 Subject: [PATCH 05/10] layers/meta-balena: Update to v2.85.10 Update the meta-balena submodule from 2.85.4 to 2.85.10 Changelog-entry: Update meta-balena from v2.85.4 to v2.85.10 Signed-off-by: Florin Sarbu --- layers/meta-balena | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/meta-balena b/layers/meta-balena index 700b93a..ed3dc32 160000 --- a/layers/meta-balena +++ b/layers/meta-balena @@ -1 +1 @@ -Subproject commit 700b93a1b7b777b31c919a28628f7be48abdfb0f +Subproject commit ed3dc320a1b01b69aa8ebdf7cdf73d8374854c8a From aa0fda092549230eaa40d3bead3fe8c1e52c9c4d Mon Sep 17 00:00:00 2001 From: Florin Sarbu Date: Tue, 7 Sep 2021 14:52:57 +0200 Subject: [PATCH 06/10] conf/layer: Set layer compatibility to dunfell And remove the -LAYERSERIES_COMPAT_meta-sunxi since it already supports dunfell Signed-off-by: Florin Sarbu --- layers/meta-balena-allwinner/conf/layer.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/layers/meta-balena-allwinner/conf/layer.conf b/layers/meta-balena-allwinner/conf/layer.conf index 03ba780..c6726a0 100644 --- a/layers/meta-balena-allwinner/conf/layer.conf +++ b/layers/meta-balena-allwinner/conf/layer.conf @@ -7,5 +7,4 @@ BBFILE_COLLECTIONS += "balena-allwinner" BBFILE_PATTERN_balena-allwinner := "^${LAYERDIR}/" BBFILE_PRIORITY_balena-allwinner = "1337" -LAYERSERIES_COMPAT_balena-allwinner = "warrior" -LAYERSERIES_COMPAT_meta-sunxi = "warrior" +LAYERSERIES_COMPAT_balena-allwinner = "dunfell" From 423d3e270e762cfd29674096ef4eabbec681cd33 Mon Sep 17 00:00:00 2001 From: Florin Sarbu Date: Tue, 7 Sep 2021 14:53:59 +0200 Subject: [PATCH 07/10] conf/samples: Switch to meta-balena dunfell layer Signed-off-by: Florin Sarbu --- layers/meta-balena-allwinner/conf/samples/bblayers.conf.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/meta-balena-allwinner/conf/samples/bblayers.conf.sample b/layers/meta-balena-allwinner/conf/samples/bblayers.conf.sample index ed25119..e06415f 100644 --- a/layers/meta-balena-allwinner/conf/samples/bblayers.conf.sample +++ b/layers/meta-balena-allwinner/conf/samples/bblayers.conf.sample @@ -14,7 +14,7 @@ BBLAYERS ?= " \ ${TOPDIR}/../layers/meta-openembedded/meta-python \ ${TOPDIR}/../layers/meta-sunxi \ ${TOPDIR}/../layers/meta-balena/meta-balena-common \ - ${TOPDIR}/../layers/meta-balena/meta-balena-warrior \ + ${TOPDIR}/../layers/meta-balena/meta-balena-dunfell \ ${TOPDIR}/../layers/meta-balena-allwinner \ ${TOPDIR}/../layers/meta-rust \ " From fa25a5248e26fe6465a01aa697e4a9ba67d76c6a Mon Sep 17 00:00:00 2001 From: Florin Sarbu Date: Tue, 7 Sep 2021 14:54:47 +0200 Subject: [PATCH 08/10] *.coffee: Set the yocto version to dunfell Signed-off-by: Florin Sarbu --- bananapi-m1-plus.coffee | 2 +- nanopi-neo-air.coffee | 2 +- orange-pi-lite.coffee | 2 +- orange-pi-one.coffee | 2 +- orange-pi-zero.coffee | 2 +- orangepi-plus2.coffee | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bananapi-m1-plus.coffee b/bananapi-m1-plus.coffee index 1a04ed4..e10ae79 100644 --- a/bananapi-m1-plus.coffee +++ b/bananapi-m1-plus.coffee @@ -23,7 +23,7 @@ module.exports = machine: 'bananapi-m1-plus' image: 'balena-image' fstype: 'balenaos-img' - version: 'yocto-warrior' + version: 'yocto-dunfell' deployArtifact: 'balena-image-bananapi-m1-plus.balenaos-img' compressed: true diff --git a/nanopi-neo-air.coffee b/nanopi-neo-air.coffee index 19d1ad6..a95801c 100644 --- a/nanopi-neo-air.coffee +++ b/nanopi-neo-air.coffee @@ -38,7 +38,7 @@ module.exports = machine: 'nanopi-neo-air' image: 'balena-image-flasher' fstype: 'balenaos-img' - version: 'yocto-warrior' + version: 'yocto-dunfell' deployArtifact: 'balena-image-flasher-nanopi-neo-air.balenaos-img' compressed: true diff --git a/orange-pi-lite.coffee b/orange-pi-lite.coffee index 3441cb2..a2fcd4c 100644 --- a/orange-pi-lite.coffee +++ b/orange-pi-lite.coffee @@ -23,7 +23,7 @@ module.exports = machine: 'orange-pi-lite' image: 'balena-image' fstype: 'balenaos-img' - version: 'yocto-warrior' + version: 'yocto-dunfell' deployArtifact: 'balena-image-orange-pi-lite.balenaos-img' compressed: true diff --git a/orange-pi-one.coffee b/orange-pi-one.coffee index 978331c..609577d 100644 --- a/orange-pi-one.coffee +++ b/orange-pi-one.coffee @@ -24,7 +24,7 @@ module.exports = machine: 'orange-pi-one' image: 'balena-image' fstype: 'balenaos-img' - version: 'yocto-warrior' + version: 'yocto-dunfell' deployArtifact: 'balena-image-orange-pi-one.balenaos-img' compressed: true diff --git a/orange-pi-zero.coffee b/orange-pi-zero.coffee index de28076..14757d6 100644 --- a/orange-pi-zero.coffee +++ b/orange-pi-zero.coffee @@ -24,7 +24,7 @@ module.exports = machine: 'orange-pi-zero' image: 'balena-image' fstype: 'balenaos-img' - version: 'yocto-warrior' + version: 'yocto-dunfell' deployArtifact: 'balena-image-orange-pi-zero.balenaos-img' compressed: true diff --git a/orangepi-plus2.coffee b/orangepi-plus2.coffee index 0c8a499..d637896 100644 --- a/orangepi-plus2.coffee +++ b/orangepi-plus2.coffee @@ -38,7 +38,7 @@ module.exports = machine: 'orangepi-plus2' image: 'balena-image-flasher' fstype: 'balenaos-img' - version: 'yocto-warrior' + version: 'yocto-dunfell' deployArtifact: 'balena-image-flasher-orangepi-plus2.balenaos-img' compressed: true From 2d550c5b18879c182e6ffce7049c30c4e62ffc1a Mon Sep 17 00:00:00 2001 From: Florin Sarbu Date: Sun, 17 Oct 2021 14:47:13 +0200 Subject: [PATCH 09/10] balena-yocto-scripts: Update to v1.15.2 Update balena-yocto-scripts from 1.14.9 to 1.15.2 Changelog-entry: Update balena-yocto-scripts from v1.14.9 to v1.15.2 Signed-off-by: Florin Sarbu --- balena-yocto-scripts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/balena-yocto-scripts b/balena-yocto-scripts index 4bfb805..bd419a9 160000 --- a/balena-yocto-scripts +++ b/balena-yocto-scripts @@ -1 +1 @@ -Subproject commit 4bfb805f24a1e260f708c63e5dfedea9dade3cd2 +Subproject commit bd419a972c100908641bbf18c49de37ba46edc35 From 6578c1b50e847008d612d5061b4b01e3a24f0945 Mon Sep 17 00:00:00 2001 From: Florin Sarbu Date: Mon, 18 Oct 2021 10:37:58 +0200 Subject: [PATCH 10/10] xradio: Remove obsolete SRCREV reference from our layer We now updated the BSP to dunfell so let's rely on the xradio source revision that the BSP uses. Signed-off-by: Florin Sarbu --- .../meta-balena-allwinner/recipes-kernel/xradio/xradio.bbappend | 1 - 1 file changed, 1 deletion(-) delete mode 100644 layers/meta-balena-allwinner/recipes-kernel/xradio/xradio.bbappend diff --git a/layers/meta-balena-allwinner/recipes-kernel/xradio/xradio.bbappend b/layers/meta-balena-allwinner/recipes-kernel/xradio/xradio.bbappend deleted file mode 100644 index 75ec9e2..0000000 --- a/layers/meta-balena-allwinner/recipes-kernel/xradio/xradio.bbappend +++ /dev/null @@ -1 +0,0 @@ -SRCREV = "8965ea55ddfd862ee76384913f82e6b69628cd27"