From 525d37b9dbd98f40c8848c3a03b50ce9fd5adfa4 Mon Sep 17 00:00:00 2001 From: Simon Fels Date: Wed, 26 Apr 2017 08:35:13 +0200 Subject: [PATCH 1/4] Build debs also during our travis job --- scripts/clean-build.sh | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/scripts/clean-build.sh b/scripts/clean-build.sh index b2de311..ad1b332 100755 --- a/scripts/clean-build.sh +++ b/scripts/clean-build.sh @@ -40,14 +40,24 @@ apt-get clean cd /anbox -# In cases where anbox comes directly from a checked out Android -# build environment we miss some symlinks which are present on -# the host and don't have a valid git repository in that case. -git clean -fdx . || true -git reset --hard || true +cleanup() { + # In cases where anbox comes directly from a checked out Android + # build environment we miss some symlinks which are present on + # the host and don't have a valid git repository in that case. + git clean -fdx . || true + git reset --hard || true +} + +cleanup mkdir build || rm -rf build/* cd build cmake .. make -j10 make test + +cleanup + +apt-get install -y build-essential curl devscripts gdebi-core +apt-get install -y $(gdebi --quiet --apt-line ./debian/control) +debuild -us -uc From 06a8b728cdbe4c6569a3dcca31bfb984b164abb8 Mon Sep 17 00:00:00 2001 From: Simon Fels Date: Wed, 26 Apr 2017 08:47:49 +0200 Subject: [PATCH 2/4] Install additional needed build dependencies --- scripts/clean-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/clean-build.sh b/scripts/clean-build.sh index ad1b332..0c0f612 100755 --- a/scripts/clean-build.sh +++ b/scripts/clean-build.sh @@ -58,6 +58,6 @@ make test cleanup -apt-get install -y build-essential curl devscripts gdebi-core +apt-get install -y build-essential curl devscripts gdebi-core dkms dh-systemd apt-get install -y $(gdebi --quiet --apt-line ./debian/control) debuild -us -uc From 73ecb78bc6c93872c73e0564712c28850b556e9b Mon Sep 17 00:00:00 2001 From: Simon Fels Date: Thu, 27 Apr 2017 06:44:50 +0200 Subject: [PATCH 3/4] scripts: cleanup git tree only when one exists --- scripts/clean-build.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/clean-build.sh b/scripts/clean-build.sh index 0c0f612..d7219d7 100755 --- a/scripts/clean-build.sh +++ b/scripts/clean-build.sh @@ -44,8 +44,10 @@ cleanup() { # In cases where anbox comes directly from a checked out Android # build environment we miss some symlinks which are present on # the host and don't have a valid git repository in that case. - git clean -fdx . || true - git reset --hard || true + if [ -d .git ] ; then + git clean -fdx . + git reset --hard + fi } cleanup From 615ecc570a61e2f22b594f161ced6860fb960c5f Mon Sep 17 00:00:00 2001 From: Simon Fels Date: Sat, 29 Apr 2017 11:24:43 +0200 Subject: [PATCH 4/4] debian: add missing anbox.service symlink to package --- debian/anbox-common.install | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/anbox-common.install b/debian/anbox-common.install index 4700a8e..bf67a97 100644 --- a/debian/anbox-common.install +++ b/debian/anbox-common.install @@ -1,3 +1,4 @@ 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