From ac4c842acd77a1664aacdd0eb1286e433e853eba Mon Sep 17 00:00:00 2001 From: Dany LE Date: Thu, 9 Apr 2026 01:40:27 +0200 Subject: [PATCH] switch to Yocto Walnascar + Linux mainline 6.12 --- .gitea/workflows/ci.yml | 6 ++---- .gitmodules | 6 +++--- build/conf/bblayers.conf | 2 ++ build/conf/local.conf | 8 ++++---- meta-diya | 2 +- meta-openembedded | 2 +- meta-opi-diya | 2 +- meta-wayland | 2 +- poky | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 6d5b4b5..8002fdc 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -7,8 +7,8 @@ jobs: runs-on: ci-yocto-jammy container: volumes: - - /home/yocto-build:/build - options: --cpus 3 + - /var/lib/yocto-build:/build + - /srv/shared/pool/public:/public timeout-minutes: 720 steps: - name: Check out repository code @@ -24,8 +24,6 @@ jobs: echo "CACHE = \"/build/diya-opi-distrib-cache\"" >> build/conf/local.conf echo "BB_CACHEDIR = \"/build/diya-opi-distrib-cache\"" >> build/conf/local.conf echo "PERSISTENT_DIR = \"/build/diya-opi-distrib-cache\"" >> build/conf/local.conf - echo "BB_NUMBER_THREADS = \"3\"" >> build/conf/local.conf - echo "PARALLEL_MAKE = \"-j 3\"" >> build/conf/local.conf cat build/conf/*.conf - name: build booloader for Orpi run: | diff --git a/.gitmodules b/.gitmodules index ba2bc72..fead918 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "meta-diya"] path = meta-diya - url = https://git.iohub.dev/dany/meta-diya.git + url = https://git.iohub.dev/diya/meta-diya.git shallow = true [submodule "meta-openembedded"] path = meta-openembedded @@ -8,7 +8,7 @@ shallow = true [submodule "meta-opi-diya"] path = meta-opi-diya - url = https://git.iohub.dev/dany/meta-opi-diya.git + url = https://git.iohub.dev/diya/meta-opi-diya.git shallow = true [submodule "meta-wayland"] path = meta-wayland @@ -16,5 +16,5 @@ shallow = true [submodule "poky"] path = poky - url = http://git.yoctoproject.org/poky + url = https://git.yoctoproject.org/poky shallow = true diff --git a/build/conf/bblayers.conf b/build/conf/bblayers.conf index 8ffe559..1e1e969 100644 --- a/build/conf/bblayers.conf +++ b/build/conf/bblayers.conf @@ -16,4 +16,6 @@ BBLAYERS ?= " \ ${BSPDIR}/meta-openembedded/meta-oe \ ${BSPDIR}/meta-openembedded/meta-python \ ${BSPDIR}/meta-openembedded/meta-multimedia \ + ${BSPDIR}/meta-openembedded/meta-networking \ + ${BSPDIR}/meta-openembedded/meta-gnome \ " \ No newline at end of file diff --git a/build/conf/local.conf b/build/conf/local.conf index 0384263..235caf9 100644 --- a/build/conf/local.conf +++ b/build/conf/local.conf @@ -191,10 +191,10 @@ BB_DISKMON_DIRS ??= "\ STOPTASKS,${DL_DIR},1G,100K \ STOPTASKS,${SSTATE_DIR},1G,100K \ STOPTASKS,/tmp,100M,100K \ - ABORT,${TMPDIR},100M,1K \ - ABORT,${DL_DIR},100M,1K \ - ABORT,${SSTATE_DIR},100M,1K \ - ABORT,/tmp,10M,1K" + HALT,${TMPDIR},100M,1K \ + HALT,${DL_DIR},100M,1K \ + HALT,${SSTATE_DIR},100M,1K \ + HALT,/tmp,10M,1K" # # Shared-state files from other locations diff --git a/meta-diya b/meta-diya index 7b75b29..6fd598f 160000 --- a/meta-diya +++ b/meta-diya @@ -1 +1 @@ -Subproject commit 7b75b29500fc551cd5a996e4d32c446ca26bb2cd +Subproject commit 6fd598fabfd899a9d1f834c9068a212b4bc77e19 diff --git a/meta-openembedded b/meta-openembedded index edd1a1e..07330a9 160000 --- a/meta-openembedded +++ b/meta-openembedded @@ -1 +1 @@ -Subproject commit edd1a1e284fdcb80cd48d411f235d47f23bc27ae +Subproject commit 07330a98cf93806b7a4e0170a541b94962ff3960 diff --git a/meta-opi-diya b/meta-opi-diya index 83607e7..e7102ce 160000 --- a/meta-opi-diya +++ b/meta-opi-diya @@ -1 +1 @@ -Subproject commit 83607e7bcb1c9ba1bd8efe4b8b0cd5af85306fe5 +Subproject commit e7102ce72e5466abba8a3f5f9060278153453b22 diff --git a/meta-wayland b/meta-wayland index 6ff79b3..9a9fa8e 160000 --- a/meta-wayland +++ b/meta-wayland @@ -1 +1 @@ -Subproject commit 6ff79b3423d0d4ca9a2afffcc4d197ac2ead5e34 +Subproject commit 9a9fa8e1aac7418a8a941d33ec00b595b2f6a007 diff --git a/poky b/poky index 9036bc0..d0b46a6 160000 --- a/poky +++ b/poky @@ -1 +1 @@ -Subproject commit 9036bc090c771c710796e3690da59d3ebb96dcf1 +Subproject commit d0b46a6624ec9c61c47270745dd0b2d5abbe6ac1