Merge pull request #84 from AlmaLinux/a10

Adjust packages and Bluetooth fix

Author: metalefty

.github/workflows/build-rpi.yml

@@ -70,8 +70,8 @@ jobs:
     runs-on: ubuntu-24.04
     permissions:
       actions: write
-    # Skip if 8 and GPT or Kitten and MBR
-    if: ${{ ( inputs.gpt && inputs.version_major != '8' || inputs.mbr && inputs.version_major != '10-kitten' ) && ( inputs.console || inputs.gnome ) && ( inputs.mbr || inputs.gpt ) }}
+    # Skip if 8-GPT, 10-Kitten-MBR, 10-MBR
+    if: ${{ ( (inputs.gpt && inputs.version_major != '8') || (inputs.mbr && inputs.version_major != '10-kitten' && inputs.version_major != '10')) && (inputs.console || inputs.gnome) && (inputs.mbr || inputs.gpt) }}
     strategy:
       fail-fast: false
       matrix:
@@ -103,7 +103,7 @@ jobs:
         aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         aws_region: ${{ secrets.AWS_REGION }}
         # TODO: EC2_AMI_ID_AL9 (9-th AMI) should be used for Kitten 10 until appliance-tools isn't available
-        ec2_ami_id: ${{ secrets[format('EC2_AMI_ID_AL{0}', ( inputs.version_major == '10-kitten' && '9' || inputs.version_major ))] }}
+        ec2_ami_id: ${{ secrets[format('EC2_AMI_ID_AL{0}', ( ( inputs.version_major == '10-kitten' || inputs.version_major == '10' ) && '9' || inputs.version_major ))] }}
         ec2_subnet_id: ${{ secrets.EC2_SUBNET_ID}}
         ec2_security_group_id: ${{ secrets.EC2_SECURITY_GROUP_ID }}
 

README.md

@@ -10,7 +10,7 @@ Images made possible by the incredible work contributed by the immortal [Pablo G
 
 ### Tested hardware
 
-|Model |8|9|Kitten 10||
+|Model |8|9|Kitten 10|10|
 |-|-|-|-|-|
 |Pi 5|✓|✓|✓|✓|
 |Pi 500|?|?|?|?|
@@ -49,6 +49,9 @@ Full guide for AlmaLinux on Raspberry Pi is available here: https://wiki.almalin
 
 ## Changelog
 
+### 2025-05-30
+- Fix Bluetooth was not working on AlmaLinux 9, 10, Kitten 10 GPT images
+
 ### 2025-05-28
 - Add AlmaLinux 10
 

kickstart/AlmaLinux-10-RaspberryPi-console-gpt.aarch64.ks

@@ -27,11 +27,9 @@ part / --fstype=ext4 --size=2400 --label=rootfs --ondisk=sda
 # Package setup
 %packages
 @core
--caribou*
 -gnome-shell-browser-plugin
 -java-21-*
 -kernel-*
--python*-caribou*
 NetworkManager-wifi
 almalinux-release-raspberrypi
 bluez

kickstart/AlmaLinux-10-RaspberryPi-gnome-gpt.aarch64.ks

@@ -34,7 +34,6 @@ dejavu-sans-mono-fonts
 dejavu-serif-fonts
 #aajohan-comfortaa-fonts
 #abattis-cantarell-fonts
--caribou*
 -gnome-shell-browser-plugin
 -java-21-*
 -kernel-*
@@ -122,7 +121,7 @@ EOF
 
 # Kernel command line string
 cat > /boot/cmdline.txt << EOF
-console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait
+console=serial0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait
 EOF
 
 # Create and initialize swapfile

kickstart/AlmaLinux-8-RaspberryPi-console-mbr.aarch64.ks

@@ -27,13 +27,11 @@ part / --asprimary --fstype=ext4 --size=3000 --label=rootfs --ondisk=sda
 # Package setup
 %packages
 @core
--caribou*
 -gnome-shell-browser-plugin
 -java-1.6.0-*
 -java-1.7.0-*
 -java-11-*
--kernel-tools
--python*-caribou*
+-kernel-*
 -iwl1000-firmware
 -iwl100-firmware
 -iwl105-firmware
@@ -60,8 +58,8 @@ cloud-utils-growpart
 e2fsprogs
 net-tools
 linux-firmware-raspberrypi
-raspberrypi-userland
 raspberrypi-sys-mods
+raspberrypi-userland
 raspberrypi2-firmware
 raspberrypi2-kernel4
 raspberrypi2-kernel4-tools

kickstart/AlmaLinux-8-RaspberryPi-gnome-mbr.aarch64.ks

@@ -34,13 +34,11 @@ dejavu-sans-mono-fonts
 dejavu-serif-fonts
 aajohan-comfortaa-fonts
 abattis-cantarell-fonts
--caribou*
 -gnome-shell-browser-plugin
 -java-1.6.0-*
 -java-1.7.0-*
 -java-11-*
--kernel-tools
--python*-caribou*
+-kernel-*
 -iwl1000-firmware
 -iwl100-firmware
 -iwl105-firmware
@@ -59,8 +57,8 @@ abattis-cantarell-fonts
 -iwl7260-firmware
 NetworkManager-wifi
 almalinux-release-raspberrypi
-bluez
 binutils
+bluez
 chrony
 cloud-init
 cloud-utils-growpart

kickstart/AlmaLinux-9-RaspberryPi-console-gpt.aarch64.ks

@@ -27,13 +27,12 @@ part / --fstype=ext4 --size=2400 --label=rootfs --ondisk=sda
 # Package setup
 %packages
 @core
--caribou*
 -gnome-shell-browser-plugin
--java-1.6.0-*
--java-1.7.0-*
+-java-1.8.0-*
 -java-11-*
+-java-17-*
+-java-21-*
 -kernel-tools
--python*-caribou*
 NetworkManager-wifi
 almalinux-release-raspberrypi
 bluez

kickstart/AlmaLinux-9-RaspberryPi-console-mbr.aarch64.ks

@@ -27,13 +27,12 @@ part / --asprimary --fstype=ext4 --size=2400 --label=rootfs --ondisk=sda
 # Package setup
 %packages
 @core
--caribou*
 -gnome-shell-browser-plugin
--java-1.6.0-*
--java-1.7.0-*
+-java-1.8.0-*
 -java-11-*
+-java-17-*
+-java-21-*
 -kernel-tools
--python*-caribou*
 NetworkManager-wifi
 almalinux-release-raspberrypi
 bluez

kickstart/AlmaLinux-9-RaspberryPi-gnome-gpt.aarch64.ks

@@ -34,13 +34,12 @@ dejavu-sans-mono-fonts
 dejavu-serif-fonts
 aajohan-comfortaa-fonts
 abattis-cantarell-fonts
--caribou*
 -gnome-shell-browser-plugin
--java-1.6.0-*
--java-1.7.0-*
+-java-1.8.0-*
 -java-11-*
+-java-17-*
+-java-21-*
 -kernel-tools
--python*-caribou*
 NetworkManager-wifi
 almalinux-release-raspberrypi
 bluez
@@ -122,7 +121,7 @@ EOF
 
 # Kernel command line string
 cat > /boot/cmdline.txt << EOF
-console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait
+console=serial0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait
 EOF
 
 # Create and initialize swapfile

kickstart/AlmaLinux-9-RaspberryPi-gnome-mbr.aarch64.ks

@@ -34,13 +34,12 @@ dejavu-sans-mono-fonts
 dejavu-serif-fonts
 aajohan-comfortaa-fonts
 abattis-cantarell-fonts
--caribou*
 -gnome-shell-browser-plugin
--java-1.6.0-*
--java-1.7.0-*
+-java-1.8.0-*
 -java-11-*
+-java-17-*
+-java-21-*
 -kernel-tools
--python*-caribou*
 NetworkManager-wifi
 almalinux-release-raspberrypi
 bluez