1
0
mirror of https://github.com/rancher/os.git synced 2025-07-17 08:31:02 +00:00

Repair build for arm

and make sure CI breaks if arm is broken
This commit is contained in:
Ivan Mikushin 2016-02-25 11:17:21 -08:00
parent a60d9059d4
commit ac1b6a6797
5 changed files with 11 additions and 5 deletions

View File

@ -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

View File

@ -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 $@

View File

@ -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

View File

@ -1,5 +1,3 @@
// +build linux
package selinux
// #cgo pkg-config: libselinux libsepol

View File

@ -0,0 +1,6 @@
package selinux
// InitializeSelinux is a stub for SELinux support on ARM
func InitializeSelinux() (int, error) {
return 0, nil
}