Bump Yocto version to 6.0

.github/workflows/build.yml

@@ -64,7 +64,7 @@ jobs:
 
       - name: Build image
         run: |
-          source poky/oe-init-build-env build
+          source openembedded-core/oe-init-build-env build
           bitbake opencentauri-upgrade
 
       - name: Upload build artifacts (SWU only)

.gitmodules

@@ -1,24 +1,28 @@
-[submodule "poky"]
-	path = poky
-	url = https://github.com/OpenCentauri/cosmos-poky.git
-	branch = scarthgap-crate-ua-fix
 [submodule "meta-sunxi"]
 	path = meta-sunxi
-	url = https://github.com/linux-sunxi/meta-sunxi
-	branch = scarthgap
+	url = https://github.com/jamesturton/meta-sunxi
+	branch = wrynose
 [submodule "meta-openembedded"]
 	path = meta-openembedded
 	url = https://git.openembedded.org/meta-openembedded
-	branch = scarthgap
+	branch = wrynose
 [submodule "meta-arm"]
 	path = meta-arm
 	url = https://git.yoctoproject.org/meta-arm
-	branch = scarthgap
+	branch = wrynose
 [submodule "meta-swupdate"]
 	path = meta-swupdate
 	url = https://github.com/sbabic/meta-swupdate.git
-	branch = scarthgap
-[submodule "meta-lts-mixins"]
-	path = meta-lts-mixins
-	url = https://git.yoctoproject.org/meta-lts-mixins
-	branch = scarthgap/rust
+	branch = wrynose
+[submodule "meta-yocto"]
+	path = meta-yocto
+	url = https://git.yoctoproject.org/meta-yocto
+	branch = wrynose
+[submodule "bitbake"]
+	path = bitbake
+	url = https://git.openembedded.org/bitbake
+	branch = 2.18
+[submodule "openembedded-core"]
+	path = openembedded-core
+	url = https://git.openembedded.org/openembedded-core
+	branch = wrynose

build/conf/bblayers.conf

@@ -6,16 +6,15 @@ BBPATH = "${TOPDIR}"
 BBFILES ?= ""
 
 BBLAYERS ?= " \
-  ${TOPDIR}/../poky/meta \
-  ${TOPDIR}/../poky/meta-poky \
-  ${TOPDIR}/../poky/meta-yocto-bsp \
+  ${TOPDIR}/../openembedded-core/meta \
+  ${TOPDIR}/../meta-yocto/meta-poky \
+  ${TOPDIR}/../meta-yocto/meta-yocto-bsp \
   ${TOPDIR}/../meta-sunxi \
   ${TOPDIR}/../meta-arm/meta-arm \
   ${TOPDIR}/../meta-arm/meta-arm-toolchain \
   ${TOPDIR}/../meta-openembedded/meta-oe \
   ${TOPDIR}/../meta-openembedded/meta-python \
   ${TOPDIR}/../meta-openembedded/meta-networking \
   ${TOPDIR}/../meta-swupdate \
-  ${TOPDIR}/../meta-lts-mixins \
   ${TOPDIR}/../meta-opencentauri \
   "

build/conf/local.conf

@@ -147,7 +147,7 @@ DISTRO ?= "cosmos"
 # meta/classes-recipe/image.bbclass and
 # meta/classes-recipe/core-image.bbclass for more details.
 # We default to enabling the debugging tweaks.
-EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
+EXTRA_IMAGE_FEATURES ?= "allow-empty-password empty-root-password allow-root-login post-install-logging"
 
 #
 # Additional image features

meta-opencentauri/conf/distro/cosmos.conf

@@ -10,7 +10,9 @@ PACKAGE_CLASSES = "package_ipk"
 DISTRO_FEATURES:remove = "ptest"
 
 DISTRO_FEATURES:append = " rust"
-RUST_VERSION = "1.92.0"
-CARGO_VERSION = "1.92.0"
 
 hostname:pn-base-files = "${DISTRO}"
+
+ERROR_QA:remove = "patch-status"
+
+PREFERRED_VERSION_linux-mainline = "6.12.80"

meta-opencentauri/conf/layer.conf

@@ -11,4 +11,4 @@ BBFILE_PATTERN_meta-opencentauri = "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-opencentauri = "6"
 
 LAYERDEPENDS_meta-opencentauri = "core sunxi"
-LAYERSERIES_COMPAT_meta-opencentauri = "scarthgap"
+LAYERSERIES_COMPAT_meta-opencentauri = "scarthgap wrynose"

meta-opencentauri/images/opencentauri-image-base.bb

@@ -25,7 +25,6 @@ CORE_IMAGE_EXTRA_INSTALL += "\
     mainsail \
     fluidd \
     atomscreen \
-    guppyscreen \
     grumpyscreen \
     htop \
     i2c-tools \
@@ -41,7 +40,6 @@ CORE_IMAGE_EXTRA_INSTALL += "\
     opencentauri-bootlogos \
     swu-flasher \
     update-scripts \
-    fbdoom \
     v4l-utils \
     iproute2 \
     chrony \

meta-opencentauri/recipes-apps/atomscreen/atomscreen_0.1.bb

@@ -7,13 +7,16 @@ HOMEPAGE = "https://github.com/OpenCentauri/atomscreen"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
 
-S = "${WORKDIR}/git"
-
 DEPENDS += "fontconfig openssl pkgconfig-native"
 RDEPENDS:${PN} += "fontconfig gui-switcher"
 
 INSANE_SKIP:${PN} = "already-stripped"
 
+do_compile:prepend() {
+    export OPENSSL_LIB_DIR="${STAGING_LIBDIR}"
+    export OPENSSL_INCLUDE_DIR="${STAGING_INCDIR}"
+}
+
 INITSCRIPT_NAME = "atomscreen"
 INITSCRIPT_PARAMS = "disable"
 
@@ -23,10 +26,10 @@ export BINDGEN_EXTRA_CLANG_ARGS = "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} --target=
 do_install:append() {
     install -d ${D}${sysconfdir}/klipper
     install -d ${D}${sysconfdir}/klipper/config
-    install -m 0644 ${WORKDIR}/atomscreen.toml ${D}${sysconfdir}/klipper/config/
+    install -m 0644 ${UNPACKDIR}/atomscreen.toml ${D}${sysconfdir}/klipper/config/
 
     install -d ${D}${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/atomscreen.init ${D}${sysconfdir}/init.d/atomscreen
+    install -m 0755 ${UNPACKDIR}/atomscreen.init ${D}${sysconfdir}/init.d/atomscreen
 }
 
 FILES:${PN} += " \

meta-opencentauri/recipes-apps/camera-led-bridge/camera-led-bridge_0.1.bb

@@ -144,7 +144,7 @@ SRC_URI[zerovec-0.11.5.sha256sum] = "6c28719294829477f525be0186d13efa9a3c602f7ec
 SRC_URI[zerovec-derive-0.11.2.sha256sum] = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
 SRC_URI[zmij-1.0.21.sha256sum] = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
 
-S = "${WORKDIR}/git/camera-led-bridge"
+S = "${UNPACKDIR}/git/camera-led-bridge"
 
 INITSCRIPT_NAME = "camera-led-bridge"
 INITSCRIPT_PARAMS = "defaults 96 4"
@@ -153,5 +153,5 @@ INSANE_SKIP:${PN} += "already-stripped"
 
 do_install:append() {
     install -d ${D}${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/camera-led-bridge.init ${D}${sysconfdir}/init.d/camera-led-bridge
+    install -m 0755 ${UNPACKDIR}/camera-led-bridge.init ${D}${sysconfdir}/init.d/camera-led-bridge
 }

meta-opencentauri/recipes-apps/doom/fbdoom_0.0.1.bb

@@ -16,8 +16,6 @@ SRC_URI = " \
 SRC_URI[sha256sum] = "c1d1f430e623b5b02693a2ab42988f951fb66ae3bd3add06e557bdf36af0e24f"
 SRCREV = "6c599f50e9e8e9436a5c064f42836eb48ff6bde0"
 
-S = "${WORKDIR}/git"
-
 EXTRA_OEMAKE = " \
     'CC=${CC}' \
     NOSDL=1 \
@@ -36,10 +34,10 @@ do_install() {
 
     # Install wad
     install -d ${D}${datadir}/doom
-    install -m 0644 ${WORKDIR}/DOOM1.WAD ${D}${datadir}/doom/doom1.wad
+    install -m 0644 ${UNPACKDIR}/DOOM1.WAD ${D}${datadir}/doom/doom1.wad
 
     # Install play-doom script
-    install -m 0755 ${WORKDIR}/play-doom.sh ${D}${bindir}/play-doom
+    install -m 0755 ${UNPACKDIR}/play-doom.sh ${D}${bindir}/play-doom
 }
 
 FILES:${PN} = " \

meta-opencentauri/recipes-apps/fluidd/fluidd_1.37.2.bb

@@ -15,7 +15,7 @@ SRC_URI = "https://github.com/fluidd-core/fluidd/releases/download/v${PV}/fluidd
 "
 SRC_URI[sha256sum] = "e42d4e8b14a3a0b20573485c882cc4dcfac33d9fbd946c8803a942be282e2b6e"
 
-S = "${WORKDIR}/fluidd"
+S = "${UNPACKDIR}/fluidd"
 
 RDEPENDS:${PN} = " \
     klipper \
@@ -35,12 +35,12 @@ do_install() {
     install -d ${D}/var/www/fluidd
     cp -r ${S}/* ${D}/var/www/fluidd/
     install -m 0644 \
-        ${WORKDIR}/opencentauri-fluidd-theme/logo_opencentauri.svg \
-        ${WORKDIR}/opencentauri-fluidd-theme/carbon-logo-red.webp \
-        ${WORKDIR}/opencentauri-fluidd-theme/opencentauri-logo-small.png \
-        ${WORKDIR}/opencentauri-fluidd-theme/opencentauri-theme.css \
+        ${UNPACKDIR}/opencentauri-fluidd-theme/logo_opencentauri.svg \
+        ${UNPACKDIR}/opencentauri-fluidd-theme/carbon-logo-red.webp \
+        ${UNPACKDIR}/opencentauri-fluidd-theme/opencentauri-logo-small.png \
+        ${UNPACKDIR}/opencentauri-fluidd-theme/opencentauri-theme.css \
         ${D}/var/www/fluidd/
-    ${PYTHON} ${WORKDIR}/opencentauri-fluidd-theme/apply-opencentauri-fluidd-theme.py ${D}/var/www/fluidd
+    ${PYTHON} ${UNPACKDIR}/opencentauri-fluidd-theme/apply-opencentauri-fluidd-theme.py ${D}/var/www/fluidd
 
 }
 

meta-opencentauri/recipes-apps/grumyscreen/grumpyscreen_20260518.bb

@@ -17,8 +17,6 @@ SRC_URI = "gitsm://github.com/pellcorp/grumpyscreen.git;protocol=https;branch=ma
 SRCREV = "ea5c74f8a8f40384fcae79f75d58456123d296c7"
 PR = "r3"
 
-S = "${WORKDIR}/git"
-
 RDEPENDS:${PN} = " \
     klipper \
     moonraker \
@@ -87,10 +85,10 @@ do_install() {
 
     install -d ${D}${sysconfdir}/klipper
     install -d ${D}${sysconfdir}/klipper/config
-    install -m 0644 ${WORKDIR}/grumpyscreen.cfg ${D}${sysconfdir}/klipper/config/
+    install -m 0644 ${UNPACKDIR}/grumpyscreen.cfg ${D}${sysconfdir}/klipper/config/
 
     install -d ${D}${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/grumpyscreen.init ${D}${sysconfdir}/init.d/grumpyscreen
+    install -m 0755 ${UNPACKDIR}/grumpyscreen.init ${D}${sysconfdir}/init.d/grumpyscreen
 }
 
 FILES:${PN} = " \

meta-opencentauri/recipes-apps/guppyscreen/guppyscreen_0.0.26.bb

@@ -19,8 +19,6 @@ SRC_URI = "gitsm://github.com/ballaswag/guppyscreen.git;protocol=https;branch=ma
 "
 SRCREV = "cf5c6d7539a2dca090ca71c177f57a2d96df443a"
 
-S = "${WORKDIR}/git"
-
 DEPENDS = "cmake-native"
 
 RDEPENDS:${PN} = " \
@@ -102,10 +100,10 @@ do_install() {
 
     install -d ${D}${sysconfdir}/klipper
     install -d ${D}${sysconfdir}/klipper/config
-    install -m 0644 ${WORKDIR}/guppyconfig.json ${D}${sysconfdir}/klipper/config/
+    install -m 0644 ${UNPACKDIR}/guppyconfig.json ${D}${sysconfdir}/klipper/config/
 
     install -d ${D}${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/guppyscreen.init ${D}${sysconfdir}/init.d/guppyscreen
+    install -m 0755 ${UNPACKDIR}/guppyscreen.init ${D}${sysconfdir}/init.d/guppyscreen
 }
 
 FILES:${PN} = " \

meta-opencentauri/recipes-apps/helixscreen/helixscreen_0.1.bb

@@ -8,5 +8,3 @@ SRC_URI = "gitsm://github.com/prestonbrown/helixscreen.git;protocol=https;branch
 SRCREV = "3aa8d5f6d904e7e66bfd0d647802a85f49317e02"
 
 inherit pkgconfig
-
-S = "${WORKDIR}/git"

meta-opencentauri/recipes-apps/katapult/katapult_1.0.0.inc

@@ -11,8 +11,6 @@ SRC_URI = " \
 "
 SRCREV = "32584cbbb66c4dc85fc87c0fa87ed508f7c2df52"
 
-S = "${WORKDIR}/git"
-
 DEPENDS = " \
     python3-native \
 "

meta-opencentauri/recipes-apps/klipper/kalico-firmware-bed_2026.02.00.bb

@@ -30,7 +30,7 @@ do_install() {
 
     # Install SysVinit script
     install -d ${D}${sysconfdir}/init.d
-    cp ${WORKDIR}/klipper-firmware-bed-init-d ${D}${sysconfdir}/init.d/klipper-firmware-bed
+    cp ${UNPACKDIR}/klipper-firmware-bed-init-d ${D}${sysconfdir}/init.d/klipper-firmware-bed
     chmod 0755 ${D}${sysconfdir}/init.d/klipper-firmware-bed
 }
 

meta-opencentauri/recipes-apps/klipper/kalico-firmware-dsp_2026.02.00.bb

@@ -21,15 +21,15 @@ INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 INHIBIT_SYSROOT_STRIP = "1"
 
-INSANE_SKIP:${PN} = "arch"
+INSANE_SKIP:${PN} = "arch buildpaths"
 
 do_install() {
     install -d ${D}/lib/firmware
     cp -r ${S}/out/klipper.elf ${D}/lib/firmware/rproc-1700000.dsp-fw
 
     # Install SysVinit script
     install -d ${D}${sysconfdir}/init.d
-    cp ${WORKDIR}/klipper-firmware-dsp-init-d ${D}${sysconfdir}/init.d/klipper-firmware-dsp
+    cp ${UNPACKDIR}/klipper-firmware-dsp-init-d ${D}${sysconfdir}/init.d/klipper-firmware-dsp
     chmod 0755 ${D}${sysconfdir}/init.d/klipper-firmware-dsp
 }
 

meta-opencentauri/recipes-apps/klipper/kalico-firmware-toolhead_2026.02.00.bb

@@ -30,7 +30,7 @@ do_install() {
 
     # Install SysVinit script
     install -d ${D}${sysconfdir}/init.d
-    cp ${WORKDIR}/klipper-firmware-toolhead-init-d ${D}${sysconfdir}/init.d/klipper-firmware-toolhead
+    cp ${UNPACKDIR}/klipper-firmware-toolhead-init-d ${D}${sysconfdir}/init.d/klipper-firmware-toolhead
     chmod 0755 ${D}${sysconfdir}/init.d/klipper-firmware-toolhead
 }
 

meta-opencentauri/recipes-apps/klipper/kalico_2026.02.00.bb

@@ -95,15 +95,15 @@ do_install() {
     # Install default kalico config
     install -d ${D}${sysconfdir}/klipper
     install -d ${D}${sysconfdir}/klipper/config
-    install -m 0644 ${WORKDIR}/printer.cfg ${D}${sysconfdir}/klipper/config/
+    install -m 0644 ${UNPACKDIR}/printer.cfg ${D}${sysconfdir}/klipper/config/
 
     # Copy non-printer .cfg files to readonly folder
     install -d ${D}${sysconfdir}/klipper/config/klipper-readonly
-    install -m 0644 ${WORKDIR}/machine.cfg ${WORKDIR}/client.cfg ${WORKDIR}/shell.cfg ${WORKDIR}/macros.cfg ${WORKDIR}/calibration.cfg ${WORKDIR}/screen.cfg ${WORKDIR}/kamp.cfg ${D}${sysconfdir}/klipper/config/klipper-readonly
+    install -m 0644 ${UNPACKDIR}/machine.cfg ${UNPACKDIR}/client.cfg ${UNPACKDIR}/shell.cfg ${UNPACKDIR}/macros.cfg ${UNPACKDIR}/calibration.cfg ${UNPACKDIR}/screen.cfg ${UNPACKDIR}/kamp.cfg ${D}${sysconfdir}/klipper/config/klipper-readonly
 
     # Install SysVinit script
     install -d ${D}${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/klipper-init-d ${D}${sysconfdir}/init.d/klipper
+    install -m 0755 ${UNPACKDIR}/klipper-init-d ${D}${sysconfdir}/init.d/klipper
 }
 
 FILES:${PN} = " \

meta-opencentauri/recipes-apps/klipper/kalico_2026.02.00.inc

@@ -17,8 +17,6 @@ SRCREV = "fa59d011f425c5aef6f06abc08efe43f7f6c569d"
 
 PR = "r7"
 
-S = "${WORKDIR}/git"
-
 DEPENDS = " \
     python3-native \
 "

meta-opencentauri/recipes-apps/klipper/klipper_0.13.0.bb

@@ -10,8 +10,6 @@ SRC_URI = "git://github.com/Klipper3d/klipper.git;protocol=https;branch=master \
     file://klipper-init-d"
 SRCREV = "61c0c8d2ef40340781835dd53fb04cc7a454e37a"
 
-S = "${WORKDIR}/git"
-
 inherit python3-dir update-rc.d
 
 DEPENDS = " \
@@ -77,7 +75,7 @@ do_install() {
 
     # Install SysVinit script
     install -d ${D}${sysconfdir}/init.d
-    cp -r ${WORKDIR}/klipper-init-d ${D}${sysconfdir}/init.d/klipper
+    cp -r ${UNPACKDIR}/klipper-init-d ${D}${sysconfdir}/init.d/klipper
     chmod 0755 ${D}${sysconfdir}/init.d/klipper
 }
 

meta-opencentauri/recipes-apps/lzbench/lzbench_2.2.bb

@@ -9,8 +9,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d328bcd7c6004f4f7adae0842ed19146"
 SRCREV = "74d7438dbfc8119055796053b24abd29e65617a0"
 SRC_URI = "git://github.com/inikep/lzbench.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
-
 DEPENDS = ""
 
 do_configure[noexec] = "1"

meta-opencentauri/recipes-apps/mainsail/mainsail_2.17.0.bb

@@ -10,7 +10,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 SRC_URI = "https://github.com/mainsail-crew/mainsail/releases/download/v${PV}/mainsail.zip;subdir=mainsail"
 SRC_URI[sha256sum] = "d010f4df25557d520ccdbb8e42fc381df2288e6a5c72d3838a5a2433c7a31d4e"
 
-S = "${WORKDIR}/mainsail"
+S = "${UNPACKDIR}/mainsail"
 
 RDEPENDS:${PN} = " \
     klipper \

meta-opencentauri/recipes-apps/mcu-flasher/mcu-flasher_0.1.0.bb

@@ -1,4 +1,4 @@
-inherit cargo
+inherit cargo pkgconfig
 
 SUMMARY = "Serial Multiplexer"
 HOMEPAGE = "https://github.com/OpenCentauri/OpenCentauri"
@@ -11,10 +11,10 @@ SRC_URI += " \
 SRCREV = "fb829bd0a469e1c54cb9d2aa1bd98e14afd9f351"
 PR = "r1"
 
-S = "${WORKDIR}/git/mcu-flasher"
+S = "${UNPACKDIR}/${PN}-${PV}/mcu-flasher"
 CARGO_SRC_DIR = ""
 
-DEPENDS += "eudev pkgconfig-native"
+DEPENDS += "eudev"
 
 INSANE_SKIP:${PN} += "already-stripped"