README.md

@@ -1,8 +1,6 @@
 # sargo-temp
 
-<del>Temporary fixes that make Mobian work on sargo.</del>
-
-Current status of the Mobian port to the Pixel 3a. This will be moved to the Debian wiki once I get someone to approve my account. xD
+Temporary fixes that make Mobian work on sargo.
 
 ## If you've previously used the instructions from this repo
 
@@ -10,8 +8,9 @@ If you've previously used the instructions from this repo, you should do the fol
 
 - Migrate to the official Mobian kernel packages so you get updates without manually compiling new kernel versions all the time
 - Apply my workaround script to get rid of workarounds that are now obsolete
+- Note that call audio is still missing in Mobian for the Pixel 3a, for now you can just keep using the audio workarounds from here until the Mobian Project has a better solution
 
-### Migrating to the official Mobian kernel package: If you've previously used a self-compiled kernel
+### Migrating to the official Mobian kernel package
 
 If you have previously used a self-compiled kernel, you might want to switch to the kernel provided by the Mobian project:
 
@@ -21,11 +20,11 @@ apt install sdm670-support
 reboot
 ```
 
-This should also be far more stable than the last version that I pushed to my temporary repo, as it is much newer. :D
+This should also be far more stable than the last version that I pushed to my temporary repo. :D
 
 ### Build Image
 
-NOTE: The image for sargo is now available from mobian.org, you will no longer have to build it yourself.
+The sdm670-specific kernel is now available from the Mobian repos, it is no longer necessarily to build it yourself.
 
 The image can now be built as follows:
 
@@ -38,6 +37,8 @@ git checkout wip/tiol/sdm670images
 
 Do not use `myverysecretlukspassphrase` as your passphrase and replace it, obviously. :D
 
+For now you'll still need the workarounds in this repo to get call audio to work.
+
 Please note that the image will contain SSH Host Keys, please do not share it for security reasons.
 
 ### Flash image
@@ -91,7 +92,7 @@ Various issues can be found on Salsa: https://salsa.debian.org/Mobian-team/devic
 
 To Do:
 
-none, we got there :)
+- Wait for the Merge Request that adds the buld to CI to get merged
 
 Done:
 
@@ -108,7 +109,6 @@ Done:
 - Wireplumber config
   - https://salsa.debian.org/DebianOnMobile-team/qcom-phone-utils/-/merge_requests/6
 - sdm670 Kernel
-- Wait for the Merge Request that adds the buld to CI to get merged
 
 For those I will remove the workarounds once the changes are in the Mobian repo
 

ansible/audio.yml

@@ -12,8 +12,7 @@
 
     - name: "Download https://gitlab.com/sdm670-mainline/alsa-ucm-conf/-/archive/master/alsa-ucm-conf-master.tar.gz"
       ansible.builtin.get_url:
-        #url: "https://gitlab.com/sdm670-mainline/alsa-ucm-conf/-/archive/master/alsa-ucm-conf-master.tar.gz"
-        url: "https://gitlab.com/a-wai/alsa-ucm-conf-sdm670/-/archive/master/alsa-ucm-conf-master.tar.gz"
+        url: "https://gitlab.com/sdm670-mainline/alsa-ucm-conf/-/archive/master/alsa-ucm-conf-master.tar.gz"
         dest: /root/alsa-ucm-conf-master.tar.gz
         force: true # overwrite if the already have a previous version
         mode: '0440'
@@ -62,7 +61,86 @@
           - libtinyalsa      # package will have to be renamed for the repos
           - libtinyalsa-dev
           - tinyalsa
-          - q6voiced
-          - libtinyalsa2
-          - libtinyalsa2-dev
         state: absent
+
+    ### Call Audio ###
+
+    - name: "Install dependencies"
+      ansible.builtin.apt:
+        pkg:
+          - gcc
+          - git
+          - libdbus-1-dev
+          - libdbus-cpp-dev
+          - make
+          - devscripts
+          - doxygen
+          - graphviz
+        state: present
+        update_cache: true
+
+    - name: "Add directory that the repos get cloned into"
+      ansible.builtin.file:
+        path: "/opt/repos"
+        state: "directory"
+        owner: nobody
+        group: nogroup
+
+    - name: "chown repo directories to nobody:nogroup"
+      ansible.builtin.file:
+        path: "/opt/repos/"
+        recurse: true
+        owner: nobody
+        group: nogroup
+
+    - name: "Remove repos that already exist"
+      ansible.builtin.file:
+        path: "/opt/repos/{{ item }}"
+        state: "absent"
+        owner: nobody
+        group: nogroup
+      loop:
+        - "tinyalsa"
+        - "q6voiced"
+
+    - name: "Clone tinyalsa repo"
+      ansible.builtin.git:
+        repo: 'https://salsa.debian.org/erebion/tinyalsa.git'
+        dest: /opt/repos/tinyalsa
+        version: 8ebe2c17c1ec8a933873cefec66c90744a4f7181
+      become_user: nobody
+      delay: 2
+      retries: 20
+
+    - name: "Clone q6voiced repo"
+      ansible.builtin.git:
+        repo: 'https://salsa.debian.org/erebion/q6voiced.git'
+        dest: /opt/repos/q6voiced
+        version: d9acbd1f5120c57586d808d60e9ccf425ae5bee0
+      become_user: nobody
+      delay: 2
+      retries: 20
+
+    - name: "Build Debian packages for tinyalsa"
+      ansible.builtin.shell:
+        cmd: debuild -i -us -uc -b
+        chdir: "/opt/repos/tinyalsa/"
+      become_user: nobody
+
+    - name: "Install tinyalsa"
+      ansible.builtin.apt:
+        deb: "/opt/repos/{{ item }}"
+      loop:
+        - "libtinyalsa2_2.0.0+git20240621-1_arm64.deb"
+        - "libtinyalsa2-dev_2.0.0+git20240621-1_arm64.deb"
+        - "tinyalsa_2.0.0+git20240621-1_arm64.deb"
+
+    - name: "Build Debian package for q6voiced"
+      ansible.builtin.shell:
+        cmd: debuild -i -us -uc -b
+        chdir: "/opt/repos/q6voiced/"
+      become_user: nobody
+
+    - name: "Install tinyalsa and q6voiced"
+      ansible.builtin.apt:
+        deb: "/opt/repos/q6voiced_0.0.0+git20240607-1_arm64.deb"