Merge pull request #25 from SoftwareDefinedVehicle/fix-raspi-kas-config

Fix kas config for Raspberry Pi boot problem

Author: mikehaller

.github/workflows/build.yml

@@ -47,7 +47,7 @@ jobs:
       env:
         KAS_MACHINE: qemux86-64
       run: |
-        (r=3;while ! kas build kas/leda-kirkstone.yaml:kas/spdx.yaml:kas/mirrors.yaml ; do ((--r))||exit;sleep 60;done)
+        (r=3;while ! kas build kas/leda-qemux86-64 ; do ((--r))||exit;sleep 60;done)
     - name: Generate CHANGELOG.md
       run: |
         docker run --rm -v "$(pwd)":/usr/local/src/your-app githubchangeloggenerator/github-changelog-generator github_changelog_generator -u eclipse-leda -p leda-distro --no-author
@@ -125,7 +125,7 @@ jobs:
       env:
         KAS_MACHINE: qemuarm64
       run: |
-        (r=3;while ! kas build kas/leda-kirkstone.yaml:kas/spdx.yaml:kas/mirrors.yaml ; do ((--r))||exit;sleep 60;done)
+        (r=3;while ! kas build kas/leda-qemuarm64.yaml ; do ((--r))||exit;sleep 60;done)
     - name: Generate CHANGELOG.md
       run: |
         docker run --rm -v "$(pwd)":/usr/local/src/your-app githubchangeloggenerator/github-changelog-generator github_changelog_generator -u eclipse-leda -p leda-distro --no-author
@@ -201,7 +201,7 @@ jobs:
       env:
         KAS_MACHINE: raspberrypi4-64
       run: |
-        (r=3;while ! kas build kas/leda-kirkstone.yaml:kas/spdx.yaml:kas/mirrors.yaml ; do ((--r))||exit;sleep 60;done)
+        (r=3;while ! kas build kas/leda-raspberrypi4-64.yaml ; do ((--r))||exit;sleep 60;done)
     - name: Generate CHANGELOG.md
       run: |
         docker run --rm -v "$(pwd)":/usr/local/src/your-app githubchangeloggenerator/github-changelog-generator github_changelog_generator -u eclipse-leda -p leda-distro --no-author

.github/workflows/dryrun.yml

@@ -24,15 +24,41 @@ on:
   workflow_dispatch:
 
 jobs:
-  kirkstone:
-    name: Yocto (Kirkstone)
+  dryrun-qemux86-64:
+    name: Dry-Run (qemux86-64)
     runs-on: ubuntu-22.04
     steps:
     - name: Checkout
       uses: actions/checkout@v3
     - name: Install tools
-      run: sudo apt-get install -y --no-install-recommends socat file gawk wget git diffstat unzip texinfo gcc build-essential chrpath socat cpio python3 python3-pip python3-pexpect xz-utils debianutils iputils-ping python3-git python3-jinja2 libegl1-mesa libsdl1.2-dev pylint xterm python3-subunit mesa-common-dev zstd liblz4-tool tmux mc skopeo fdisk ruby-full jq libvirt-clients libvirt-daemon-system qemu-system-x86 qemu-system-arm qemu-kvm squashfs-tools rauc python3-newt ca-certificates curl gnupg lsb-release
+      run: sudo apt-get install -y --no-install-recommends socat file gawk wget git diffstat unzip texinfo gcc build-essential chrpath socat cpio python3 python3-pip python3-pexpect xz-utils debianutils iputils-ping python3-git python3-jinja2 libegl1-mesa libsdl1.2-dev pylint xterm python3-subunit mesa-common-dev zstd liblz4-tool python3-newt ca-certificates curl gnupg lsb-release
     - name: Install kas
       run: sudo pip3 install kas
     - name: DryRun sdv-image-all
-      run: kas build kas/leda-kirkstone.yaml -- --dry-run
+      run: kas build kas/leda-qemux86-64.yaml -- --dry-run
+
+  dryrun-qemuarm64:
+    name: Dry-Run (qemuarm64)
+    runs-on: ubuntu-22.04
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+    - name: Install tools
+      run: sudo apt-get install -y --no-install-recommends socat file gawk wget git diffstat unzip texinfo gcc build-essential chrpath socat cpio python3 python3-pip python3-pexpect xz-utils debianutils iputils-ping python3-git python3-jinja2 libegl1-mesa libsdl1.2-dev pylint xterm python3-subunit mesa-common-dev zstd liblz4-tool python3-newt ca-certificates curl gnupg lsb-release
+    - name: Install kas
+      run: sudo pip3 install kas
+    - name: DryRun sdv-image-all
+      run: kas build kas/leda-qemuarm64.yaml -- --dry-run
+
+  dryrun-raspberrypi4-64:
+    name: Dry-Run (raspberrypi4-64)
+    runs-on: ubuntu-22.04
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+    - name: Install tools
+      run: sudo apt-get install -y --no-install-recommends socat file gawk wget git diffstat unzip texinfo gcc build-essential chrpath socat cpio python3 python3-pip python3-pexpect xz-utils debianutils iputils-ping python3-git python3-jinja2 libegl1-mesa libsdl1.2-dev pylint xterm python3-subunit mesa-common-dev zstd liblz4-tool python3-newt ca-certificates curl gnupg lsb-release
+    - name: Install kas
+      run: sudo pip3 install kas
+    - name: DryRun sdv-image-all
+      run: kas build kas/leda-raspberrypi4-64.yaml -- --dry-run

.github/workflows/prebuild-sstate.yml

@@ -49,7 +49,7 @@ jobs:
       if: always()
       continue-on-error: true
       run: |
-        KAS_MACHINE=qemux86-64 timeout --signal=SIGINT 4h kas build --update kas/leda-kirkstone.yaml:kas/spdx.yaml:kas/mirrors.yaml
+        timeout --signal=SIGINT 4h kas build --update kas/leda-qemux86-64.yaml
     - uses: bacongobbler/azure-blob-storage-upload@v3.0.0
       if: github.repository_owner == 'SoftwareDefinedVehicle'
       with:
@@ -82,7 +82,7 @@ jobs:
       if: always()
       continue-on-error: true
       run: |
-        KAS_MACHINE=qemuarm64 timeout --signal=SIGINT 4h kas build --update kas/leda-kirkstone.yaml:kas/spdx.yaml:kas/mirrors.yaml
+        timeout --signal=SIGINT 4h kas build --update kas/leda-qemuarm64.yaml
     - uses: bacongobbler/azure-blob-storage-upload@v3.0.0
       if: github.repository_owner == 'SoftwareDefinedVehicle'
       with:
@@ -115,7 +115,7 @@ jobs:
       if: always()
       continue-on-error: true
       run: |
-        KAS_MACHINE=raspberrypi4-64 timeout --signal=SIGINT 4h kas build --update kas/leda-kirkstone.yaml:kas/spdx.yaml:kas/mirrors.yaml
+        timeout --signal=SIGINT 4h kas build --update kas/leda-raspberrypi4-64.yaml
     - uses: bacongobbler/azure-blob-storage-upload@v3.0.0
       if: github.repository_owner == 'SoftwareDefinedVehicle'
       with:

.github/workflows/test-eclipse-runner.yml

@@ -33,4 +33,4 @@ jobs:
       run: git clone --recurse-submodules https://github.com/${{github.repository}} leda/
 
     - name: DryRun sdv-image-all
-      run: cd leda && kas build kas/leda-kirkstone.yaml --target sdv-image-all -- --dry-run
+      run: cd leda && kas build kas/leda-qemux86-64.yaml --target sdv-image-all -- --dry-run

.ort/ort-config

@@ -0,0 +1 @@
+Subproject commit d9208476ce149197a938e8411e9918105701228c

.ort/tools/flutter-3.3.8-stable/flutter

@@ -0,0 +1 @@
+Subproject commit 52b3dc25f6471c27b2144594abb11c741cb88f57

BUILD.md

@@ -12,13 +12,8 @@ Please see the [Leda Documentation](https://eclipse-leda.github.io/leda/docs/bui
 
 3. Start the build for qemux86_64:
 
-        kas build kas/leda-kirkstone.yaml
+        kas build kas/leda-qemux86-64.yaml
 
-4. To build for another target machine, set the `KAS_MACHINE` environment variable:
+4. To build for another target machine, is the other kas config files:
 
-        KAS_MACHINE=raspberrypi4-64 kas build kas/leda-kirkstone.yaml
-
-
-5. To build using mirrors which greatly improves build time:
-
-        kas build kas/leda-kirkstone.yaml:kas/mirrors.yaml
+        kas build kas/leda-raspberrypi4-64.yaml

kas/README.md

@@ -2,34 +2,32 @@
 
 To start a full build, e.g. for the Kirkstone release, run the following command:
 
-    kas build kas/leda-kirkstone.yaml
-
-    kas build -c cleanall kas/leda-kirkstone.yaml k3s
+    kas build kas/leda-qemux86-64.yaml
 
 kas will then check out all necessary dependencies as specified in the project configuration file. After that, it will start the build for the machine, distro and target device.
 
 # Running
 
 Running with user-level networking, in case the host does not have TAP/TUN set up properly. If you have TAP/TUN set up, remove the `slirp` keyword. Also enable the OVMF bios for multiboot. If you have kvm enabled on your host, add the `kvm` keyword:
 
-    kas shell kas/leda-kirkstone.yaml -c 'runqemu nographic ovmf kvm'
+    kas shell kas/leda-qemux86-64.yaml -c 'runqemu nographic ovmf kvm'
 
 Boot directly into a specific partition:
 
-    kas shell kas/leda-kirkstone.yaml -c 'runqemu slirp nographic ovmf sdv-image-all'
-    kas shell kas/leda-kirkstone.yaml -c 'runqemu slirp nographic ovmf sdv-image-full'
-    kas shell kas/leda-kirkstone.yaml -c 'runqemu slirp nographic ovmf sdv-image-minimal'
-    kas shell kas/leda-kirkstone.yaml -c 'runqemu slirp nographic ovmf sdv-image-rescue'
+    kas shell kas/leda-qemux86-64.yaml -c 'runqemu slirp nographic ovmf sdv-image-all'
+    kas shell kas/leda-qemux86-64.yaml -c 'runqemu slirp nographic ovmf sdv-image-full'
+    kas shell kas/leda-qemux86-64.yaml -c 'runqemu slirp nographic ovmf sdv-image-minimal'
+    kas shell kas/leda-qemux86-64.yaml -c 'runqemu slirp nographic ovmf sdv-image-rescue'
 
 # Debugging BitBake
 
 The following commands show the layer setup and information about which recipes are being appended:
 
-    kas shell kas/leda-kirkstone.yaml -c 'bitbake-layers show-layers'
-    kas shell kas/leda-kirkstone.yaml -c 'bitbake-layers show-overlayed'
-    kas shell kas/leda-kirkstone.yaml -c 'bitbake-layers show-recipes'
-    kas shell kas/leda-kirkstone.yaml -c 'bitbake-layers show-appends'
-    kas shell kas/leda-kirkstone.yaml -c 'bitbake -c cleanall '
+    kas shell kas/leda-qemux86-64.yaml -c 'bitbake-layers show-layers'
+    kas shell kas/leda-qemux86-64.yaml -c 'bitbake-layers show-overlayed'
+    kas shell kas/leda-qemux86-64.yaml -c 'bitbake-layers show-recipes'
+    kas shell kas/leda-qemux86-64.yaml -c 'bitbake-layers show-appends'
+    kas shell kas/leda-qemux86-64.yaml -c 'bitbake -c cleanall '
 
 # Mirrors and Build Caching
 
@@ -38,7 +36,7 @@ In general, run a BitBake Hash Equivalence Server centrally.
 
 To use our project cache, include the `mirrors.yaml` configuration file when building:
 
-    kas build kas/leda-kirkstone.yaml:kas/mirrors.yaml
+    kas build kas/leda-qemux86-64.yaml:kas/mirrors.yaml
 
 ## Updating the build cache
 
@@ -54,10 +52,10 @@ Pre-Requisites:
 
     # Ask BitBake to perform only the fetch tasks for each recipe, downloading the sources
     # and archiving them as a tar archive in the build/downloads/ folder.
-    kas shell kas/leda-kirkstone.yaml:kas/mirrors.yaml:kas/generate-mirror.yaml -c 'bitbake --runall=fetch sdv-image-all'
+    kas shell kas/leda-qemux86-64.yaml:kas/generate-mirror.yaml -c 'bitbake --runall=fetch sdv-image-all'
 
     # Respectively, for other machines:
-    KAS_MACHINE=raspberrypi4-64 kas shell kas/leda-kirkstone.yaml:kas/mirrors.yaml:kas/generate-mirror.yaml -c 'bitbake --runall=fetch sdv-image-all'
+    kas shell kas/leda-raspberrypi4-64.yaml:kas/generate-mirror.yaml -c 'bitbake --runall=fetch sdv-image-all'
 
     # Upload the downloads folder to the remote mirror.
     # In this example, an Azure Blob Storage is used

kas/leda-kirkstone.yaml kas/common-kirkstone.yamlkas/leda-kirkstone.yaml renamed to kas/common-kirkstone.yaml

@@ -13,14 +13,10 @@
 # Every file needs to contain a header, that provides kas with information
 # about the context of this file.
 header:
-  # The `version` entry in the header describes for which configuration
-  # format version this file was created for. It is used by kas to figure
-  # out if it is compatible with this file. The version is an integer that
-  # is increased on every format change.
   version: 12
-# The machine as it is written into the `local.conf` of bitbake.
-machine: qemux86-64
-# The distro name as it is written into the `local.conf` of bitbake.
+  includes:
+  - kas/mirrors.yaml
+  - kas/spdx.yaml
 distro: leda
 target: sdv-image-all
 local_conf_header:
@@ -36,22 +32,13 @@ local_conf_header:
   buils-stats: |
     USER_CLASSES += "buildstats buildstats-summary"
 repos:
-  # This entry includes the repository where the config file is located
-  # to the bblayers.conf:
-  # Here we include a list of layers from the poky repository to the
-  # bblayers.conf:
   poky:
     url: "https://git.yoctoproject.org/git/poky"
     refspec: kirkstone
     layers:
       meta:
       meta-poky:
       meta-yocto-bsp:
-  meta-rauc-community:
-    url: "https://github.com/rauc/meta-rauc-community.git"
-    refspec: kirkstone
-    layers:
-      meta-rauc-qemux86:
   meta-rauc:
     url: "https://github.com/rauc/meta-rauc.git"
     refspec: kirkstone
@@ -69,9 +56,6 @@ repos:
       meta-filesystems:
       meta-python:
       meta-networking:
-  meta-raspberrypi:
-    url: "https://git.yoctoproject.org/meta-raspberrypi"
-    refspec: kirkstone
   meta-spdxscanner:
     url: https://git.yoctoproject.org/meta-spdxscanner
     refspec: kirkstone