Update status of the project, throw away outdated instructions

IMAGE.md

@@ -1,65 +0,0 @@
-# Building a Mobian Image for the Pixel 3a
-
-## Prerequisites
-
-Cloning the repositories
-
-Kernel: https://salsa.debian.org/erebion/sdm-670-linux
-
-Mobian Recipes does not have the changes merged, as the kernel is not yet part of Mobian: https://salsa.debian.org/Mobian-team/mobian-recipes/-/merge_requests/113
-
-Take my temporary fork of Mobian Recipes instead, for now: https://salsa.debian.org/erebion/mobian-recipes/-/tree/erebion/sargo-build?ref_type=heads
-
-Make sure you check out my branch `sargo-build` which includes a couple of workarounds for changes which are not yet in the repos, but will be soon.
-
-The fork will be maintained until there are official Mobian images for the Pixel 3a.
-
-## Compiling the Kernel
-
-First `cd` to the kernel repo.
-
-Then:
-
-```bash
-gbp pq import # import the patches to a patch-queue branch with the patches applied
-DEB_HOST_ARCH=arm64 dpkg-buildpackage -a arm64 -us -uc -rfakeroot -b -Pcross,nocheck 
-```
-
-## Building the Image
-
-- Apparently you need to have `android-sdk-libsparse-utils` and, `cryptsetup` for encrypted images, installed, not sure what else might be required
-- First `cd` to the Mobian repo
-- Copy the kernel deb to `devices/qcom/packages`, so that it gets installed onta the image we are about to build.
-- Add your SSH authorized keys file to `overlays/ssh/authorized_keys`, important so you can log in later
-- Make sure the internet connection is stable, as the build fails if it cannot download all packages successfully.
-
-Now build the image:
-
-```bash
-./build.sh -t qcom -s -u mobian -c -R myverysecretlukspassphrase | tee mobian-build.log # -s for SSH, which we need later
-```
-
-Do not use `myverysecretlukspassphrase` as your passphrase and replace it, obviously. :D
-
-(If you replace `mobian` with your own username, you will have to use that one for SSH later, of course)
-
-Wait. It takes a while. 
-
-Note: Your SSH Host Keys seemingly get generated while building the image, please don't give your image to anyone else.
-To Do: Verify whether those keys really end up in the image.
-
-## Flash to device:
-
-```
-fastboot --set-active --slot a
-fastboot flash boot_a mobian-qcom-phosh-20240614.boot-sargo.img
-fastboot flash userdata mobian-qcom-phosh-20240614.rootfs.img 
-fastboot oem uart enable # currently does not seem to boot without, probably because the kernel config enables SSH for debugging right now
-fastboot erase dtbo
-```
-
-Boot up the device. Connect it via USB.
-
-## Temporary manual changes
-
-The steps are documented in `README.md` in this repo.

README.md

@@ -2,11 +2,42 @@
 
 Temporary fixes that make Mobian work on sargo.
 
-## What to do
+## If you've previously used the instructions from this repo
+
+If you've previously used the instructions from this repo, you should do the following:
+
+- 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 have previously used a self-compiled kernel, you might want to switch to the kernel provided by the Mobian project:
+
+```
+apt update
+apt install sdm670-support
+reboot
+```
+
+This should also be far more stable than the last version that I pushed to my temporary repo. :D
 
 ### Build Image
 
-Instructions can be found in IMAGE.md in this repo.
+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:
+
+```
+git clone https://salsa.debian.org/Mobian-team/mobian-recipes.git
+cd mobian-recipes
+git checkout wip/tiol/sdm670images
+./build.sh -t sdm670 -s -u mobian -c -R myverysecretlukspassphrase | tee mobian-build.log # -s for SSH, which we need later
+```
+
+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.
 
 ### Flash image
 
@@ -38,11 +69,11 @@ Note:
 
 - You might have to switch SIM slots if your SIM card is not recognised.
   - Command: `mmcli -m any --set-primary-sim-slot=1`, options are `1` or `2`
-- The kernel does not get updates from the repos yet, so watch the git repo to find out when there are new releases so you can compile it again and install the `.deb` file.
-  - Feed: https://salsa.debian.org/erebion/sdm-670-linux/-/tags?format=atom
 - Watch the RSS feed for this repo to learn when there is something new:
   - Feed: https://git.erebion.eu/forgejo/erebion/sargo-temp.rss
 
+## What to do
+
 ## Project Status
 
 ### Issues on Debian Salsa
@@ -53,16 +84,13 @@ Various issues can be found on Salsa: https://salsa.debian.org/Mobian-team/devic
 
 - Make installer images work on this device
 - Have droid-juicer run on installer images
-- Create an ITP for `tinyalsa` and `q6voiced` (check) and get both into the repos (wip, use the workarounds from this repo to get working call audio for now)
+- Solve call audio (this repo contains a script that builds packages of Tinyalsa and q6voiced and installs those, but this is not the solution that Mobian will adopt)
-  - https://salsa.debian.org/Mobian-team/devices/kernels/qcom-linux/-/issues/2
-  - ITP for Tinyalsa: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1079473
-  - ITP for q6voiced: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1080483
-- Combine SDM670 kernel patches with those in the Mobian qcom kernel
-  - Patches are already being upstreamed by the sdm670-linux project, maybe that's already done before I start working on it xD
 
 #### Issues To Solve To Get Official Mobian Images
 
-- Combining SDM670 kernel patches with the Mobian qcom kernel (To Do List entry above, **help wanted**)
+To Do:
+
+- Wait for the Merge Request that adds the buld to CI to get merged
 
 Done:
 
@@ -78,13 +106,13 @@ Done:
   - upstream: https://source.puri.sm/Librem5/feedbackd/-/merge_requests/139
 - Wireplumber config
   - https://salsa.debian.org/DebianOnMobile-team/qcom-phone-utils/-/merge_requests/6
+- sdm670 Kernel
 
 For those I will remove the workarounds once the changes are in the Mobian repo
 
 #### Misc Issues
 
 - ALSA config for the device has not been upstreamed yet (can be added using the Playbook in this repo)
-- Bug in Pipewire that causes issues with the camera: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/4227
 - Some people have issues connecting to 5 GHz wifi and/or dual 2.4 GHz/5 GHz wifi, while for others this works perfectly fine
   - https://salsa.debian.org/Mobian-team/devices/kernels/qcom-linux/-/issues/6
   - Can be worked around by forcing the phone to only use the 2.4 GHz band, for example using `nmtui`, the network settings of GNOME/Phosh are bit too simplistic for that
@@ -92,14 +120,13 @@ For those I will remove the workarounds once the changes are in the Mobian repo
   - https://gitlab.freedesktop.org/pipewire/wireplumber/-/merge_requests/670 <- someone is working on that
 - Currently camera is fixed to the closest focus with no way to set photos, so you can only take macro photos :D
 
-(This is a non-exhaustive list)
+Solved:
 
-#### Low Priority
+- Bug in Pipewire that causes issues with the camera: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/4227
-
-- fix udev rule for the Bluetooth workaround in this repo
 - create/find script/tool that brings up Bluetooth & then package it
   - https://salsa.debian.org/Mobian-team/devices/kernels/qcom-linux/-/issues/5
-  - for now this repo contains a simple script specific to this device and a udev rule, but something is wrong with the udev rule. Run `/opt/bluetooth-mac.bash` to get Bluetooth working, repeat after reboots
+
+(This is a non-exhaustive list)
 
 ### This Works
 
@@ -120,12 +147,12 @@ For those I will remove the workarounds once the changes are in the Mobian repo
 - full disk encryption
 - eSIM (provisioning tool not yet packaged and has to be compiled and installed manually)
 - audio (ALSA config not packaged, but can be manually added using the playbook in this repo)
-- camera (currently only one camera works at a time, image quality is still not anywhere near Android, driver is work in progress, udev rule required)
+- camera (currently only one camera works at a time, image quality is still not anywhere near Android, driver is work in progress)
 
 ### This Has An Unknown Status
 
-- Fingerprint Sensor
+- Fingerprint Sensor (idk?)
-- NFC (should work, does so on pmOS)
+- NFC (should work, does so on pmOS, but untested)
 
 ### This Does Not Work Yet (Soon™)
 
@@ -142,7 +169,6 @@ For those I will remove the workarounds once the changes are in the Mobian repo
 
 ### The Sources (Use The Source, Luke)
 
-- My efforts of packaging a device-specific kernel: https://salsa.debian.org/erebion/sdm-670-linux (which can be used for now as patches are not yet in upstream Linux)
 - `mobian-recipes`, which is used to build images: https://salsa.debian.org/Mobian-team/mobian-recipes
 - `droid-juicer`, which retrieves some important files, such as firmware, from some partitions: https://gitlab.com/mobian1/droid-juicer
 - postmarketOS wiki: https://wiki.postmarketos.org (lovely folks, thanks for sharing everything you found out the hard way :D)