From 69b9e8384e05e49831d684c57288fe4ba191ef06 Mon Sep 17 00:00:00 2001 From: Bruce Leidl Date: Sun, 18 Mar 2018 19:20:36 -0400 Subject: [PATCH] renamed to launch-default-realm --- .../files/launch-default-appimg.service | 8 -------- .../files/watch-run-user.service | 6 ------ .../files/launch-default-realm.path} | 0 .../files/launch-default-realm.service | 8 ++++++++ .../files/watch-run-user.path | 0 .../files/watch-run-user.service | 6 ++++++ .../launch-default-realm.bb} | 12 ++++++------ .../gnome-terminal/files/citadel.desktop | 7 ------- 8 files changed, 20 insertions(+), 27 deletions(-) delete mode 100644 meta-citadel/recipes-core/launch-default-appimg/files/launch-default-appimg.service delete mode 100644 meta-citadel/recipes-core/launch-default-appimg/files/watch-run-user.service rename meta-citadel/recipes-core/{launch-default-appimg/files/launch-default-appimg.path => launch-default-realm/files/launch-default-realm.path} (100%) create mode 100644 meta-citadel/recipes-core/launch-default-realm/files/launch-default-realm.service rename meta-citadel/recipes-core/{launch-default-appimg => launch-default-realm}/files/watch-run-user.path (100%) create mode 100644 meta-citadel/recipes-core/launch-default-realm/files/watch-run-user.service rename meta-citadel/recipes-core/{launch-default-appimg/launch-default-appimg.bb => launch-default-realm/launch-default-realm.bb} (57%) delete mode 100644 meta-gnome/recipes-gnome/gnome-terminal/files/citadel.desktop diff --git a/meta-citadel/recipes-core/launch-default-appimg/files/launch-default-appimg.service b/meta-citadel/recipes-core/launch-default-appimg/files/launch-default-appimg.service deleted file mode 100644 index 4e3d686..0000000 --- a/meta-citadel/recipes-core/launch-default-appimg/files/launch-default-appimg.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Launch default appimg -ConditionPathExists=!/run/appimg - -[Service] -ExecStart=/usr/bin/citadel-appimg start -Type=oneshot -RemainAfterExit=yes diff --git a/meta-citadel/recipes-core/launch-default-appimg/files/watch-run-user.service b/meta-citadel/recipes-core/launch-default-appimg/files/watch-run-user.service deleted file mode 100644 index c491b91..0000000 --- a/meta-citadel/recipes-core/launch-default-appimg/files/watch-run-user.service +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=Watch run-user service - -[Service] -Type=oneshot -ExecStart=/usr/bin/systemctl --no-block start launch-default-appimg.path diff --git a/meta-citadel/recipes-core/launch-default-appimg/files/launch-default-appimg.path b/meta-citadel/recipes-core/launch-default-realm/files/launch-default-realm.path similarity index 100% rename from meta-citadel/recipes-core/launch-default-appimg/files/launch-default-appimg.path rename to meta-citadel/recipes-core/launch-default-realm/files/launch-default-realm.path diff --git a/meta-citadel/recipes-core/launch-default-realm/files/launch-default-realm.service b/meta-citadel/recipes-core/launch-default-realm/files/launch-default-realm.service new file mode 100644 index 0000000..0bdf6c1 --- /dev/null +++ b/meta-citadel/recipes-core/launch-default-realm/files/launch-default-realm.service @@ -0,0 +1,8 @@ +[Unit] +Description=Launch default realm +ConditionPathExists=!/run/realms + +[Service] +ExecStart=/usr/bin/realms start +Type=oneshot +RemainAfterExit=yes diff --git a/meta-citadel/recipes-core/launch-default-appimg/files/watch-run-user.path b/meta-citadel/recipes-core/launch-default-realm/files/watch-run-user.path similarity index 100% rename from meta-citadel/recipes-core/launch-default-appimg/files/watch-run-user.path rename to meta-citadel/recipes-core/launch-default-realm/files/watch-run-user.path diff --git a/meta-citadel/recipes-core/launch-default-realm/files/watch-run-user.service b/meta-citadel/recipes-core/launch-default-realm/files/watch-run-user.service new file mode 100644 index 0000000..d57595c --- /dev/null +++ b/meta-citadel/recipes-core/launch-default-realm/files/watch-run-user.service @@ -0,0 +1,6 @@ +[Unit] +Description=Watch run-user service + +[Service] +Type=oneshot +ExecStart=/usr/bin/systemctl --no-block start launch-default-realm.path diff --git a/meta-citadel/recipes-core/launch-default-appimg/launch-default-appimg.bb b/meta-citadel/recipes-core/launch-default-realm/launch-default-realm.bb similarity index 57% rename from meta-citadel/recipes-core/launch-default-appimg/launch-default-appimg.bb rename to meta-citadel/recipes-core/launch-default-realm/launch-default-realm.bb index 98b7cf6..d4f08ea 100644 --- a/meta-citadel/recipes-core/launch-default-appimg/launch-default-appimg.bb +++ b/meta-citadel/recipes-core/launch-default-realm/launch-default-realm.bb @@ -1,5 +1,5 @@ -DESCRIPTION = "Install systemd unit file to automatically start default appimg" +DESCRIPTION = "Install systemd unit file to automatically start default realm" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" SECTION = "" @@ -7,7 +7,7 @@ DEPENDS = "" inherit systemd -SRC_URI = "file://launch-default-appimg.path file://launch-default-appimg.service file://watch-run-user.path file://watch-run-user.service" +SRC_URI = "file://launch-default-realm.path file://launch-default-realm.service file://watch-run-user.path file://watch-run-user.service" S = "${WORKDIR}" @@ -16,14 +16,14 @@ RDEPENDS_${PN} = "bash" FILES_${PN} += "\ ${systemd_system_unitdir}/watch-run-user.service \ - ${systemd_system_unitdir}/launch-default-appimg.path \ - ${systemd_system_unitdir}/launch-default-appimg.service \ + ${systemd_system_unitdir}/launch-default-realm.path \ + ${systemd_system_unitdir}/launch-default-realm.service \ " do_install() { install -d ${D}${systemd_system_unitdir} - install -m 644 ${WORKDIR}/launch-default-appimg.path ${D}${systemd_system_unitdir} - install -m 644 ${WORKDIR}/launch-default-appimg.service ${D}${systemd_system_unitdir} + install -m 644 ${WORKDIR}/launch-default-realm.path ${D}${systemd_system_unitdir} + install -m 644 ${WORKDIR}/launch-default-realm.service ${D}${systemd_system_unitdir} install -m 644 ${WORKDIR}/watch-run-user.path ${D}${systemd_system_unitdir} install -m 644 ${WORKDIR}/watch-run-user.service ${D}${systemd_system_unitdir} } diff --git a/meta-gnome/recipes-gnome/gnome-terminal/files/citadel.desktop b/meta-gnome/recipes-gnome/gnome-terminal/files/citadel.desktop deleted file mode 100644 index f222cb8..0000000 --- a/meta-gnome/recipes-gnome/gnome-terminal/files/citadel.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Name=Citadel Terminal -Exec=/bin/bash -Terminal=true -Type=Application -Icon=xterm -StartupNotify=false