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/images/base-image.inc

@@ -20,6 +20,7 @@ IMAGE_INSTALL:append = "kernel-modules \
                         libglapi \
                         libudev \
                         libinput \
+                        libpam \
                         diya-overlay \
                         seatd \
                         libxkbcommon \

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

@@ -20,15 +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-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,7 +33,10 @@ 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}/
-
+    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

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

@@ -6,6 +6,7 @@ if [[ $(/usr/bin/id -u) -ne 0 ]]; then
 fi
 
 . /etc/profile
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
 
 if [ ! -e /boot/diya-config.txt ]; then
     # prepare env for recovery boot

recipes-diya/diya-overlay/files/confd

@@ -1,9 +1,9 @@
 #!/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="mmcblk0"

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,5 +1,6 @@
 #! /bin/sh
 . /etc/profile
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
 
 if [ -z "$DISK" ]; then
     DISK="mmcblk0"

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

@@ -10,7 +10,7 @@ SRC_URI += "git://git.iohub.dev/dany/diya-session-manager.git;protocol=https;bra
             file://diya-sessiond"
 
 SRCREV = "${AUTOREV}"
-PV = "0.1.0+git${SRCPV}"
+PV = "0.1.1+git${SRCPV}"
 S = "${WORKDIR}/git"
 
 inherit meson pkgconfig

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

@@ -21,4 +21,7 @@ login_session_user = xdg
 # login session is successful
 # the logged in user will own this session
 
-user_session_command = diya-session-launch diyac -x diya-shell
+user_session_command = diya-session-launch diyac -x diya-shell
+
+# PAM service used by the daemon for authentication
+pam_service = diya

recipes-diya/initramfs/files/confd

@@ -1,8 +1,8 @@
 #!/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)

recipes-diya/initramfs/files/diya-update

@@ -1,6 +1,7 @@
 #! /bin/sh
 
 . /etc/profile
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
 
 if [ -z "$DISK" ]; then
     DISK="mmcblk0"

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"