From 6873fc1af55d2f1190e110b930f2ea1ce302c847 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Tue, 31 Mar 2015 19:41:36 +0300 Subject: Use SMF on Dyson --- debian/changelog | 1 + debian/control | 2 +- debian/lightdm.smf/manifest/system/lightdm.xml | 47 ++++++++++++++++++++++++++ debian/lightdm.smf/method/lightdm | 23 +++++++++++++ debian/rules | 15 ++++++-- 5 files changed, 85 insertions(+), 3 deletions(-) create mode 100644 debian/lightdm.smf/manifest/system/lightdm.xml create mode 100755 debian/lightdm.smf/method/lightdm diff --git a/debian/changelog b/debian/changelog index 65481dc..8ac8610 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ lightdm (1.10.3-3+dyson1) UNRELEASED; urgency=medium triggers * debian/rules: disable compiling of tests: FTBFS on Dyson and are not used anyway + * Added SMF service for Dyson -- Igor Pashev Tue, 31 Mar 2015 19:05:08 +0300 diff --git a/debian/control b/debian/control index a5daf73..f837b50 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9), intltool, pkg-config, libglib2.0-dev, libgtk-3-dev, libck-connector-dev, gnome-doc-utils, libqt4-dev, valac, gobject-introspection, dpkg-dev (>= 1.16.1), gtk-doc-tools, itstool, libgcrypt11-dev, libgirepository1.0-dev, - dh-systemd (>= 1.14) + dh-systemd (>= 1.14) [linux-any], dh-smf [illumos-any], Standards-Version: 3.9.6 Homepage: https://launchpad.net/lightdm Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/lightdm diff --git a/debian/lightdm.smf/manifest/system/lightdm.xml b/debian/lightdm.smf/manifest/system/lightdm.xml new file mode 100644 index 0000000..58430d8 --- /dev/null +++ b/debian/lightdm.smf/manifest/system/lightdm.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/debian/lightdm.smf/method/lightdm b/debian/lightdm.smf/method/lightdm new file mode 100755 index 0000000..d357e9b --- /dev/null +++ b/debian/lightdm.smf/method/lightdm @@ -0,0 +1,23 @@ +#! /bin/sh +set -e + +DAEMON=/usr/sbin/lightdm + +if [ -r /etc/default/locale ]; then + . /etc/default/locale + export LANG LANGUAGE +fi + +start() { + exec $DAEMON +} + + +case "$1" in + start) + start;; + # Stop via KILL, refresh via USR1 +esac + +exit 0 + diff --git a/debian/rules b/debian/rules index fdd5fa7..a7f3e02 100755 --- a/debian/rules +++ b/debian/rules @@ -27,10 +27,21 @@ override_dh_install: find debian/tmp/etc/apparmor.d -type f -exec chmod 0644 '{}' \; dh_install --fail-missing -X etc/init/lightdm.conf -X etc/apparmor.d/lightdm-guest-session -%: - dh $@ --with systemd --parallel override_dh_auto_test: +with := + +ifeq (linux,$(DEB_HOST_ARCH_OS)) +with += systemd + override_dh_systemd_start: dh_systemd_start -plightdm --no-start -r lightdm.service +endif + +ifeq (illumos,$(DEB_HOST_ARCH_OS)) +with += smf +endif + +%: + dh $@ $(with:%=--with %) --parallel -- cgit v1.2.3