Updates for astro and cosmo builds

astroslide.yaml

@@ -66,6 +66,11 @@ actions:
     description: depmod kernel modules (needs /lib/modules/N.N.N)
     command: depmod -a 4.14.186
 
+{{ if eq $variant "kde-plasma" }}
+  - action: recipe
+    recipe: variants/kde-plasma.yaml
+{{ end }}
+
   - action: run
     chroot: true
     description: Removing /var/log/journal to avoid persisant journaling

cosmocom.yaml

@@ -24,8 +24,8 @@ actions:
     packages:
 #      - bluebinder
 #      - media-hub
-#      - gemian-system
+      - gemian-system
-#      - lxc-android
+      - lxc-android
       - lxc
       - debhelper
       - lxcfs
@@ -35,14 +35,21 @@ actions:
       - cosmo-linux-kernel
       - devscripts
       - build-essential
+      - cmake
+      - network-manager
       - kexec-tools
-      - pulseaudio-module-droid-old
+      - pulseaudio-modules-droid-old
 
   - action: run
-    description: Generate /usr/share/kernel/linux-boot.img for Cosmo Communicator
+    description: Generate /usr/share/kernel/cosmocom-boot.img for Cosmo Communicator
     chroot: true
     command: /usr/sbin/update-gemian-boot-image cosmocom
 
+  - action: run
+    description: Generate /usr/share/kernel/cosmocom-boot-lvm-gemian-bookworm.img for Astro Slide
+    chroot: true
+    command: /usr/sbin/update-gemian-boot-image cosmocom gemian-bookworm
+
   - action: run
     chroot: true
     command: echo cosmocom > /etc/hostname
@@ -61,36 +68,11 @@ actions:
     description: depmod kernel modules
     command: depmod -a 4.4.146
 
-{{ if eq $variant "lxqt" }}
-#  - action: recipe
-#    recipe: variants/lxqt.yaml
-{{ end }}
-
-{{ if eq $variant "mate" }}
-#  - action: apt
-#    description: Installing MATE desktop environment
-#    packages:
-#      - lxdm
-#      - mate-desktop-environment
-#      - xserver-xorg
-#      - xserver-xorg-input-evdev
-{{ end }}
-
 {{ if eq $variant "kde-plasma" }}
-#  - action: recipe
+  - action: recipe
-#    recipe: variants/kde-plasma.yaml
+    recipe: variants/kde-plasma.yaml
 {{ end }}
 
-#  - action: run
-#    chroot: true
-#    description: Fix default DPI
-#    command: sed -e "s@\\[server\\]@[server]\\narg=/usr/bin/Xorg -dpi 192\n@" -i /etc/lxdm/lxdm.conf
-
-  - action: run
-    chroot: true
-    description: Removing xserver-xorg-input-libinput as it does not work with touchscreen yet
-    command: apt remove xserver-xorg-input-libinput
-
   - action: run
     chroot: true
     description: Removing /var/log/journal to avoid persisant journaling

geminipda.yaml

@@ -20,7 +20,7 @@ actions:
       - gemian-modular-kernel
       - gemian-system
       - lxc-android
-      - pulseaudio-module-droid-old
+      - pulseaudio-modules-droid-old
 
   - action: run
     chroot: true

overlay/astroslide/etc/X11/xorg.conf.d/20-hwcomposer.conf

@@ -1,12 +1,22 @@
+# Note: to set orientation to portrait requires a restart of X11 after updating
+# this file and picking the correct touch screen orientation
+# Astro Portrait (comment out all Rotate Options below)
+# echo 1 | sudo tee /sys/devices/platform/touch/screen_rotation
+# Astro Landscape (pick "Rotate" "CW" below)
+# echo 8 | sudo tee /sys/devices/platform/touch/screen_rotation
+
 Section "Monitor"
     Identifier             "Monitor0"
-    DisplaySize            147 68    # In millimeters - see physical_height/width in kernel sources (aeon_ssd2092_fhd_dsi_solomon.c - Cosmo)
+    DisplaySize            148 68
+#    DisplaySize            68 148
 EndSection
 
 Section "Device"
     Identifier             "MediaTek HWC"
     Driver                 "hwcomposer"
     Option                 "Rotate" "CW"
+#    Option                 "Rotate" "UD"
+#    Option                 "Rotate" "CCW"
 EndSection
 
 Section "Screen"

overlay/astroslide/etc/chromium.d/use-egl.conf

@@ -1 +1 @@
-; export CHROMIUM_FLAGS="$CHROMIUM_FLAGS --use-gl=egl"
+# export CHROMIUM_FLAGS="$CHROMIUM_FLAGS --use-gl=egl"

overlay/astroslide/etc/pulse/arm_droid_card_custom.pa

@@ -1 +1,2 @@
-load-module module-droid-card rate=48000 quirks=+no_hw_volume,-output_deep_buffer
+load-module module-droid-card rate=48000 
+#hw_volume=false 

overlay/astroslide/etc/pulse/default.pa.gemian

@@ -54,9 +54,9 @@ load-module module-switch-on-port-available
  .fail
 .endif
 
-.ifexists module-droid-hidl-28.so
+.ifexists module-droid-hidl.so
  .nofail
- load-module module-droid-hidl-28
+ load-module module-droid-hidl
  .fail
 .endif
 

overlay/cosmocom/etc/X11/xorg.conf.d/20-hwcomposer.conf

@@ -0,0 +1,31 @@
+# Note: to set orientation to portrait requires a restart of X11 after updating
+# this file and picking the correct touch screen orientation
+# Astro Portrait (comment out all Rotate Options below)
+# echo 1 | sudo tee /sys/devices/platform/touch/screen_rotation
+# Astro Landscape (pick "Rotate" "CW" below)
+# echo 8 | sudo tee /sys/devices/platform/touch/screen_rotation
+
+Section "Monitor"
+    Identifier             "Monitor0"
+    DisplaySize            136 68    # In millimeters - see physical_height/width in kernel sources (aeon_ssd2092_fhd_dsi_solomon.c - Cosmo)
+EndSection
+
+Section "Device"
+    Identifier             "MediaTek HWC"
+    Driver                 "hwcomposer"
+#    Option                 "Rotate" "CW"
+#    Option                 "Rotate" "UD"
+    Option                 "Rotate" "CCW"
+EndSection
+
+Section "Screen"
+    Identifier             "Screen0"
+    Device                 "MediaTek HWC"
+    Monitor                "Monitor0"
+    DefaultDepth           24
+    SubSection             "Display"
+        Depth              24
+        #Virtual           1440 720
+        #Virtual	       1080 540
+    EndSubSection
+EndSection

overlay/geminipda/etc/X11/xorg.conf.d/20-hwcomposer.conf

@@ -0,0 +1,32 @@
+# Note: to set orientation to portrait requires a restart of X11 after updating
+# this file and picking the correct touch screen orientation
+# Astro Portrait (comment out all Rotate Options below)
+# echo 1 | sudo tee /sys/devices/platform/touch/screen_rotation
+# Astro Landscape (pick "Rotate" "CW" below)
+# echo 8 | sudo tee /sys/devices/platform/touch/screen_rotation
+
+Section "Monitor"
+    Identifier             "Monitor0"
+    DisplaySize            148 68    # In millimeters - see physical_height/width in kernel sources (aeon_ssd2092_fhd_dsi_solomon.c - Cosmo)
+#    DisplaySize            68 148    # In millimeters - see physical_height/width in kernel sources (aeon_ssd2092_fhd_dsi_solomon.c - Cosmo)
+EndSection
+
+Section "Device"
+    Identifier             "MediaTek HWC"
+    Driver                 "hwcomposer"
+#    Option                 "Rotate" "CW"
+#    Option                 "Rotate" "UD"
+    Option                 "Rotate" "CCW"
+EndSection
+
+Section "Screen"
+    Identifier             "Screen0"
+    Device                 "MediaTek HWC"
+    Monitor                "Monitor0"
+    DefaultDepth           24
+    SubSection             "Display"
+        Depth              24
+        #Virtual           1440 720
+        #Virtual	       1080 540
+    EndSubSection
+EndSection

overlay/geminipda/etc/udev/rules.d/80-keyboard.rules

@@ -0,0 +1 @@
+SUBSYSTEM=="input", ATTRS{name}=="Integrated keyboard", ENV{XKBMODEL}="planetgemini"

variants/kde-plasma.yaml

@@ -7,15 +7,37 @@ actions:
       - kde-plasma-desktop
       - chromium
       - chromium-sandbox
+      - gstreamer1.0-plugins-good
+      - gstreamer1.0-plugins-bad
       - gstreamer1.0-qt5
-      - lxdm
+      - kde-config-gtk-style
-      - network-manager
+      - khotkeys
-      - xserver-xorg-input-evdev
-      - xserver-xorg-input-libinput
       - kde-spectacle
       - bluetooth
       - rfkill
       - bluez-tools
+      - kwin-x11
+      - kio-extras
+      - kscreen
+      - kwin-x11
+      - lxdm
+      - network-manager
+      - plasma-browser-integration
+      - plasma-discover
+      - plasma-pa
+      - plasma-nm
+      - powerdevil
+      - systemsettings
+      - xserver-xorg
+      - xserver-xorg-input-evdev
+      - xserver-xorg-input-libinput
+      - bluedevil
+      - bluez-tools
+      - pulseaudio-module-bluetooth
+      - plasma-systemmonitor
+      - fmradio
+      - lomiri-camera-app
+      - qt5-cameraplugin-aal
 
   - action: run
     chroot: true