Minor recipe cleanup (#83)

* Allow more cores in Pi4 kernel build Cleanup `10-mycroft` overlay Mark dashboard recipe as deprecated Remove extra gstreamer package installation Remove commented out package installation Reduce logging Remove invalid directory ownership check in ovos-shell recipe Move ovos-shell overlays to `/etc/skel` * Minor refactor and variable cleanup --------- Co-authored-by: Daniel McKnight <daniel@neon.ai>
NeonGeckoCom · Oct 5, 2023 · 7b172fb · 7b172fb
1 parent 6554407
commit 7b172fb
Show file tree

Hide file tree

Showing 17 changed files with 23 additions and 47 deletions.
diff --git a/base-rootfs-rpi4.yml b/base-rootfs-rpi4.yml
@@ -2,7 +2,6 @@
 {{- $firmware_version := or .firmware_version "master" -}}
 {{- $kernel_version := or .kernel_version "5.15.92-gecko+" -}}
 {{ $suite :=  or .suite "bookworm" }}
-{{- $image := or .image "ostree-base-image-rpi4" -}}
 {{- $build_cores := or .build_cores 4 -}}
 
 architecture: {{ $architecture }}
@@ -14,15 +13,12 @@ actions:
       architecture: {{ $architecture }}
       firmware_version: {{ $firmware_version }}
       suite: {{ $suite }}
-      image: {{ $image }}
-
   - action: recipe
     recipe: recipes/02-rpi4.yml
     variables:
       architecture: {{ $architecture }}
       firmware_version: {{ $firmware_version }}
       suite: {{ $suite }}
-      image: {{ $image }}
       kernel_version: {{ $kernel_version }}
 
   - action: recipe
@@ -31,7 +27,6 @@ actions:
       architecture: {{ $architecture }}
       firmware_version: {{ $firmware_version }}
       suite: {{ $suite }}
-      image: {{ $image }}
 
   - action: recipe
     recipe: recipes/03-get-raspi-packages.yml
@@ -42,7 +37,6 @@ actions:
       architecture: {{ $architecture }}
       firmware_version: {{ $firmware_version }}
       suite: {{ $suite }}
-      image: {{ $image }}
 
   - action: recipe
     recipe: recipes/05-setup-networking.yml
@@ -58,7 +52,6 @@ actions:
       architecture: {{ $architecture }}
       firmware_version: {{ $firmware_version }}
       suite: {{ $suite }}
-      image: {{ $image }}
 
   - action: recipe
     recipe: recipes/07-splash-screen.yml
@@ -71,7 +64,6 @@ actions:
       architecture: {{ $architecture }}
       firmware_version: {{ $firmware_version }}
       suite: {{ $suite }}
-      image: {{ $image }}
 
   - action: recipe
     recipe: recipes/09-swap.yml
@@ -82,17 +74,13 @@ actions:
     recipe: recipes/11-ovos-font.yml
     variables:
       architecture: {{ $architecture }}
-      firmware_version: {{ $firmware_version }}
-      suite: {{ $suite }}
-      image: {{ $image }}
 
   - action: recipe
     recipe: recipes/13-audio-devices.yml
     variables:
       architecture: {{ $architecture }}
       firmware_version: {{ $firmware_version }}
       suite: {{ $suite }}
-      image: {{ $image }}
 
   - action: recipe
     recipe: recipes/14-mount-firmware.yml

diff --git a/kernel_build/rpi4/build_kernel.sh b/kernel_build/rpi4/build_kernel.sh
@@ -62,7 +62,7 @@ for file in *.deb; do
 done
 cp "${kernel_dir}/"*.deb "${ROOT_PATH}/../../overlays/02-rpi4/var/tmp/" && echo "Copied deb installers to overlay"
 echo "Compressing ${kernel_dir}"
-zip -j1 -r "${kernel_dir}.zip" "${kernel_dir}" || exit 2
+zip -j -r "${kernel_dir}.zip" "${kernel_dir}" || exit 2
 rm -r "${kernel_dir}"
 rm linux-upstream_*
 rm ./*.deb
diff --git a/overlays/10-helper-commands/.mycroftrc → overlays/10-mycroft/opt/mycroft/.mycroftrc b/overlays/10-helper-commands/.mycroftrc → overlays/10-mycroft/opt/mycroft/.mycroftrc
diff --git a/...e/neon/.config/OpenVoiceOS/OvosShell.conf → ...c/skel/.config/OpenVoiceOS/OvosShell.conf b/...e/neon/.config/OpenVoiceOS/OvosShell.conf → ...c/skel/.config/OpenVoiceOS/OvosShell.conf
diff --git a/...-shell/home/neon/.config/qt5ct/qt5ct.conf → ...s-shell/etc/skel/.config/qt5ct/qt5ct.conf b/...-shell/home/neon/.config/qt5ct/qt5ct.conf → ...s-shell/etc/skel/.config/qt5ct/qt5ct.conf
diff --git a/...eon/.config/qtquickcontrols2material.conf → ...kel/.config/qtquickcontrols2material.conf b/...eon/.config/qtquickcontrols2material.conf → ...kel/.config/qtquickcontrols2material.conf
diff --git a/...l/share/OVOS/ColorSchemes/neon_green.json → ...l/share/OVOS/ColorSchemes/neon_green.json b/...l/share/OVOS/ColorSchemes/neon_green.json → ...l/share/OVOS/ColorSchemes/neon_green.json
diff --git a/.../share/OVOS/ColorSchemes/neon_orange.json → .../share/OVOS/ColorSchemes/neon_orange.json b/.../share/OVOS/ColorSchemes/neon_orange.json → .../share/OVOS/ColorSchemes/neon_orange.json
diff --git a/.../lib/systemd/user/ovos-dashboard@.service → .../lib/systemd/user/ovos-dashboard@.service b/.../lib/systemd/user/ovos-dashboard@.service → .../lib/systemd/user/ovos-dashboard@.service
diff --git a/recipes/02-rpi4.yml b/recipes/02-rpi4.yml
@@ -69,16 +69,6 @@ actions:
 #    chroot: true
 #    script: ../scripts/02-set_root_fs.sh
 
-  - action: run
-    description: Define Default Groups
-    chroot: true
-    command: |
-      groupadd gpio
-      groupadd pulse
-      groupadd pulse-access
-      groupadd i2c
-      groupadd ssl-cert
-
   - action: run
     description: Set hostname
     chroot: true

diff --git a/recipes/03-base-packages.yml b/recipes/03-base-packages.yml
@@ -5,6 +5,16 @@
 architecture: {{ $architecture }}
 
 actions:
+  - action: run
+    description: Define Default Groups
+    chroot: true
+    command: |
+      groupadd gpio
+      groupadd pulse
+      groupadd pulse-access
+      groupadd i2c
+      groupadd ssl-cert
+
   - action: apt
     description: Basic packages
     packages:
@@ -52,12 +62,12 @@ actions:
       - plasma-pa
       - plasma-nm
 
-  - action: apt
-    description: GStreamer packages
-    packages:
-      - gstreamer1.0-plugins-base
-      - gstreamer1.0-plugins-good
-      - gstreamer1.0-plugins-bad
-      - gstreamer1.0-plugins-ugly
-      - gstreamer1.0-libav
-      - libqt5multimedia5-plugins
+#  - action: apt
+#    description: GStreamer packages
+#    packages:
+#      - gstreamer1.0-plugins-base
+#      - gstreamer1.0-plugins-good
+#      - gstreamer1.0-plugins-bad
+#      - gstreamer1.0-plugins-ugly
+#      - gstreamer1.0-libav
+#      - libqt5multimedia5-plugins
diff --git a/recipes/06-libcamera.yml b/recipes/06-libcamera.yml
@@ -14,24 +14,20 @@ actions:
       - libtiff5-dev
       - python3-yaml
       - python3-ply
-#      - python3-jinja2
       - libglib2.0-dev
       - libssl-dev
       - meson
-#      - ninja-build
       - pkg-config
       - qtbase5-dev
       - libqt5core5a
       - libqt5gui5
       - libqt5widgets5
-#      - cmake
       - libboost-program-options-dev
       - libdrm-dev
       - libexif-dev
       - libpng-dev
       - libegl1-mesa-dev
       - v4l-utils
-#      - apt-transport-https
       - software-properties-common
       - libcamera-dev
       - libepoxy-dev

diff --git a/recipes/10-mycroft.yml b/recipes/10-mycroft.yml
@@ -5,11 +5,6 @@
 architecture: {{ $architecture }}
 
 actions:
-  - action: overlay
-    description: Mycroft helper commands overlay
-    source: ../overlays/10-helper-commands
-    destination: /opt/mycroft/
-
   - action: overlay
     description: OVOS specific overlay
     source: ../overlays/10-mycroft

diff --git a/recipes/11-ovos-font.yml b/recipes/11-ovos-font.yml
@@ -1,6 +1,4 @@
 {{- $architecture := or .architecture "arm64" -}}
-{{- $firmware_version := or .firmware_version "master" -}}
-{{ $suite :=  or .suite "focal" }}
 
 architecture: {{ $architecture }}
 
@@ -28,4 +26,4 @@ actions:
   - action: run
     description: Update font cache
     chroot: true
-    command: fc-cache -f -v
+    command: fc-cache -f
diff --git a/recipes/42-install-ovos-dashboard.yml → recipes/999-install-ovos-dashboard.yml b/recipes/42-install-ovos-dashboard.yml → recipes/999-install-ovos-dashboard.yml
@@ -7,10 +7,10 @@ architecture: {{ $architecture }}
 actions:
   - action: overlay
     description: OVOS Dash Overlay
-    source: ../overlays/42-ovos-dashboard
+    source: ../overlays/999-ovos-dashboard
     destination: /
   - action: run
     description: Install OVOS Dashboard
     chroot: true
-    script: ../scripts/42-ovos-dashboard.sh
+    script: ../scripts/999-ovos-dashboard.sh
     # TODO: Refactor script and overlay to handle a configured username
diff --git a/scripts/29-build-ovos-shell.sh b/scripts/29-build-ovos-shell.sh
@@ -89,6 +89,5 @@ rm /usr/share/OVOS/ColorSchemes/sunset_scheme.json
 
 # Permission overlay files and enable gui service
 chmod -R ugo+x /usr/bin
-chown -R neon:neon /home/neon
 systemctl enable gui-shell
 echo "GUI Embedded Shell Configured"
diff --git a/scripts/42-ovos-dashboard.sh → scripts/999-ovos-dashboard.sh b/scripts/42-ovos-dashboard.sh → scripts/999-ovos-dashboard.sh