diff options
author | Ari Parkkila <ari.parkkila@qt.io> | 2024-04-10 09:21:17 +0300 |
---|---|---|
committer | Ari Parkkila <ari.parkkila@qt.io> | 2024-04-16 09:43:37 +0300 |
commit | 79ffa0a775c6ce492aa9757ac78fc8d7b3973f63 (patch) | |
tree | 977fbbe4a3c040e22df12e74acf44653de817e1e /meta-boot2qt | |
parent | 50799e8a33bd41ce6de1e0e1b2fa81172964c941 (diff) |
Change from dropbear to openssh
OpenSSH supports PAM, which in turn makes systemd(-logind) create sessions
for users, which will then also start session dbus when needed.
Change-Id: I27e894ff6dac203de4347190a31963ff66ba777a
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'meta-boot2qt')
5 files changed, 0 insertions, 64 deletions
diff --git a/meta-boot2qt/recipes-core/dbus/dbus-session.bb b/meta-boot2qt/recipes-core/dbus/dbus-session.bb deleted file mode 100644 index f560ea34..00000000 --- a/meta-boot2qt/recipes-core/dbus/dbus-session.bb +++ /dev/null @@ -1,50 +0,0 @@ -############################################################################ -## -## Copyright (C) 2019 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -SUMMARY = "D-BUS Session Message Bus" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -inherit systemd - -SRC_URI = " \ - file://dbus-session@.service \ - file://dbus-session-address.sh \ - " - -do_install() { - install -m 0755 -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/dbus-session@.service ${D}${systemd_unitdir}/system - - install -d ${D}${sysconfdir}/profile.d - install -m 0644 ${WORKDIR}/dbus-session-address.sh ${D}${sysconfdir}/profile.d -} - -SYSTEMD_SERVICE:${PN} = "dbus-session@.service" -SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-boot2qt/recipes-core/dbus/dbus-session/dbus-session-address.sh b/meta-boot2qt/recipes-core/dbus/dbus-session/dbus-session-address.sh deleted file mode 100644 index 7c8aa614..00000000 --- a/meta-boot2qt/recipes-core/dbus/dbus-session/dbus-session-address.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/0/dbus_session_socket -export DBUS_SESSION_BUS_ADDRESS diff --git a/meta-boot2qt/recipes-core/dbus/dbus-session/dbus-session@.service b/meta-boot2qt/recipes-core/dbus/dbus-session/dbus-session@.service deleted file mode 100644 index 8c725767..00000000 --- a/meta-boot2qt/recipes-core/dbus/dbus-session/dbus-session@.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=D-BUS Session Message Bus. -After=dbus.service systemd-user-sessions.service user-runtime-dir@%i.service -Wants=user-runtime-dir@%i.service - -[Service] -User=%i -ExecStart=/usr/bin/dbus-daemon --session --nofork --address=unix:path=/run/user/%U/dbus_session_socket -ExecReload=/usr/bin/dbus-send --print-reply --session --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb index f0c2cbeb..e8d2016b 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb @@ -42,7 +42,6 @@ SRCREV = "3e0ecc85628f17e4d7929f3341aa76b376b8080e" DEPENDS = "qtbase" RDEPENDS:${PN} = " \ default-qt-envs \ - dbus-session \ " do_configure:append() { diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs/defaults b/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs/defaults index 751210b0..93a82aea 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs/defaults +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs/defaults @@ -1,5 +1,4 @@ QT_IM_MODULE=qtvirtualkeyboard QTWEBENGINE_DISABLE_SANDBOX=1 XDG_RUNTIME_DIR=/run/user/0 -DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/0/dbus_session_socket WAYLAND_DISPLAY=/run/wayland-0 |