Merge pull request #997 from creas002/aarch64-support

Modified tools & dependancies
jekhokie · Jul 5, 2024 · 76e46bc · 76e46bc
2 parents f93c5f4 + 23e0959
commit 76e46bc
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 4 deletions.
diff --git a/ansible/roles/common/tasks/dependencies.yml b/ansible/roles/common/tasks/dependencies.yml
@@ -59,6 +59,12 @@
       - gfortran
       - libopencv-dev
       - python3-opencv
+      - libc6:armhf
+      - libstdc++6:armhf
+      - libasound2:armhf
+      - libx11-6:armhf
+      - libxft-dev:armhf
+      - libxft2:armhf
 
 
 #This was included because, for a period of time, SatDump didn't have dependencies included in the .deb file
@@ -163,23 +169,23 @@
     executable: pip3
   when: raspbian_version.stdout == 'bullseye'
 
-- name: Installing predict on PCs
+- name: Installing predict on PCs (amd64)
   become: yes
   apt:
     deb: "{{ noaa_home }}/software/predict_2.2.3-4-b2_amd64.deb"
     state: present
     update_cache: no
   when: system_architecture == 'amd64'
 
-- name: Installing predict on Raspberry Pi
+- name: Installing predict on Raspberry Pi (armhf)
   become: yes
   apt:
     deb: "{{ noaa_home }}/software/predict_2.2.5+dfsg.1-1_armhf.deb"
     state: present
     update_cache: no
   when: system_architecture == 'armhf'
 
-- name: Installing predict on Raspberry Pi
+- name: Installing predict on Raspberry Pi (arm64)
   become: yes
   apt:
     deb: "{{ noaa_home }}/software/predict_2.2.5+dfsg.1-1_arm64.deb"
@@ -194,6 +200,13 @@
     state: present
     update_cache: no
 
+- name: Create WXtoImg symbolic link for ARM64 architecture
+  file:
+    src: "/home/{{ target_user }}/raspberry-noaa-v2/software/wxtoimg-armhf-2.11.2-beta.deb"
+    dest: "/home/{{ target_user }}/raspberry-noaa-v2/software/wxtoimg-arm64-2.11.2-beta.deb"
+    state: link
+  when: system_architecture == 'arm64'
+
 - name: Installing WXtoImg
   become: yes
   apt:

diff --git a/ansible/roles/common/tasks/sdr.yml b/ansible/roles/common/tasks/sdr.yml
@@ -44,7 +44,7 @@
   when: rtlsdr.changed
 
 - name: generate build system for RTL-SDR software
-  command: cmake ../ -DINSTALL_UDEV_RULES=ON -DDETACH_KERNEL_DRIVER=ON
+  command: cmake ../ -DDETACH_KERNEL_DRIVER=ON
   args:
     chdir: /tmp/rtl-sdr/build
     creates: /tmp/rtl-sdr/build/Makefile

diff --git a/ansible/roles/common/tasks/tools.yml b/ansible/roles/common/tasks/tools.yml
@@ -20,6 +20,33 @@
     special_time: reboot
     job: "{{ noaa_home }}/scripts/schedule.sh"
 
+- name: Set permissions on set_os_config_kernel8.sh
+  file:
+    path: "/home/{{ target_user }}/raspberry-noaa-v2/scripts/tools/set_os_config_kernel8.sh"
+    state: file
+    owner: "{{ target_user }}"
+    group: "{{ target_user }}"
+    mode: 0755
+
+- name: Set permissions on scratch_perms.sh
+  file:
+    path: "/home/{{ target_user }}/raspberry-noaa-v2/scripts/tools/scratch_perms.sh"
+    state: file
+    owner: "{{ target_user }}"
+    group: "{{ target_user }}"
+    mode: 0755
+
+- name: Set kernel to kernel8.img
+  become: yes
+  command: "/home/{{ target_user }}/raspberry-noaa-v2/scripts/tools/set_os_config_kernel8.sh"
+  when: system_architecture == 'arm64'
+
+- name: create Scratch Perm fix cron job @ reboot
+  cron:
+    name: Correct /run/user/uid perms after reboot
+    special_time: reboot
+    job: "{{ noaa_home }}/scripts/tools/scratch_perms.sh"
+
 - name: create database
   shell: "/usr/bin/sqlite3 {{ noaa_home }}/db/panel.db < {{ noaa_home }}/db_migrations/00_seed_schema.sql"
   args: