bump session manager to version 0.1.1

conf/layer.conf

@@ -20,7 +20,7 @@ INITRAMFS_MAXSIZE="200000"
 INHERIT += "rm_work"
 
 EXTRA_IMAGE_FEATURES ?= " ssh-server-dropbear read-only-rootfs "
-DISTRO_FEATURES:append := " opengl "
+DISTRO_FEATURES:append := " opengl pam "
 DISTRO_FEATURES:remove = " x11 vulkan ptest "
 TOOLCHAIN_TARGET_TASK:append = " libgles3-mesa-dev "
 # DISTRO_FEATURES:append := " vc4-gfx opengl directfb "

recipes-core/base-files/base-files_%.bbappend

@@ -5,6 +5,7 @@ do_install:append () {
 export GDK_BACKEND=wayland
 export XDG_RUNTIME_DIR=/home/$USER/.xdg
 export XDG_CONFIG_HOME=/home/$USER/.config
+export XDG_CACHE_HOME=/home/$USER/.cache
 export PATH=$PATH:/home/$USER/bin:/home/$USER/.local/bin
 export LD_LIBRARY_PATH=/home/$USER/lib:/home/$USER/.local/lib
 export DBUS_SYSTEM_BUS_ADDRESS=unix:path=/run/dbus/system_bus_socket

recipes-core/images/base-image.inc

@@ -1,8 +1,6 @@
 inherit extrausers
 
-EXTRA_USERS_PARAMS =    "groupadd xdg; \
-                        usermod -d /home/diya -p 2Pe/4xyFxsokE diya; \
-                        usermod -a -G xdg diya; \
+EXTRA_USERS_PARAMS =    "usermod -d /home/diya -p 2Pe/4xyFxsokE diya; \
                         usermod -a -G video diya; \
                         usermod -a -G tty diya; \
                         usermod -a -G input diya; \
@@ -10,7 +8,7 @@ EXTRA_USERS_PARAMS =    "groupadd xdg; \
                         usermod -a -G audio diya; \
                         usermod -a -G sudo diya; \
                         "
-IMAGE_BOOT_FILES:append = " fs_resize config.txt recovery-${MACHINE}.cpio.gz Image "
+IMAGE_BOOT_FILES:append = " fs_resize diya-config.txt recovery-${MACHINE}.cpio.gz Image "
 
 IMAGE_INSTALL:append = "kernel-modules \
                         e2fsprogs \
@@ -22,6 +20,7 @@ IMAGE_INSTALL:append = "kernel-modules \
                         libglapi \
                         libudev \
                         libinput \
+                        libpam \
                         diya-overlay \
                         seatd \
                         libxkbcommon \

recipes-core/images/core-image-base.bbappend

@@ -2,7 +2,13 @@ DISTRO_FEATURES:append = " wayland "
 
 require base-image.inc
 
-EXTRA_USERS_PARAMS:append = "usermod -a -G avahi diya"
+EXTRA_USERS_PARAMS:append = "useradd xdg; \
+                            usermod -d /run/xdg xdg; \
+                            usermod -a -G video xdg; \
+                            usermod -a -G input xdg; \
+                            usermod -a -G tty xdg; \
+                            usermod -a -G avahi diya; \
+                            usermod -a -G xdg diya;"
 IMAGE_INSTALL:append = "pango \
                         seatd \
                         pixman \
@@ -14,14 +20,15 @@ IMAGE_INSTALL:append = "pango \
                         gdk-pixbuf \
                         gtk4 \
                         gtk4-layer-shell \
+                        libadwaita \
                         gobject-introspection \
-                        wayland wayland-protocols \
-                        foot swaybg swayidle swaylock  tofi wtype \
+                        wayland wayland-protocols wlroots \
+                        foot \
                         mc \
                         gdbserver gdb \
-                        labwc \
                         wlr-randr \
+                        diya-session-manager \
                         "
 PACKAGE_EXCLUDE = " gtk+ gtk+3 adwaita-icon-theme "
 IMAGE_INSTALL:remove = " gtk+ gtk+3 adwaita-icon-theme "
-# wlr-randr l3afpad wlopm cairo-egl 
+# wlr-randr l3afpad wlopm cairo-egl  webkitgtk 

recipes-core/images/core-image-recovery.bb

@@ -41,12 +41,6 @@ IMAGE_PREPROCESS_COMMAND += "image_patch;"
 image_patch () {
     # delete unused image
     rm -rf ${IMAGE_ROOTFS}/boot/*
-    # create /etc/fstab
-    cat << EOF > ${IMAGE_ROOTFS}/etc/fstab
-/dev/mmcblk1p1       /boot          auto       defaults  0  0
-/dev/mmcblk1p4       /home          auto       defaults  0  0
-
-EOF
     cat << EOF > ${IMAGE_ROOTFS}/etc/hostname
 diya-recovery
 EOF

recipes-diya/diya-overlay/diya-overlay.bb

@@ -1,5 +1,6 @@
 DESCRIPTION = "Auto configuration deployment from media"
 DEPENDS = ""
+RDEPENDS:${PN} = "bash"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
@@ -7,7 +8,9 @@ SRC_URI += "file://confd \
             file://expandfs.sh \
             file://80_diya \
             file://fs_resize \
-            file://boot-to-recovery"
+            file://boot-to-recovery \
+            file://diya.pam \
+            file://xdg-terminal-exec"
 
 
 inherit update-rc.d useradd
@@ -30,8 +33,11 @@ do_install() {
     install -m 0755 ${WORKDIR}/expandfs.sh ${D}/sbin/expandfs.sh
     install -m 0755 ${WORKDIR}/boot-to-recovery ${D}/sbin/boot-to-recovery
     install -m 0755 ${WORKDIR}/fs_resize ${DEPLOY_DIR_IMAGE}/
-
-    cat << EOF > ${DEPLOY_DIR_IMAGE}/config.txt
+    install -d ${D}/etc/pam.d
+    install -m 0644 ${WORKDIR}/diya.pam ${D}${sysconfdir}/pam.d/diya
+    install -d ${D}/usr/bin
+    install -m 0755 ${WORKDIR}/xdg-terminal-exec ${D}/usr/bin
+    cat << EOF > ${DEPLOY_DIR_IMAGE}/diya-config.txt
 recovery=false
 recovery_image=recovery-${MACHINE}.cpio.gz
 console=both

recipes-diya/diya-overlay/files/80_diya

@@ -1 +1,2 @@
 d root root 0755 /run/root none
+d xdg xdg 0755 /run/xdg none

recipes-diya/diya-overlay/files/boot-to-recovery

@@ -6,16 +6,17 @@ if [[ $(/usr/bin/id -u) -ne 0 ]]; then
 fi
 
 . /etc/profile
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
 
-if [ ! -e /boot/config.txt ]; then
+if [ ! -e /boot/diya-config.txt ]; then
     # prepare env for recovery boot
-    cat << EOF > /boot/config.txt
+    cat << EOF > /boot/diya-config.txt
 recovery=true
 recovery_image=recovery-${MACHINE}.cpio.gz
 EOF
 else
-    sed -i 's/^.*recovery.*/recovery=true/g' /boot/config.txt || \
-                echo "recovery=true" >> /boot/config.txt
+    sed -i 's/^.*recovery.*/recovery=true/g' /boot/diya-config.txt || \
+                echo "recovery=true" >> /boot/diya-config.txt
 fi
 echo "Rebooting to recovery mode"
 reboot

recipes-diya/diya-overlay/files/confd

@@ -1,10 +1,12 @@
 #!/bin/sh
 
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DESC="Auto deployment configuration from media"
 
+. /etc/profile
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
 if [ -z "$DISK" ]; then
-    DISK="mmcblk1"
+    DISK="mmcblk0"
 fi
 
 case "$1" in

recipes-diya/diya-overlay/files/diya.pam

@@ -0,0 +1,5 @@
+#%PAM-1.0
+
+auth     include  common-auth
+account  include  common-account
+session  include  common-session

recipes-diya/diya-overlay/files/expandfs.sh

@@ -1,7 +1,9 @@
 #! /bin/sh
+. /etc/profile
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
 
 if [ -z "$DISK" ]; then
-    DISK="mmcblk1"
+    DISK="mmcblk0"
 fi
 
 if [ "$(/usr/bin/id -u)" -ne 0 ]; then

recipes-diya/diya-overlay/files/xdg-terminal-exec

@@ -0,0 +1,2 @@
+#! /bin/bash
+foot "$@"

recipes-diya/diya-session-manager/diya-session-manager_git.bb

@@ -0,0 +1,40 @@
+DESCRIPTION = "Diya session manager"
+DEPENDS = "glib-2.0"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+
+SRC_URI += "git://git.iohub.dev/dany/diya-session-manager.git;protocol=https;branch=master \
+            file://daemon.conf \
+            file://dbus-diya.conf \
+            file://diya-session-launch \
+            file://diya-sessiond"
+
+SRCREV = "${AUTOREV}"
+PV = "0.1.1+git${SRCPV}"
+S = "${WORKDIR}/git"
+
+inherit meson pkgconfig
+
+# inherit update-rc.d
+# INITSCRIPT_NAME = "diya-sessiond"
+# INITSCRIPT_PARAMS = "start 30 5 . stop 10 0 1 6 ."
+
+
+do_install:append() {
+    install -d ${D}/etc/diya
+    install -d ${D}/usr/bin
+    install -d ${D}/etc/dbus-1
+    install -d ${D}/etc/dbus-1/system.d
+    install -d ${D}/etc/init.d
+    install -m 0755 ${WORKDIR}/build/diya-session-manager ${D}/usr/bin/
+    install -m 0755 ${WORKDIR}/diya-sessiond ${D}/etc/init.d/
+    install -m 0755 ${WORKDIR}/diya-session-launch ${D}/usr/bin/
+    install -m 0644 ${WORKDIR}/daemon.conf ${D}/etc/diya/
+    install -m 0644 ${WORKDIR}/dbus-diya.conf ${D}/etc/dbus-1/system.d/
+}
+
+FILES:${PN} = "/etc/diya \
+                /etc/dbus-1/system.d/dbus-diya.conf \
+                /usr/bin/diya-session-manager \
+                /usr/bin/diya-session-launch \
+                /etc/init.d/diya-sessiond"

recipes-diya/diya-session-manager/files/daemon.conf

@@ -0,0 +1,27 @@
+# this file is the configuration file for the SessionMaganer daemon
+# daemon
+# By default, the daemon will look for this file in the following locations
+# /etc/diya/daemon.conf
+# or it can be specified using the -c option
+# example: diya-session-manager -c /path/to/daemon.conf
+
+# Login session command
+# The command to run to start a login session
+# this command will handle the user input and send user
+# credentials to the daemon via Dbus message
+login_session_command = diya-session-launch diyac -x diya-login-shell
+
+# login session user
+# The user that owns the login session, root by default
+# if this setting is not set
+login_session_user = xdg
+
+# User session command
+# The command to run to start a user session after the
+# login session is successful
+# the logged in user will own this session
+
+user_session_command = diya-session-launch diyac -x diya-shell
+
+# PAM service used by the daemon for authentication
+pam_service = diya

recipes-diya/diya-session-manager/files/dbus-diya.conf

@@ -0,0 +1,27 @@
+<!DOCTYPE busconfig PUBLIC
+          "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+          "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+  <!-- Only root can own the service -->
+  <policy user="root">
+    <allow own="dev.iohub.diya.SessionManager"/>
+  </policy>
+  
+  <!--deny all access from another user-->
+    <policy context="default">
+        <deny send_destination="dev.iohub.diya.SessionManager"/>
+        <deny receive_sender="dev.iohub.diya.SessionManager"/>
+  </policy>
+  
+  <policy user="xdg">
+    <allow send_destination="dev.iohub.diya.SessionManager"/>
+    <allow receive_sender="dev.iohub.diya.SessionManager"/>
+  </policy>
+  
+  <policy user="root">
+    <allow send_destination="dev.iohub.diya.SessionManager"/>
+    <allow receive_sender="dev.iohub.diya.SessionManager"/>
+  </policy>
+
+</busconfig>

recipes-diya/diya-session-manager/files/diya-session-launch

@@ -0,0 +1,26 @@
+#! /bin/sh
+
+handle()
+{
+    echo "SIGINT detected. continue."
+}
+
+# start dbus session and get env:
+#
+# DBUS_SESSION_BUS_ADDRESS='unix:path=/tmp/dbus-...
+# export DBUS_SESSION_BUS_ADDRESS;
+# DBUS_SESSION_BUS_PID=3598;
+
+
+# shellcheck disable=SC1091
+. /etc/profile
+
+eval "$(dbus-launch --auto-syntax)"
+
+# trap the sigint
+trap 'handle' INT
+"$@"
+
+# stop the
+kill -9 "$DBUS_SESSION_BUS_PID"
+echo "Session closed"

recipes-diya/diya-session-manager/files/diya-sessiond

@@ -0,0 +1,78 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          diya
+# Short-Description: simple session manager
+# Description:       session manager that allows user login and
+#                    start user session
+### END INIT INFO
+#
+# -*- coding: utf-8 -*-
+
+# set -e
+
+# shellcheck disable=SC1091
+. /etc/init.d/functions
+
+DAEMON=/usr/bin/diya-session-manager
+NAME=diya-sessiond
+PIDFILE=/var/run/diya/sessiond.pid
+DESC="Diya session manager"
+DAEMONUSER="root"
+PARAMS="-c /etc/diya/daemon.conf"
+test -x $DAEMON || exit 0
+
+start_it_up()
+{
+  mkdir -p "$(dirname $PIDFILE)"
+  if [ -e $PIDFILE ]; then
+    PIDDIR=/proc/$(cat $PIDFILE)
+    if [ -d ${PIDDIR} -a  "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then 
+      echo "$DESC already started; not starting."
+    else
+      echo "Removing stale PID file $PIDFILE."
+      rm -f $PIDFILE
+    fi
+  fi
+
+  echo -n "Starting $DESC: "
+  start-stop-daemon -o --start --quiet --pidfile $PIDFILE \
+    --user $DAEMONUSER --exec $DAEMON -- $PARAMS
+  echo "$NAME."
+}
+
+shut_it_down()
+{
+  echo -n "Stopping $DESC: "
+  start-stop-daemon -o --stop  --quiet --pidfile $PIDFILE \
+    --user $DAEMONUSER
+  # We no longer include these arguments so that start-stop-daemon
+  # can do its job even given that we may have been upgraded.
+  # We rely on the pidfile being sanely managed
+  # --exec $DAEMON -- --system $PARAMS
+  echo "$NAME."
+  rm -f $PIDFILE
+}
+
+case "$1" in
+  start)
+    start_it_up
+  ;;
+  stop)
+    shut_it_down
+  ;;
+  status)
+    status $DAEMON
+    exit $?
+  ;;
+  restart)
+    shut_it_down
+    sleep 1
+    start_it_up
+  ;;
+  *)
+    echo "Usage: /etc/init.d/$NAME {start|stop|status|restart}" >&2
+    exit 1
+  ;;
+esac
+
+exit 0

recipes-diya/initramfs/files/confd

@@ -1,14 +1,14 @@
 #!/bin/sh
 
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DESC="Custom configuration"
 . /etc/profile
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
 
 case "$1" in
     start)
         echo -n "Start $DESC: "
-        sed -i 's/^.*recovery.*/recovery=false/g' /boot/config.txt || \
-                echo "recovery=false" >> /boot/config.txt
+        sed -i 's/^.*recovery.*/recovery=false/g' /boot/diya-config.txt || \
+                echo "recovery=false" >> /boot/diya-config.txt
     ;;
 
     *)

recipes-diya/initramfs/files/diya-update

@@ -1,16 +1,20 @@
 #! /bin/sh
 
 . /etc/profile
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+if [ -z "$DISK" ]; then
+    DISK="mmcblk0"
+fi
 
 DEFAULT_ROOTFS_NAME="rootfs-$MACHINE.tar.bz2"
 DEFAULT_KERNEL_NAME="Image-$MACHINE.bin"
 DEFAULT_INITRAMFS_NAME="recovery-$MACHINE.cpio.gz"
 UPDATE_SRC_PATH="/home/diya/.update"
-ROOTFS_DEV="/dev/mmcblk1p2"
+ROOTFS_DEV="/dev/${DISK}p2"
 SUPPORTED_COMMAND="rootfs kernel initramfs all"
 TMP_MOUNT="/tmp/rootfs"
 
-
 rootfs()
 {
     filename=$1
@@ -54,9 +58,9 @@ rootfs()
     echo "Patch /etc/fstab"
     cat << EOF >> $TMP_MOUNT/etc/fstab
 
-/dev/mmcblk1p1  /boot   vfat    defaults        0       0
-/dev/mmcblk1p3  /var/etc        ext4    defaults        0       0
-/dev/mmcblk1p4  /home   ext4    defaults        0       0
+/dev/${DISK}p1  /boot   vfat    defaults        0       0
+/dev/${DISK}p3  /var/etc        ext4    defaults        0       0
+/dev/${DISK}p4  /home   ext4    defaults        0       0
 
 EOF
     sync

recipes-gtk/gtk-layer-shell/gtk4-layer-shell_git.bbappend

@@ -1,4 +1,4 @@
-PV = "1.1.0"
-SRCREV = "v1.1.0"
+PV = "1.1.1"
+SRCREV = "v1.1.1"
 
 INSANE_SKIP:${PN}-dev += "dev-elf"

recipes-sato/webkit/webkitgtk_%.bbapend

@@ -0,0 +1 @@
+PACKAGECONFIG:remove = "x11 systemd"

wic/image.wks.in

@@ -1,12 +0,0 @@
-# short-description: Create Raspberry Pi SD card image
-# long-description: Creates a partitioned SD card image for use with
-
-part u-boot --source rawcopy --sourceparams="file=${SPL_BINARY}" --ondisk mmcblk1 --no-table --align 8
-part /boot --source bootimg-partition --ondisk mmcblk1 --fstype=vfat --label boot --active --align 4096 --size 32
-# read only roofs
-part / --source rootfs --ondisk mmcblk1 --fstype=ext4 --label root --align 4096 --size 150 --exclude-path home/ --exclude-path var/etc/ --exclude-path boot/
-# modifiable configurations stored in /var/etc
-part /var/etc --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/var/etc --ondisk mmcblk1 --fstype=ext4 --label diya --align 1024 --size 32
-# home partition
-part /home --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home --ondisk mmcblk1 --fstype=ext4 --label home --align 1024 --size 16
-# part /home --ondisk mmcblk1 --fstype=vfat --label music --active --align 1024 --size 16