From ac1b6a6797cb4ab22d1394e3a1049e2778e454d5 Mon Sep 17 00:00:00 2001
From: Ivan Mikushin <i.mikushin@gmail.com>
Date: Thu, 25 Feb 2016 11:17:21 -0800
Subject: [PATCH] Repair build for arm

and make sure CI breaks if arm is broken
---
 .drone.yml                                     | 3 ++-
 Makefile                                       | 2 +-
 scripts/ci                                     | 3 ++-
 selinux/{selinux.go => selinux_linux_amd64.go} | 2 --
 selinux/selinux_linux_arm.go                   | 6 ++++++
 5 files changed, 11 insertions(+), 5 deletions(-)
 rename selinux/{selinux.go => selinux_linux_amd64.go} (93%)
 create mode 100644 selinux/selinux_linux_arm.go

diff --git a/.drone.yml b/.drone.yml
index 11bd14d4..f40efaec 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,4 +3,5 @@ build:
   volumes:
   - /var/run/docker.sock:/var/run/docker.sock
   commands:
-  - dapper -k -O make DEV_BUILD=1 test
+  - dapper -O make ARCH=arm rootfs
+  - dapper -O make DEV_BUILD=1 test
diff --git a/Makefile b/Makefile
index cb2d0dde..13cdda2b 100644
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,7 @@ $(BUILD)/images.tar: build/host_ros
 	ARCH=$(ARCH) FORCE_PULL=$(FORCE_PULL) ./scripts/mk-images-tar.sh
 
 
-$(DIST)/artifacts/rootfs.tar.gz: bin/ros assets/docker $(BUILD)/images.tar
+$(DIST)/artifacts/rootfs.tar.gz: bin/ros assets/docker $(BUILD)/images.tar assets/selinux/policy.29
 	mkdir -p $(dir $@)
 	ARCH=$(ARCH) DFS_IMAGE=$(DFS_IMAGE) DEV_BUILD=$(DEV_BUILD) IS_ROOTFS=1 ./scripts/mk-initrd.sh $@
 
diff --git a/scripts/ci b/scripts/ci
index d21c059c..cacce980 100755
--- a/scripts/ci
+++ b/scripts/ci
@@ -3,4 +3,5 @@ set -ex
 
 cd $(dirname $0)/..
 
-dapper -k -O make DEV_BUILD=1 test
+dapper -O make ARCH=arm rootfs
+dapper -O make DEV_BUILD=1 test
diff --git a/selinux/selinux.go b/selinux/selinux_linux_amd64.go
similarity index 93%
rename from selinux/selinux.go
rename to selinux/selinux_linux_amd64.go
index 5a1cb2e9..e999ca33 100644
--- a/selinux/selinux.go
+++ b/selinux/selinux_linux_amd64.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package selinux
 
 // #cgo pkg-config: libselinux libsepol
diff --git a/selinux/selinux_linux_arm.go b/selinux/selinux_linux_arm.go
new file mode 100644
index 00000000..045a89c7
--- /dev/null
+++ b/selinux/selinux_linux_arm.go
@@ -0,0 +1,6 @@
+package selinux
+
+// InitializeSelinux is a stub for SELinux support on ARM
+func InitializeSelinux() (int, error) {
+	return 0, nil
+}