From a8dfd7089e1422c6cb34c5604678021ad6c69bd0 Mon Sep 17 00:00:00 2001
From: Ivan Mikushin <i.mikushin@gmail.com>
Date: Wed, 16 Mar 2016 10:52:05 -0700
Subject: [PATCH] Support SELinux on arm/arm64

---
 Dockerfile.dapper                                    | 5 ++++-
 build.conf.arm                                       | 2 +-
 build.conf.arm64                                     | 4 ++--
 selinux/{selinux_linux_amd64.go => selinux_linux.go} | 0
 selinux/selinux_linux_arm.go                         | 6 ------
 selinux/selinux_linux_arm64.go                       | 6 ------
 6 files changed, 7 insertions(+), 16 deletions(-)
 rename selinux/{selinux_linux_amd64.go => selinux_linux.go} (100%)
 delete mode 100644 selinux/selinux_linux_arm.go
 delete mode 100644 selinux/selinux_linux_arm64.go

diff --git a/Dockerfile.dapper b/Dockerfile.dapper
index b24b5a00..2407fff6 100644
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -40,7 +40,7 @@ RUN if [ "${TOOLCHAIN}" != "" ] && ! which ${TOOLCHAIN}-gcc; then \
 
 RUN if [ "${TOOLCHAIN}" != "" ]; then \
         cd /usr/local/src && \
-        for i in libselinux pcre3 util-linux; do \
+        for i in libselinux libsepol pcre3 util-linux; do \
             apt-get build-dep -y $i && \
             apt-get source -y $i \
         ;done \
@@ -57,6 +57,9 @@ RUN if [ "${TOOLCHAIN}" != "" ]; then \
 RUN if [ "${TOOLCHAIN}" != "" ]; then \
         cd /usr/local/src/libselinux-* && \
         CC=${TOOLCHAIN}-gcc CXX=${TOOLCHAIN}-g++ make CFLAGS=-Wall && \
+        make PREFIX=/usr/${TOOLCHAIN} DESTDIR=/usr/${TOOLCHAIN} install && \
+        cd /usr/local/src/libsepol-* && \
+        CC=${TOOLCHAIN}-gcc CXX=${TOOLCHAIN}-g++ make CFLAGS=-Wall && \
         make PREFIX=/usr/${TOOLCHAIN} DESTDIR=/usr/${TOOLCHAIN} install \
     ;fi
 
diff --git a/build.conf.arm b/build.conf.arm
index 9beea19a..e5ad46f2 100644
--- a/build.conf.arm
+++ b/build.conf.arm
@@ -2,4 +2,4 @@ DAPPER_BASE=armhf/ubuntu:16.04
 TOOLCHAIN=arm-linux-gnueabihf
 
 COMPILED_KERNEL_URL= #empty
-DOCKER_BINARY_URL=https://github.com/rancher/docker/releases/download/v1.10.3-arm/docker-1.10.3_arm
+DOCKER_BINARY_URL=https://github.com/rancher/docker/releases/download/v1.10.3-ros1/docker-1.10.3_arm
diff --git a/build.conf.arm64 b/build.conf.arm64
index 0606ffc3..e2374538 100644
--- a/build.conf.arm64
+++ b/build.conf.arm64
@@ -1,5 +1,5 @@
 DAPPER_BASE=aarch64/ubuntu:16.04
 TOOLCHAIN=aarch64-linux-gnu
 
-COMPILED_KERNEL_URL=https://github.com/imikushin/os-kernel/releases/download/Estuary-4.1.18-arm64/linux-4.1.18-arm64.tar.gz
-DOCKER_BINARY_URL=https://github.com/rancher/docker/releases/download/v1.10.3-arm/docker-1.10.3_arm64
+COMPILED_KERNEL_URL=https://github.com/imikushin/os-kernel/releases/download/Estuary-4.1.18-arm64-3/linux-4.1.18-arm64.tar.gz
+DOCKER_BINARY_URL=https://github.com/rancher/docker/releases/download/v1.10.3-ros1/docker-1.10.3_arm64
diff --git a/selinux/selinux_linux_amd64.go b/selinux/selinux_linux.go
similarity index 100%
rename from selinux/selinux_linux_amd64.go
rename to selinux/selinux_linux.go
diff --git a/selinux/selinux_linux_arm.go b/selinux/selinux_linux_arm.go
deleted file mode 100644
index 045a89c7..00000000
--- a/selinux/selinux_linux_arm.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package selinux
-
-// InitializeSelinux is a stub for SELinux support on ARM
-func InitializeSelinux() (int, error) {
-	return 0, nil
-}
diff --git a/selinux/selinux_linux_arm64.go b/selinux/selinux_linux_arm64.go
deleted file mode 100644
index ab4b38b0..00000000
--- a/selinux/selinux_linux_arm64.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package selinux
-
-// InitializeSelinux is a stub for SELinux support on ARM64
-func InitializeSelinux() (int, error) {
-	return 0, nil
-}