Merge pull request #23 from mobayraktar/main

Change BSP DEB package versioning

Author: mobayraktar

.github/workflows/yocto-builder/entrypoint.sh

@@ -39,7 +39,7 @@ cat "$BUILD_DIR/conf/local.conf"
 
 env
 
-bitbake gemstone-boot-files
+bitbake gemstone-image-rd
 IMG_DEPLOY_DIR=$(bitbake-getvar --value -r "$IMAGE" DEPLOY_DIR_IMAGE)
 DEB_DEPLOY_DIR=$(bitbake-getvar --value -r "$IMAGE" DEPLOY_DIR_DEB)
 

distro/distro.yaml

@@ -260,6 +260,13 @@ actions:
     script: scripts/all/install-astral-uv.sh
 
 {{ if eq $machine "beagley-ai" }}
+
+{{ if eq $ci "false" }}
+  - action: run
+    chroot: true
+    script: scripts/beagley-ai/install-bootfiles.sh {{ $workdir }} $ROOTDIR
+{{ end }}
+
   - action: run
     chroot: true
     script: scripts/beagley-ai/setup-bootfiles.sh
@@ -270,6 +277,13 @@ actions:
 {{ end }}
 
 {{ if eq $machine "t3-gem-o1" }}
+
+{{ if eq $ci "false" }}
+  - action: run
+    chroot: true
+    script: scripts/t3-gem-o1/install-bootfiles.sh {{ $workdir }} $ROOTDIR
+{{ end }}
+
   - action: run
     chroot: true
     script: scripts/t3-gem-o1/setup-bootfiles.sh

distro/overlays/minimal/all/usr/local/bin/gem-camera-setup

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -euo pipefail
+
+WORKDIR="$1"
+ROOTDIR="$2"
+
+DIR_IMGS="$WORKDIR/build/beagley-ai/deploy-ti/images/beagley-ai"
+
+mkdir -p "$ROOTDIR/boot/overlays"
+cp "$DIR_IMGS/tiboot3.bin" "$ROOTDIR/boot"
+cp "$DIR_IMGS/k3-am67a-beagley-ai.dtb" "$ROOTDIR/boot/"
+cp "$DIR_IMGS/gemstone-image-rd-beagley-ai.cpio.gz" "$ROOTDIR/boot/"
+find "$DIR_IMGS" -name '*.dtbo' -type f -exec cp {} "$ROOTDIR/boot/overlays" \;

distro/scripts/beagley-ai/install-bootfiles.sh

@@ -18,8 +18,6 @@ fi
 
 apt-get update -y
 apt-get install -y \
-    gemstone-boot-files \
-    kernel-image-image \
     kernel-module-at24 \
     kernel-module-bluetooth \
     kernel-module-br-netfilter \
@@ -100,5 +98,11 @@ apt-get install -y \
     kernel-module-xt-conntrack \
     kernel-module-xt-masquerade \
     kernel-module-xt-nat \
-    ti-img-rogue-driver \
-    u-boot
+    ti-img-rogue-driver
+
+if [ "$CI" = "true" ]; then
+    apt-get install -y \
+        gem-beagley-ai-bsp \
+        kernel-image-image \
+        u-boot
+fi

distro/scripts/beagley-ai/install-local-apt.sh

@@ -25,7 +25,6 @@ ext=(
     "ms-python.vscode-pylance"
     "ms-vscode.hexeditor"
     "spywhere.guides"
-    "task.vscode-task"
 )
 
 chown -R gemstone:gemstone /home/gemstone

distro/scripts/custom/install-vscode.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -euo pipefail
+
+WORKDIR="$1"
+ROOTDIR="$2"
+
+DIR_IMGS="$WORKDIR/build/t3-gem-o1/deploy-ti/images/t3-gem-o1"
+
+mkdir -p "$ROOTDIR/boot/overlays"
+cp "$DIR_IMGS/tiboot3.bin" "$ROOTDIR/boot"
+cp "$DIR_IMGS/k3-am67a-t3-gem-o1.dtb" "$ROOTDIR/boot/"
+cp "$DIR_IMGS/gemstone-image-rd-t3-gem-o1.cpio.gz" "$ROOTDIR/boot/"
+find "$DIR_IMGS" -name '*.dtbo' -type f -exec cp {} "$ROOTDIR/boot/overlays" \;

distro/scripts/t3-gem-o1/install-bootfiles.sh

@@ -18,8 +18,6 @@ fi
 
 apt-get update -y
 apt-get install -y \
-    gemstone-boot-files \
-    kernel-image-image \
     kernel-module-at24 \
     kernel-module-bluetooth \
     kernel-module-br-netfilter \
@@ -108,5 +106,11 @@ apt-get install -y \
     kernel-module-xt-conntrack \
     kernel-module-xt-masquerade \
     kernel-module-xt-nat \
-    ti-img-rogue-driver \
-    u-boot
+    ti-img-rogue-driver
+
+if [ "$CI" = "true" ]; then
+    apt-get install -y \
+        gem-t3-gem-o1-bsp \
+        kernel-image-image \
+        u-boot
+fi

distro/scripts/t3-gem-o1/install-local-apt.sh

@@ -33,7 +33,7 @@ repositories:
   yocto/meta-gemstone:
     type: git
     url: https://github.com/t3gemstone/meta-gemstone.git
-    version: 001b4e1c914e2bf8ef6ccdb18ba1acb7e8e531eb
+    version: 93976e7f8b7cafd50f2354895f1723bb6896bdd8
 
   src/ti-img-rogue-umlibs:
     type: git

repos.yml

@@ -4,7 +4,7 @@
 version: '3'
 
 vars:
-  TARGET: gemstone-boot-files
+  TARGET: gemstone-image-rd
   TEMPLATECONF: "{{ .WORKDIR }}/yocto/meta-gemstone/conf/templates/{{ .MACHINE }}/"
   OE_INIT_CMD: TEMPLATECONF={{ .TEMPLATECONF }} source {{ .WORKDIR }}/yocto/poky/oe-init-build-env {{ .YOCTO_BUILD_DIR }} && cd {{ .WORKDIR }}
   DEPLOY_DIR: "{{ .WORKDIR }}/build/tmp-musl/deploy/images/{{ .MACHINE }}"