more fixes for ubuntu 22.04

orgua · Jun 3, 2023 · 1b19f2b · 1b19f2b
1 parent 2634329
commit 1b19f2b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/deploy/bootstrap.yml b/deploy/bootstrap.yml
@@ -64,6 +64,7 @@
         groups: sudo
         append: true
         generate_ssh_key: true
+        # password: "{{ default_password }}"
 
     - name: Enable and setup password-less ssh-login via authorized key from local file (prereq is run of ssh-keygen)
       ansible.posix.authorized_key:

diff --git a/deploy/roles/maintained/tasks/main.yml b/deploy/roles/maintained/tasks/main.yml
@@ -29,18 +29,19 @@
     regexp: "#?deb .*.rcn-ee.*.focal.*$"
     line: "deb [arch=armhf signed-by=/usr/share/keyrings/rcn-ee-archive-keyring.gpg] http://repos.rcn-ee.com/ubuntu/ focal main"
     state: present
-- name: APT - update cache
+- name: APT - update cache & install hardcoded kernel
   ansible.builtin.apt:
+    name: "linux-image-4.19.94-ti-r73"
+    state: present
     update_cache: true
 
 - name: "SCRIPT - Switch to newest release of Kernel Branch {{ default_kernel_branch }}"
   ansible.builtin.command: '/opt/scripts/tools/update_kernel.sh --{{ default_kernel_branch }}'
-  when: update_kernel | bool
+  when: false # update_kernel | bool
   changed_when: true
   failed_when: false # allow to fail, newest 4.19 kernel has currently no matching seeed-module
   # this was failing for ubuntu 22.04 -> apt install linux-image-4.19 ... .280-bone76 (with -bone, without -rt-)
-  # -> added back focal-repo (see above)
-
+  # -> added back focal-repo (see above) but it still fails to downgrade -> disable for now and hardcode (above)
 
 - name: Grow root partition to drive-size
   ansible.builtin.command: '/opt/scripts/tools/grow_partition.sh'

diff --git a/deploy/roles/sheep/tasks/toolchain_kernel.yml b/deploy/roles/sheep/tasks/toolchain_kernel.yml
@@ -9,8 +9,7 @@
   ansible.builtin.apt:
     name:
       [
-        "linux-headers-{{ kernelrelease.stdout.strip() }}", # TODO: done by bootstrap / maintenance
-        "linux-firmware", # TODO: is already there
+        "linux-headers-{{ kernelrelease.stdout.strip() }}", # redundancy, 1st done by maintenance
         "dkms",
       ]
     state: present

diff --git a/software/kernel-module/src/Makefile b/software/kernel-module/src/Makefile
@@ -30,4 +30,5 @@ clean:
 
 install: all
 	@echo 'Installing kernel module'
+	@sudo mkdir /lib/modules/$(KVERSION)/extra/
 	@sudo cp $(TARGET).ko /lib/modules/$(KVERSION)/extra/