cleanup + use latest diya-session-manager
This commit is contained in:
@@ -20,7 +20,7 @@ INITRAMFS_MAXSIZE="200000"
|
|||||||
INHERIT += "rm_work"
|
INHERIT += "rm_work"
|
||||||
|
|
||||||
EXTRA_IMAGE_FEATURES ?= " ssh-server-dropbear read-only-rootfs "
|
EXTRA_IMAGE_FEATURES ?= " ssh-server-dropbear read-only-rootfs "
|
||||||
DISTRO_FEATURES:append := " opengl "
|
DISTRO_FEATURES:append := " opengl pam "
|
||||||
DISTRO_FEATURES:remove = " x11 vulkan ptest "
|
DISTRO_FEATURES:remove = " x11 vulkan ptest "
|
||||||
TOOLCHAIN_TARGET_TASK:append = " libgles3-mesa-dev "
|
TOOLCHAIN_TARGET_TASK:append = " libgles3-mesa-dev "
|
||||||
# DISTRO_FEATURES:append := " vc4-gfx opengl directfb "
|
# DISTRO_FEATURES:append := " vc4-gfx opengl directfb "
|
||||||
|
@@ -20,6 +20,7 @@ IMAGE_INSTALL:append = "kernel-modules \
|
|||||||
libglapi \
|
libglapi \
|
||||||
libudev \
|
libudev \
|
||||||
libinput \
|
libinput \
|
||||||
|
libpam \
|
||||||
diya-overlay \
|
diya-overlay \
|
||||||
seatd \
|
seatd \
|
||||||
libxkbcommon \
|
libxkbcommon \
|
||||||
|
@@ -20,9 +20,9 @@ IMAGE_INSTALL:append = "pango \
|
|||||||
gdk-pixbuf \
|
gdk-pixbuf \
|
||||||
gtk4 \
|
gtk4 \
|
||||||
gtk4-layer-shell \
|
gtk4-layer-shell \
|
||||||
libadwaita libpam \
|
libadwaita \
|
||||||
gobject-introspection \
|
gobject-introspection \
|
||||||
wayland wayland-protocols \
|
wayland wayland-protocols wlroots \
|
||||||
foot \
|
foot \
|
||||||
mc \
|
mc \
|
||||||
gdbserver gdb \
|
gdbserver gdb \
|
||||||
|
@@ -1,5 +1,6 @@
|
|||||||
DESCRIPTION = "Auto configuration deployment from media"
|
DESCRIPTION = "Auto configuration deployment from media"
|
||||||
DEPENDS = ""
|
DEPENDS = ""
|
||||||
|
RDEPENDS:${PN} = "bash"
|
||||||
LICENSE = "MIT"
|
LICENSE = "MIT"
|
||||||
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
|
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
|
||||||
|
|
||||||
@@ -7,7 +8,9 @@ SRC_URI += "file://confd \
|
|||||||
file://expandfs.sh \
|
file://expandfs.sh \
|
||||||
file://80_diya \
|
file://80_diya \
|
||||||
file://fs_resize \
|
file://fs_resize \
|
||||||
file://boot-to-recovery"
|
file://boot-to-recovery \
|
||||||
|
file://diya.pam \
|
||||||
|
file://xdg-terminal-exec"
|
||||||
|
|
||||||
|
|
||||||
inherit update-rc.d useradd
|
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}/expandfs.sh ${D}/sbin/expandfs.sh
|
||||||
install -m 0755 ${WORKDIR}/boot-to-recovery ${D}/sbin/boot-to-recovery
|
install -m 0755 ${WORKDIR}/boot-to-recovery ${D}/sbin/boot-to-recovery
|
||||||
install -m 0755 ${WORKDIR}/fs_resize ${DEPLOY_DIR_IMAGE}/
|
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
|
cat << EOF > ${DEPLOY_DIR_IMAGE}/diya-config.txt
|
||||||
recovery=false
|
recovery=false
|
||||||
recovery_image=recovery-${MACHINE}.cpio.gz
|
recovery_image=recovery-${MACHINE}.cpio.gz
|
||||||
|
5
recipes-diya/diya-overlay/files/diya.pam
Normal file
5
recipes-diya/diya-overlay/files/diya.pam
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
#%PAM-1.0
|
||||||
|
|
||||||
|
auth include common-auth
|
||||||
|
account include common-account
|
||||||
|
session include common-session
|
@@ -21,4 +21,7 @@ login_session_user = xdg
|
|||||||
# login session is successful
|
# login session is successful
|
||||||
# the logged in user will own this session
|
# 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
|
Reference in New Issue
Block a user