poky/meta-*: update to nanbield/master branches

The libiio version in meta-oe was updated and we no longer have to carry the backported patch. Likewise with the dt-utils patch and meta-rauc. Our ".rootfs.ext4" -> ".ext4" workarounds in lxatac-core-bundle-base.bb and emmc-image/lxatac/genimage.config are also no longer required. The perf package now handles the libtraceevent dependency correctly and we do not need that bbappend anymore. Signed-off-by: Leonard Göhrs <[email protected]>
linux-automation · Dec 19, 2023 · 610ac63 · 610ac63
1 parent b427710
commit 610ac63
Show file tree

Hide file tree

Showing 17 changed files with 15 additions and 105 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -5,24 +5,24 @@
 [submodule "meta-oe"]
 	path = meta-oe
 	url = https://github.com/openembedded/meta-openembedded.git
-	branch = mickledore
+	branch = nanbield
 [submodule "meta-rauc"]
 	path = meta-rauc
 	url = https://github.com/rauc/meta-rauc.git
-	branch = mickledore
+	branch = master
 [submodule "meta-labgrid"]
 	path = meta-labgrid
 	url = https://github.com/labgrid-project/meta-labgrid.git
 	branch = master
 [submodule "meta-virtualization"]
 	path = meta-virtualization
 	url = https://github.com/lgirdk/meta-virtualization.git
-	branch = mickledore
+	branch = nanbield
 [submodule "poky"]
 	path = poky
 	url = https://git.yoctoproject.org/poky
-	branch = mickledore
+	branch = nanbield
 [submodule "meta-selinux"]
 	path = meta-selinux
 	url = https://git.yoctoproject.org/meta-selinux
-	branch = mickledore
+	branch = nanbield
diff --git a/meta-lxatac-bsp/conf/layer.conf b/meta-lxatac-bsp/conf/layer.conf
@@ -10,7 +10,7 @@ BBFILE_COLLECTIONS += "lxatac-bsp"
 BBFILE_PATTERN_lxatac-bsp = "^${LAYERDIR}/"
 BBFILE_PRIORITY_lxatac-bsp = "11"
 
-LAYERSERIES_COMPAT_lxatac-bsp = "mickledore"
+LAYERSERIES_COMPAT_lxatac-bsp = "nanbield"
 
 RAUC_KEY_FILE ?= "${LAYERDIR}/recipes-core/rauc/files/devel.key.pem"
 RAUC_CERT_FILE ?= "${LAYERDIR}/recipes-core/rauc/files/devel.cert.pem"

diff --git a/meta-lxatac-bsp/recipes-core/images/emmc-image/lxatac/genimage.config b/meta-lxatac-bsp/recipes-core/images/emmc-image/lxatac/genimage.config
@@ -37,7 +37,7 @@ image @IMAGE@img {
     }
 
     partition root-a {
-        image = "lxatac-core-image-base-lxatac.ext4"
+        image = "lxatac-core-image-base-lxatac.rootfs.ext4"
         partition-type-uuid = "69dad710-2ce4-4e3c-b16c-21a1d49abed3"
         partition-uuid = "e82e6873-62cc-46fb-90f0-3e936743fa62"
         offset = 2M

diff --git a/meta-lxatac-bsp/recipes-kernel/perf/perf.bbappend b/meta-lxatac-bsp/recipes-kernel/perf/perf.bbappend
diff --git a/...bsp/recipes-support/libiio/libiio/0001-local-Fix-detection-of-scan-element-channels.patch b/...bsp/recipes-support/libiio/libiio/0001-local-Fix-detection-of-scan-element-channels.patch
diff --git a/meta-lxatac-bsp/recipes-support/libiio/libiio_%.bbappend b/meta-lxatac-bsp/recipes-support/libiio/libiio_%.bbappend
diff --git a/meta-lxatac-software/conf/distro/tacos.conf b/meta-lxatac-software/conf/distro/tacos.conf
@@ -1,7 +1,7 @@
 DISTRO = "tacos"
 DISTRO_NAME = "TAC OS - The LXA TAC operating system"
 DISTRO_VERSION = "23.11+dev"
-DISTRO_CODENAME = "tacos-mickledore"
+DISTRO_CODENAME = "tacos-nanbield"
 
 MAINTAINER = "Linux Automation GmbH <[email protected]>"
 

diff --git a/meta-lxatac-software/conf/layer.conf b/meta-lxatac-software/conf/layer.conf
@@ -10,5 +10,5 @@ BBFILE_COLLECTIONS += "lxatac-software"
 BBFILE_PATTERN_lxatac-software = "^${LAYERDIR}/"
 BBFILE_PRIORITY_lxatac-software = "7"
 
-LAYERSERIES_COMPAT_lxatac-software = "mickledore"
+LAYERSERIES_COMPAT_lxatac-software = "nanbield"
 
diff --git a/...pes-bsp/dt-utils/dt-utils/0001-libdt-prefer-first-found-disk-when-looking-for-block.patch b/...pes-bsp/dt-utils/dt-utils/0001-libdt-prefer-first-found-disk-when-looking-for-block.patch
diff --git a/meta-lxatac-software/recipes-bsp/dt-utils/dt-utils_%.bbappend b/meta-lxatac-software/recipes-bsp/dt-utils/dt-utils_%.bbappend
diff --git a/meta-lxatac-software/recipes-core/bundles/lxatac-core-bundle-base.bb b/meta-lxatac-software/recipes-core/bundles/lxatac-core-bundle-base.bb
@@ -17,7 +17,6 @@ RAUC_BUNDLE_HOOKS[file] = "hook.sh"
 RAUC_BUNDLE_SLOTS ?= "rootfs bootloader"
 
 RAUC_SLOT_rootfs ?= "lxatac-core-image-base"
-RAUC_SLOT_rootfs[file] = "lxatac-core-image-base-lxatac.ext4"
 RAUC_SLOT_rootfs[fstype] = "ext4"
 RAUC_SLOT_rootfs[hooks] = "post-install"
 RAUC_SLOT_rootfs[adaptive] = "block-hash-index"

diff --git a/meta-oe b/meta-oe
diff --git a/meta-ptx b/meta-ptx
diff --git a/meta-rauc b/meta-rauc
diff --git a/meta-selinux b/meta-selinux
diff --git a/meta-virtualization b/meta-virtualization
diff --git a/poky b/poky
+1 −1		recipes-core/dt-utils/dt-utils.inc
+0 −4		recipes-core/dt-utils/dt-utils_2021.03.0.bb
+4 −0		recipes-core/dt-utils/dt-utils_2023.11.0.bb
+1 −0		.github/workflows/meta-rauc.yml
+1 −1		conf/layer.conf
+0 −1		recipes-bsp/dt-utils/dt-utils.inc
+0 −3		recipes-bsp/dt-utils/dt-utils_2023.08.0.bb
+3 −0		recipes-bsp/dt-utils/dt-utils_2023.11.0.bb
+1 −3		recipes-core/rauc/rauc-git.inc