From 88d91e5ee8d87851944d077e496d526a2c290af4 Mon Sep 17 00:00:00 2001 From: Adam Boardman Date: Tue, 13 Jun 2023 19:45:03 +0100 Subject: [PATCH] Updates for astro and cosmo builds --- astroslide.yaml | 5 +++ cosmocom.yaml | 44 ++++++------------- geminipda.yaml | 2 +- .../etc/X11/xorg.conf.d/20-hwcomposer.conf | 12 ++++- .../astroslide/etc/chromium.d/use-egl.conf | 2 +- .../etc/pulse/arm_droid_card_custom.pa | 3 +- .../astroslide/etc/pulse/default.pa.gemian | 4 +- .../etc/X11/xorg.conf.d/20-hwcomposer.conf | 31 +++++++++++++ .../etc/X11/xorg.conf.d/20-hwcomposer.conf | 32 ++++++++++++++ .../etc/udev/rules.d/80-keyboard.rules | 1 + variants/kde-plasma.yaml | 30 +++++++++++-- 11 files changed, 125 insertions(+), 41 deletions(-) rename overlay/{common => astroslide}/etc/X11/xorg.conf.d/20-hwcomposer.conf (51%) create mode 100644 overlay/cosmocom/etc/X11/xorg.conf.d/20-hwcomposer.conf create mode 100644 overlay/geminipda/etc/X11/xorg.conf.d/20-hwcomposer.conf create mode 100644 overlay/geminipda/etc/udev/rules.d/80-keyboard.rules diff --git a/astroslide.yaml b/astroslide.yaml index 4463481..a47d63b 100644 --- a/astroslide.yaml +++ b/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 diff --git a/cosmocom.yaml b/cosmocom.yaml index c161c27..446533f 100644 --- a/cosmocom.yaml +++ b/cosmocom.yaml @@ -24,8 +24,8 @@ actions: packages: # - bluebinder # - media-hub -# - gemian-system -# - lxc-android + - gemian-system + - 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 -# recipe: variants/kde-plasma.yaml + - action: recipe + 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 diff --git a/geminipda.yaml b/geminipda.yaml index 0f1ca33..18a723d 100644 --- a/geminipda.yaml +++ b/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 diff --git a/overlay/common/etc/X11/xorg.conf.d/20-hwcomposer.conf b/overlay/astroslide/etc/X11/xorg.conf.d/20-hwcomposer.conf similarity index 51% rename from overlay/common/etc/X11/xorg.conf.d/20-hwcomposer.conf rename to overlay/astroslide/etc/X11/xorg.conf.d/20-hwcomposer.conf index 4cd0ecf..138b225 100644 --- a/overlay/common/etc/X11/xorg.conf.d/20-hwcomposer.conf +++ b/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" diff --git a/overlay/astroslide/etc/chromium.d/use-egl.conf b/overlay/astroslide/etc/chromium.d/use-egl.conf index ae08a98..19b94cc 100644 --- a/overlay/astroslide/etc/chromium.d/use-egl.conf +++ b/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" diff --git a/overlay/astroslide/etc/pulse/arm_droid_card_custom.pa b/overlay/astroslide/etc/pulse/arm_droid_card_custom.pa index 87b6471..6d17c4b 100644 --- a/overlay/astroslide/etc/pulse/arm_droid_card_custom.pa +++ b/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 diff --git a/overlay/astroslide/etc/pulse/default.pa.gemian b/overlay/astroslide/etc/pulse/default.pa.gemian index 485d1b5..27aaf5c 100644 --- a/overlay/astroslide/etc/pulse/default.pa.gemian +++ b/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 diff --git a/overlay/cosmocom/etc/X11/xorg.conf.d/20-hwcomposer.conf b/overlay/cosmocom/etc/X11/xorg.conf.d/20-hwcomposer.conf new file mode 100644 index 0000000..5a9b2ac --- /dev/null +++ b/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 diff --git a/overlay/geminipda/etc/X11/xorg.conf.d/20-hwcomposer.conf b/overlay/geminipda/etc/X11/xorg.conf.d/20-hwcomposer.conf new file mode 100644 index 0000000..f4b3969 --- /dev/null +++ b/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 diff --git a/overlay/geminipda/etc/udev/rules.d/80-keyboard.rules b/overlay/geminipda/etc/udev/rules.d/80-keyboard.rules new file mode 100644 index 0000000..b4e05e0 --- /dev/null +++ b/overlay/geminipda/etc/udev/rules.d/80-keyboard.rules @@ -0,0 +1 @@ +SUBSYSTEM=="input", ATTRS{name}=="Integrated keyboard", ENV{XKBMODEL}="planetgemini" diff --git a/variants/kde-plasma.yaml b/variants/kde-plasma.yaml index fa18a96..f67ab19 100644 --- a/variants/kde-plasma.yaml +++ b/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 - - network-manager - - xserver-xorg-input-evdev - - xserver-xorg-input-libinput + - kde-config-gtk-style + - khotkeys - 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