diff --git a/.gitmodules b/.gitmodules index 30385855..49a7f175 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,11 +5,11 @@ [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 @@ -17,12 +17,12 @@ [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 index 6dbb2f8d..58187803 100644 --- 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 index 517ea00e..6610e0ac 100644 --- 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 deleted file mode 100644 index e8ac1c20..00000000 --- a/meta-lxatac-bsp/recipes-kernel/perf/perf.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -# Backport of oe-core commit 7e7a7394b47f6fd4a4dd26a18a5d94302ab6df1e -# "perf: add libtraceevent packageconfig" -# But keep libtraceevent disabled - -#PACKAGECONFIG:append = "libtraceevent" -PACKAGECONFIG[libtraceevent] = ",NO_LIBTRACEEVENT=1" diff --git a/meta-lxatac-bsp/recipes-support/libiio/libiio/0001-local-Fix-detection-of-scan-element-channels.patch b/meta-lxatac-bsp/recipes-support/libiio/libiio/0001-local-Fix-detection-of-scan-element-channels.patch deleted file mode 100644 index 05c031b2..00000000 --- a/meta-lxatac-bsp/recipes-support/libiio/libiio/0001-local-Fix-detection-of-scan-element-channels.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 77e840b94c5738783b5dcc93cf7cabaac5034737 Mon Sep 17 00:00:00 2001 -From: Paul Cercueil -Date: Wed, 8 Sep 2021 09:35:03 +0100 -Subject: [PATCH] local: Fix detection of scan-element channels - -Previously, the detection of buffer-capable channels would fail when the -channel had attributes outside the scan_elements/ folder, as the channel -would be correctly marked as buffer-capable when the first attribute -was found, but then overriden as non-buffer-capable as soon as an -attribute outside the scan_elements/ folder was found. - -It went unnoticed until now, most likely because there is generally -either scan-elements attributes or non-scan-elements attributes, and -rarely both. - -Fixes #740. - -Signed-off-by: Paul Cercueil ---- - local.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/local.c b/local.c -index bbb62fe..e909520 100644 ---- a/local.c -+++ b/local.c -@@ -1476,7 +1476,7 @@ static int add_channel(struct iio_device *dev, const char *name, - free(channel_id); - ret = add_attr_to_channel(chn, name, path, - dir_is_scan_elements); -- chn->is_scan_element = dir_is_scan_elements && !ret; -+ chn->is_scan_element |= dir_is_scan_elements && !ret; - return ret; - } - } diff --git a/meta-lxatac-bsp/recipes-support/libiio/libiio_%.bbappend b/meta-lxatac-bsp/recipes-support/libiio/libiio_%.bbappend deleted file mode 100644 index 5cd6dab7..00000000 --- a/meta-lxatac-bsp/recipes-support/libiio/libiio_%.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://0001-local-Fix-detection-of-scan-element-channels.patch" - diff --git a/meta-lxatac-software/conf/distro/tacos.conf b/meta-lxatac-software/conf/distro/tacos.conf index d29c56c3..ff9e1d5a 100644 --- 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 " diff --git a/meta-lxatac-software/conf/layer.conf b/meta-lxatac-software/conf/layer.conf index 6d135cb0..558c4451 100644 --- 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/meta-lxatac-software/recipes-bsp/dt-utils/dt-utils/0001-libdt-prefer-first-found-disk-when-looking-for-block.patch b/meta-lxatac-software/recipes-bsp/dt-utils/dt-utils/0001-libdt-prefer-first-found-disk-when-looking-for-block.patch deleted file mode 100644 index 24005f76..00000000 --- a/meta-lxatac-software/recipes-bsp/dt-utils/dt-utils/0001-libdt-prefer-first-found-disk-when-looking-for-block.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 9306b37db6a5249c8b0f8f873be3446e3017ac15 Mon Sep 17 00:00:00 2001 -From: Ahmad Fatoum -Date: Mon, 6 Nov 2023 12:04:05 +0100 -Subject: [PATCH] libdt: prefer first found disk when looking for block devices -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Recent rework introduced a regression for state located in the eMMC -user area described by DT fixed partitions. Whereas before, the first -device with type "disk" was taken, dt-utils will now iterate over all -devices to try to find a matching GPT partition. If it doesn't find any, -it will instead take the last device with type "disk", which will be the -second boot partition for eMMC devices leading barebox-state to access -/dev/mmcblkXboot1 instead of /dev/mmcblkX. - -Let's fix this regression by restoring the old behavior of preferring the -first disk. This may not be totally future proof, but it worked ok for -years and a better solution can always be added later with a regular -release. - -Reported-by: Leonard Göhrs -Signed-off-by: Ahmad Fatoum ---- - src/libdt.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libdt.c b/src/libdt.c -index 650b404..72e8ab4 100644 ---- a/src/libdt.c -+++ b/src/libdt.c -@@ -2301,7 +2301,7 @@ static int cdev_from_block_device(struct udev_device *dev, - devtype = udev_device_get_devtype(part); - if (!devtype) - continue; -- if (!strcmp(devtype, "disk")) { -+ if (!strcmp(devtype, "disk") && !best_match) { - best_match = part; - - /* Should we try to find a matching partition first? */ diff --git a/meta-lxatac-software/recipes-bsp/dt-utils/dt-utils_%.bbappend b/meta-lxatac-software/recipes-bsp/dt-utils/dt-utils_%.bbappend deleted file mode 100644 index bf2d9034..00000000 --- a/meta-lxatac-software/recipes-bsp/dt-utils/dt-utils_%.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://0001-libdt-prefer-first-found-disk-when-looking-for-block.patch" - 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 index 94371560..9faa96e8 100644 --- 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 index f2929056..1750c66a 160000 --- a/meta-oe +++ b/meta-oe @@ -1 +1 @@ -Subproject commit f29290563cb821fae95340ba959749641c69ed7f +Subproject commit 1750c66ae8e4268c472c0b2b94748a59d6ef866d diff --git a/meta-ptx b/meta-ptx index 08ed2400..23f79905 160000 --- a/meta-ptx +++ b/meta-ptx @@ -1 +1 @@ -Subproject commit 08ed24000549a6aa0d3b2b58a96f4ef9a92ce732 +Subproject commit 23f79905239f0dae2bb6736e7691a3080bac23dd diff --git a/meta-rauc b/meta-rauc index 6c5faed9..e23179dc 160000 --- a/meta-rauc +++ b/meta-rauc @@ -1 +1 @@ -Subproject commit 6c5faed98b7124e1f084280b0981da349f38c8d6 +Subproject commit e23179dcdec5c473459624f4e2f7ead2adcaac98 diff --git a/meta-selinux b/meta-selinux index bd3902cb..ff95c536 160000 --- a/meta-selinux +++ b/meta-selinux @@ -1 +1 @@ -Subproject commit bd3902cb9351c37d8e348abcd95c83d267c0a106 +Subproject commit ff95c536a54a758185958bcfeff86d9ba595b13e diff --git a/meta-virtualization b/meta-virtualization index b8db7002..380475e7 160000 --- a/meta-virtualization +++ b/meta-virtualization @@ -1 +1 @@ -Subproject commit b8db7002764712f2902fe9dea098c171b1128076 +Subproject commit 380475e793733d5bb35752e1062372c0c865a133 diff --git a/poky b/poky index 7235399a..508acf3a 160000 --- a/poky +++ b/poky @@ -1 +1 @@ -Subproject commit 7235399a86b134e57d5eb783d7f1f57ca0439ae5 +Subproject commit 508acf3ab70684338f562bd065d64d42d8cceee9