jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #360 from morphis/f/drop-user-init-jobs

Browse source 
Drop upstart/systemctl session jobs
This commit is contained in:
Simon Fels 2017-07-14 20:28:13 +02:00 • committed by GitHub
commit 1eb027bcb9
5 changed files with 1 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

6
data/anbox.conf.in
View file

@ -1,6 +0,0 @@
start on started dbus
respawn
respawn limit 10 5
exec @SNAP_MOUNT_DIR@/anbox session-manager

12
data/anbox.service.in
View file

@ -1,12 +0,0 @@
[Unit]
Description=Anbox session manager
[Service]
Type=simple
ExecStart=@SNAP_MOUNT_DIR@/anbox session-manager
Restart=always
StartLimitIntervalSec=3
StartLimitBurst=1
[Install]
WantedBy=default.target

3
debian/anbox-common.install vendored
View file

@ -1,4 +1 @@
etc/X11/Xsession.d/68anbox etc/X11/Xsession.d/68anbox
usr/share/upstart/sessions/anbox.conf
usr/lib/systemd/user/anbox.service
usr/lib/systemd/user/default.target.wants/anbox.service

2
debian/control vendored
View file

@ -10,7 +10,7 @@ Vcs-Git: https://github.com/anbox/anbox.git
Package: anbox-common Package: anbox-common
Architecture: all Architecture: all
Depends: ${misc:Depends}, dbus-user-session Depends: ${misc:Depends}
Description: Common files necessary for Anbox Description: Common files necessary for Anbox
. .
This package contains necessary things which can't be shipped This package contains necessary things which can't be shipped

9
debian/rules vendored
View file

@ -14,8 +14,6 @@ VERSION=$(shell dpkg-parsechangelog -SVersion)
override_dh_auto_configure: override_dh_auto_configure:
override_dh_auto_build: override_dh_auto_build:
cat data/anbox.service.in | sed s:@SNAP_MOUNT_DIR@:/snap/bin:g > data/anbox.service
cat data/anbox.conf.in | sed s:@SNAP_MOUNT_DIR@:/snap/bin:g > data/anbox.conf
override_dh_install: override_dh_install:
VERSION=$(shell dpkg-parsechangelog -SVersion) VERSION=$(shell dpkg-parsechangelog -SVersion)
@ -30,13 +28,6 @@ override_dh_install:
install -d $(CURDIR)/debian/tmp/etc/modules-load.d install -d $(CURDIR)/debian/tmp/etc/modules-load.d
install -m 0644 kernel/anbox.conf $(CURDIR)/debian/tmp/etc/modules-load.d install -m 0644 kernel/anbox.conf $(CURDIR)/debian/tmp/etc/modules-load.d
install -d $(CURDIR)/debian/tmp/usr/lib/systemd/user/default.target.wants
install -m 0644 data/anbox.service $(CURDIR)/debian/tmp/usr/lib/systemd/user/
ln -sf /usr/lib/systemd/user/anbox.service $(CURDIR)/debian/tmp/usr/lib/systemd/user/default.target.wants/anbox.service
install -d $(CURDIR)/debian/tmp/usr/share/upstart/sessions/
install -m 0644 data/anbox.conf $(CURDIR)/debian/tmp/usr/share/upstart/sessions/
install -d $(CURDIR)/debian/tmp/etc/X11/Xsession.d install -d $(CURDIR)/debian/tmp/etc/X11/Xsession.d
install -m 0644 data/xsession.conf $(CURDIR)/debian/tmp/etc/X11/Xsession.d/68anbox install -m 0644 data/xsession.conf $(CURDIR)/debian/tmp/etc/X11/Xsession.d/68anbox