From 7af2342520c05d0fe776be4fbfb62424bb1dc6f1 Mon Sep 17 00:00:00 2001 From: dany Date: Sat, 22 Mar 2025 10:41:27 +0100 Subject: [PATCH 01/16] fix(ci): copy conf files to build directory before running bitbake --- .gitea/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 7e89544..f2fb68c 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -16,6 +16,8 @@ jobs: run: git submodule update --init - name: Building image and sdk run: | + mkdir -p /build/conf + cp -v build/conf/*.conf /build/conf/ cd poky && source oe-init-build-env /build cat conf/*.conf bitbake core-image-base From 99a3b7762c77baac03911ca3f35ddb7df063b57a Mon Sep 17 00:00:00 2001 From: Dany LE Date: Sat, 22 Mar 2025 10:55:16 +0100 Subject: [PATCH 02/16] fix(ci): allows to specify BSPDIR from envar --- .gitea/workflows/ci.yml | 1 + build/conf/bblayers.conf | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index f2fb68c..d099580 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -18,6 +18,7 @@ jobs: run: | mkdir -p /build/conf cp -v build/conf/*.conf /build/conf/ + export BSPDIR="$(pwd)" cd poky && source oe-init-build-env /build cat conf/*.conf bitbake core-image-base diff --git a/build/conf/bblayers.conf b/build/conf/bblayers.conf index 775149b..72f3307 100644 --- a/build/conf/bblayers.conf +++ b/build/conf/bblayers.conf @@ -3,7 +3,7 @@ POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" -BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" +BSPDIR ?= "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" BBFILES ?= "" BBLAYERS ?= " \ From f45b0e67302cbf0a0a609d4cbebb8754aca725d8 Mon Sep 17 00:00:00 2001 From: dany Date: Sat, 22 Mar 2025 11:02:20 +0100 Subject: [PATCH 03/16] fix(ci): add BSPDIR to BB_ENV_WHITELIST --- .gitea/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index d099580..08edc86 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -19,7 +19,9 @@ jobs: mkdir -p /build/conf cp -v build/conf/*.conf /build/conf/ export BSPDIR="$(pwd)" + export BB_ENV_WHITELIST="$BB_ENV_WHITELIST BSPDIR" cd poky && source oe-init-build-env /build + printenv cat conf/*.conf bitbake core-image-base bitbake core-image-base -c populate_sdk From 718e0a17a16125fae42ace2424bafd59f81dfb1e Mon Sep 17 00:00:00 2001 From: dany Date: Sat, 22 Mar 2025 11:07:46 +0100 Subject: [PATCH 04/16] fix(ci): rename BB_ENV_WHITELIST to BB_ENV_PASSTHROUGH --- .gitea/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 08edc86..8822b0e 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: mkdir -p /build/conf cp -v build/conf/*.conf /build/conf/ export BSPDIR="$(pwd)" - export BB_ENV_WHITELIST="$BB_ENV_WHITELIST BSPDIR" + export BB_ENV_PASSTHROUGH="$BB_ENV_PASSTHROUGH BSPDIR" cd poky && source oe-init-build-env /build printenv cat conf/*.conf From 594d97cdb66b6d70b3a9c1887fe4e22df530e21c Mon Sep 17 00:00:00 2001 From: dany Date: Sat, 22 Mar 2025 11:18:55 +0100 Subject: [PATCH 05/16] fix: only set BBPATH when not previously set --- build/conf/bblayers.conf | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/build/conf/bblayers.conf b/build/conf/bblayers.conf index 72f3307..0b6c2d4 100644 --- a/build/conf/bblayers.conf +++ b/build/conf/bblayers.conf @@ -1,19 +1,19 @@ -# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf -# changes incompatibly -POKY_BBLAYERS_CONF_VERSION = "2" - -BBPATH = "${TOPDIR}" -BSPDIR ?= "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" -BBFILES ?= "" - -BBLAYERS ?= " \ - ${BSPDIR}/poky/meta \ - ${BSPDIR}/poky/meta-poky \ - ${BSPDIR}/poky/meta-yocto-bsp \ - ${BSPDIR}/meta-wayland \ - ${BSPDIR}/meta-diya \ - ${BSPDIR}/meta-opi-diya \ - ${BSPDIR}/meta-openembedded/meta-oe \ - ${BSPDIR}/meta-openembedded/meta-python \ - ${BSPDIR}/meta-openembedded/meta-multimedia \ +# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf +# changes incompatibly +POKY_BBLAYERS_CONF_VERSION = "2" + +BBPATH ?= "${TOPDIR}" +BSPDIR ?= "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" +BBFILES ?= "" + +BBLAYERS ?= " \ + ${BSPDIR}/poky/meta \ + ${BSPDIR}/poky/meta-poky \ + ${BSPDIR}/poky/meta-yocto-bsp \ + ${BSPDIR}/meta-wayland \ + ${BSPDIR}/meta-diya \ + ${BSPDIR}/meta-opi-diya \ + ${BSPDIR}/meta-openembedded/meta-oe \ + ${BSPDIR}/meta-openembedded/meta-python \ + ${BSPDIR}/meta-openembedded/meta-multimedia \ " \ No newline at end of file From b7df75473abe8534246acbeb3c1858744b107712 Mon Sep 17 00:00:00 2001 From: dany Date: Sat, 22 Mar 2025 11:21:02 +0100 Subject: [PATCH 06/16] fix(ci): specify BBPATH in envar --- .gitea/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 8822b0e..dbd5438 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -19,7 +19,8 @@ jobs: mkdir -p /build/conf cp -v build/conf/*.conf /build/conf/ export BSPDIR="$(pwd)" - export BB_ENV_PASSTHROUGH="$BB_ENV_PASSTHROUGH BSPDIR" + export BBPATH="$(pwd)" + export BB_ENV_PASSTHROUGH="BSPDIR BBPATH" cd poky && source oe-init-build-env /build printenv cat conf/*.conf From 870c35337e0f80224c4587f601e328eb1b422525 Mon Sep 17 00:00:00 2001 From: dany Date: Sat, 22 Mar 2025 11:33:45 +0100 Subject: [PATCH 07/16] fix(ci): link build dir to permanent location --- .gitea/workflows/ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index dbd5438..d0b97be 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -18,10 +18,8 @@ jobs: run: | mkdir -p /build/conf cp -v build/conf/*.conf /build/conf/ - export BSPDIR="$(pwd)" - export BBPATH="$(pwd)" - export BB_ENV_PASSTHROUGH="BSPDIR BBPATH" - cd poky && source oe-init-build-env /build + ln -sf /build ci-build + cd poky && source oe-init-build-env ../ci-build printenv cat conf/*.conf bitbake core-image-base From 799ac9407e038ba7993712d77df1f4da7d188178 Mon Sep 17 00:00:00 2001 From: dany Date: Sat, 22 Mar 2025 11:37:13 +0100 Subject: [PATCH 08/16] Update build/conf/bblayers.conf --- build/conf/bblayers.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/conf/bblayers.conf b/build/conf/bblayers.conf index 0b6c2d4..8ffe559 100644 --- a/build/conf/bblayers.conf +++ b/build/conf/bblayers.conf @@ -2,8 +2,8 @@ # changes incompatibly POKY_BBLAYERS_CONF_VERSION = "2" -BBPATH ?= "${TOPDIR}" -BSPDIR ?= "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" +BBPATH = "${TOPDIR}" +BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" BBFILES ?= "" BBLAYERS ?= " \ From 526b0ec6eb5acca1674287c4371b64ab95392400 Mon Sep 17 00:00:00 2001 From: dany Date: Sat, 22 Mar 2025 12:18:42 +0100 Subject: [PATCH 09/16] fix(ci): use external locations for caches, tmp and downloads --- .gitea/workflows/ci.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index d0b97be..f3b7ccb 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -14,13 +14,23 @@ jobs: uses: actions/checkout@v3 - name: Update submodule run: git submodule update --init - - name: Building image and sdk + - name: Init env run: | - mkdir -p /build/conf - cp -v build/conf/*.conf /build/conf/ - ln -sf /build ci-build - cd poky && source oe-init-build-env ../ci-build + mkdir -p /build/cache + mkdir -p /build/downloads + mkdir -p /build/sstate-cache + mkdir -p /build/tmp + ln -sf /build/cache build/cache + ln -sf /build/downloads build/downloads + ln -sf /build/sstate-cache build/sstate-cache + ln -sf /build/tmp build/tmp + - name: build image for Orpi + run: | + cd poky && source oe-init-build-env ../build printenv cat conf/*.conf bitbake core-image-base + - name: build sdk for Orpi + run: | + cd poky && source oe-init-build-env ../build bitbake core-image-base -c populate_sdk From 12c2928948c49696e5ca4ab0b72da0ac6f9221e7 Mon Sep 17 00:00:00 2001 From: dany Date: Sat, 22 Mar 2025 12:42:25 +0100 Subject: [PATCH 10/16] fix(ci): set DL_DIR, TMPDIR, SSTATE_DIR to external locations --- .gitea/workflows/ci.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index f3b7ccb..87d4b6d 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -16,14 +16,13 @@ jobs: run: git submodule update --init - name: Init env run: | - mkdir -p /build/cache mkdir -p /build/downloads mkdir -p /build/sstate-cache mkdir -p /build/tmp - ln -sf /build/cache build/cache - ln -sf /build/downloads build/downloads - ln -sf /build/sstate-cache build/sstate-cache - ln -sf /build/tmp build/tmp + echo "DL_DIR = \"/build/downloads\"" >> build/conf/local.conf + echo "TMPDIR = \"/build/tmp\"" >> build/conf/local.conf + echo "SSTATE_DIR = \"/build/sstate-cache\"" >> build/conf/local.conf + - name: build image for Orpi run: | cd poky && source oe-init-build-env ../build From 535009d5f166f8188f6272863105235988f68da7 Mon Sep 17 00:00:00 2001 From: dany Date: Sat, 22 Mar 2025 12:45:36 +0100 Subject: [PATCH 11/16] Update .gitea/workflows/ci.yml --- .gitea/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 87d4b6d..3efd5f5 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -19,6 +19,7 @@ jobs: mkdir -p /build/downloads mkdir -p /build/sstate-cache mkdir -p /build/tmp + echo "" >> build/conf/local.conf echo "DL_DIR = \"/build/downloads\"" >> build/conf/local.conf echo "TMPDIR = \"/build/tmp\"" >> build/conf/local.conf echo "SSTATE_DIR = \"/build/sstate-cache\"" >> build/conf/local.conf From e1e2930e421252069ec2d175a0ca391a77446ef9 Mon Sep 17 00:00:00 2001 From: dany Date: Sat, 22 Mar 2025 12:57:00 +0100 Subject: [PATCH 12/16] Update .gitea/workflows/ci.yml --- .gitea/workflows/ci.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 3efd5f5..f295a9e 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -7,7 +7,7 @@ jobs: runs-on: ci-yocto-jammy container: volumes: - - /home/yocto-build/diya-opi-distrib:/build + - /home/yocto-build:/build timeout-minutes: 480 steps: - name: Check out repository code @@ -16,13 +16,10 @@ jobs: run: git submodule update --init - name: Init env run: | - mkdir -p /build/downloads - mkdir -p /build/sstate-cache - mkdir -p /build/tmp echo "" >> build/conf/local.conf - echo "DL_DIR = \"/build/downloads\"" >> build/conf/local.conf - echo "TMPDIR = \"/build/tmp\"" >> build/conf/local.conf - echo "SSTATE_DIR = \"/build/sstate-cache\"" >> build/conf/local.conf + echo "DL_DIR = \"/build/download\"" >> build/conf/local.conf + echo "TMPDIR = \"/build/diya-opi-distrib\"" >> build/conf/local.conf + echo "SSTATE_DIR = \"/build/sstate\"" >> build/conf/local.conf - name: build image for Orpi run: | From 7a5166dcf1f3ec319df453f9db1f0b5c407b4902 Mon Sep 17 00:00:00 2001 From: dany Date: Sat, 22 Mar 2025 22:13:29 +0100 Subject: [PATCH 13/16] add build instruction for qemux86-64 --- .gitea/workflows/ci.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index f295a9e..126ef2b 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -8,6 +8,7 @@ jobs: container: volumes: - /home/yocto-build:/build + # options: --cpus 2.5 timeout-minutes: 480 steps: - name: Check out repository code @@ -20,7 +21,8 @@ jobs: echo "DL_DIR = \"/build/download\"" >> build/conf/local.conf echo "TMPDIR = \"/build/diya-opi-distrib\"" >> build/conf/local.conf echo "SSTATE_DIR = \"/build/sstate\"" >> build/conf/local.conf - + # echo "BB_NUMBER_THREADS = \"2\"" >> build/conf/local.conf + # echo "PARALLEL_MAKE = \"-j 2\"" >> build/conf/local.conf - name: build image for Orpi run: | cd poky && source oe-init-build-env ../build @@ -31,3 +33,11 @@ jobs: run: | cd poky && source oe-init-build-env ../build bitbake core-image-base -c populate_sdk + - name: build x86_64 qemu image + run: | + cd poky && source oe-init-build-env ../build + MACHINE=qemux86-64 bitbake core-image-base + - name: build x86_64 qemu sdk + run: | + cd poky && source oe-init-build-env ../build + MACHINE=qemux86-64 bitbake core-image-base -c populate_sdk From e7757d31650cddc5229774095bc7e819b15c3f1a Mon Sep 17 00:00:00 2001 From: dany Date: Sun, 23 Mar 2025 11:47:30 +0100 Subject: [PATCH 14/16] Update .gitea/workflows/ci.yml --- .gitea/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 126ef2b..bd9d1b9 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: volumes: - /home/yocto-build:/build # options: --cpus 2.5 - timeout-minutes: 480 + timeout-minutes: 720 steps: - name: Check out repository code uses: actions/checkout@v3 @@ -21,6 +21,7 @@ jobs: echo "DL_DIR = \"/build/download\"" >> build/conf/local.conf echo "TMPDIR = \"/build/diya-opi-distrib\"" >> build/conf/local.conf echo "SSTATE_DIR = \"/build/sstate\"" >> build/conf/local.conf + echo "CACHE = \"/build/diya-opi-distrib-cache\"" >> build/conf/local.conf # echo "BB_NUMBER_THREADS = \"2\"" >> build/conf/local.conf # echo "PARALLEL_MAKE = \"-j 2\"" >> build/conf/local.conf - name: build image for Orpi From de47088fac727e53e65cccb9520eb8af51107adc Mon Sep 17 00:00:00 2001 From: dany Date: Sun, 23 Mar 2025 14:04:04 +0100 Subject: [PATCH 15/16] fix(ci): add u-boot build --- .gitea/workflows/ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index bd9d1b9..95ae5ba 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -24,11 +24,16 @@ jobs: echo "CACHE = \"/build/diya-opi-distrib-cache\"" >> build/conf/local.conf # echo "BB_NUMBER_THREADS = \"2\"" >> build/conf/local.conf # echo "PARALLEL_MAKE = \"-j 2\"" >> build/conf/local.conf + cat build/conf/*.conf + - name: build booloader for Orpi + run: | + cd poky && source oe-init-build-env ../build + printenv + bitbake u-boot - name: build image for Orpi run: | cd poky && source oe-init-build-env ../build printenv - cat conf/*.conf bitbake core-image-base - name: build sdk for Orpi run: | From baac1c02f6ad5ec37c35846571e5b13467746fe9 Mon Sep 17 00:00:00 2001 From: dany Date: Mon, 24 Mar 2025 10:42:02 +0100 Subject: [PATCH 16/16] Update .gitea/workflows/ci.yml --- .gitea/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 95ae5ba..0fb73e3 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -22,6 +22,8 @@ jobs: echo "TMPDIR = \"/build/diya-opi-distrib\"" >> build/conf/local.conf echo "SSTATE_DIR = \"/build/sstate\"" >> build/conf/local.conf 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 = \"2\"" >> build/conf/local.conf # echo "PARALLEL_MAKE = \"-j 2\"" >> build/conf/local.conf cat build/conf/*.conf