[gentoo-commits] proj/hardened-refpolicy:master commit in: /

["Jason Zaman" <perfinion@gentoo.org>]

commit:     f51d21f62c9f44d637796ab5d5fab793f871cb2e
Author:     Nicolas Iooss <nicolas.iooss <AT> m4x <DOT> org>
AuthorDate: Sat Aug 27 15:08:57 2016 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 15:38:26 2016 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=f51d21f6

Make Travis-CI build without using sudo

This makes migrating to container-based infrastructure much easier (all
that is needed is adding "sudo: false" in the file).

Moreover installing the toolchain in a user directory fixes issues when
using the Trusty Beta environment: this toolchain broke the
already-installed Ubuntu packages (with for example policy version
issues between setfiles and checkpolicy). As the packaged tools (version
2.2) are much slower than the latest toolchain release on Trusty, it is
better to keep using the latest release.

As libcap-ng-dev package is not (yet? [1]) whitelisted in Travis-CI
container infrastructure, drop this package and do not build
policycoreutils/sandbox. Do not build policycoreutils/restorecond too as
it requires glib to be installed.

While at it, set the language as "generic" instead of "python".

[1] https://github.com/travis-ci/apt-package-whitelist/issues/1096

Signed-off-by: Nicolas Iooss <nicolas.iooss <AT> m4x.org>

 .travis.yml | 44 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7c6301d..3f9d678 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,6 @@
 # Derived from Nicolas Iooss: https://github.com/fishilico/selinux-refpolicy-patched/blob/travis-upstream/.travis.yml
 
-language: python
-python:
- - "2.7"
+language: generic
 
 # for T in standard mls mcs ; do for D in arch debian gentoo ; do for I in n y ; do for M in y n ; do for S in n y ; do
 # echo "  - TYPE=$T DISTRO=$D DIRECT_INITRC=$I MONOLITHIC=$M SYSTEMD=$S" ; done ; done ; done ; done ; done
@@ -32,16 +30,31 @@ env:
   - TYPE=mls DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=n SYSTEMD=n
   - TYPE=mls DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=n SYSTEMD=y
 
-before_install:
+# Uncomment to use Travis-CI container infrastructure (https://docs.travis-ci.com/user/ci-environment/)
+#sudo: false
+
+# Uncomment these two lines to use Travis-CI Trusty Beta environment
+#sudo: required
+#dist: trusty
+
+addons:
+  apt:
+    packages:
+    # Install SELinux userspace utilities dependencies
+    - bison
+    - flex
+    - gettext
+    - libaudit-dev
+    - libbz2-dev
+    - libustr-dev
+    - libpcre3-dev
+    - swig
+
+install:
   - lsb_release -a
   - bison -V
   - flex -V
-  - sudo apt-get update -qq
-
-  # Install SELinux userspace utilities dependencies
-  - sudo apt-get install -qq libaudit-dev libcap-ng-dev libustr-dev libpcre3-dev swig
 
-install:
   # Download current SELinux userspace tools and libraries
   - curl -sS -L https://github.com/SELinuxProject/selinux/archive/20160223.tar.gz | tar xz
   - mv selinux-20160223 selinux-src
@@ -56,10 +69,19 @@ install:
   # Drop sepolicy to break setools dependence (sepolicy isn't used anyway)
   - sed -i -e 's/sepolicy//' selinux-src/policycoreutils/Makefile
 
-  # Compile and install SELinux toolchain
+  # Drop restorecond to break glib dependence
+  - sed -i -e 's/ restorecond//' selinux-src/policycoreutils/Makefile
+
+  # Drop sandbox to break libcap-ng dependence
+  - sed -i -e 's/ sandbox//' selinux-src/policycoreutils/Makefile
+
+  # Compile and install SELinux toolchain into ~/selinux
   # On Ubuntu 12.04, default CFLAGS make the build fail in libsepol/cil with:
   #    error: declaration of 'index' shadows a global declarationo
-  - sudo make CFLAGS="-O2 -pipe -fPIC -Wall" -C selinux-src install
+  - make "DESTDIR=$HOME/selinux" CFLAGS="-O2 -pipe -fPIC -Wall -I$HOME/selinux/usr/include" -C selinux-src install
+
+  # Use TEST_TOOLCHAIN variable to tell refpolicy Makefile about the installed location
+  - export TEST_TOOLCHAIN="$HOME/selinux"
 
   # Drop build.conf settings to listen to env vars
   - sed -r -i -e '/(DIRECT_INITRC|MONOLITHIC|TYPE|DISTRO|SYSTEMD)/d' build.conf