summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sherwood <paul.sherwood@codethink.co.uk>2014-11-18 08:55:16 (GMT)
committerPaul Sherwood <paul.sherwood@codethink.co.uk>2014-11-18 08:55:16 (GMT)
commit2047757886509d4b2530a6f1d0c32be4a6758ca0 (patch)
treeec9b754a994b7af83d8b24b3d94b025cd6b9d855
parent74d8b48f51d99862f8d68ae8a655d72d61f4d497 (diff)
downloaddefinitions-baserock/ps/docker.tar.gz
Add go, docker to devel x86_64baserock/ps/docker
-rw-r--r--strata/bsp-x86_64-generic/linux-x86-64-generic.morph11
-rw-r--r--strata/go-docker.morph23
-rw-r--r--strata/go-docker/docker.morph12
-rw-r--r--strata/go-docker/go.morph16
-rw-r--r--systems/devel-system-x86_64-generic.morph2
5 files changed, 64 insertions, 0 deletions
diff --git a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph
index fe0721c..c72a3cf 100644
--- a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph
+++ b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph
@@ -80,6 +80,17 @@ configure-commands:
- scripts/config -e HOTPLUG_PCI_ACPI
- scripts/config -e VLAN_8021Q
- scripts/config -e BRIDGE_VLAN_FILTERING
+- scripts/config -e DEVPTS_MULTIPLE_INSTANCES
+- scripts/config -e VETH
+- scripts/config -e CGROUP_DEVICE
+- scripts/config -e MACVLAN
+- scripts/config -e NF_NAT_NEEDED
+- scripts/config -e NETFILTER_ADVANCED
+- scripts/config -e NETFILTER_XT_MATCH_ADDRTYPE
+- scripts/config -e NETFILTER_XT_MATCH_CONNTRACK
+- scripts/config -e MEMCG_SWAP
+- scripts/config -e AUFS_FS
+- scripts/config -e DM_THIN_PROVISIONING
- yes '' | make oldconfig
build-commands:
- make $MAKEFLAGS
diff --git a/strata/go-docker.morph b/strata/go-docker.morph
new file mode 100644
index 0000000..1beddab
--- /dev/null
+++ b/strata/go-docker.morph
@@ -0,0 +1,23 @@
+name: go-docker
+kind: stratum
+build-depends:
+- morph: strata/tools.morph
+chunks:
+- name: go
+ repo: upstream:go
+ morph: strata/go-docker/go.morph
+ ref: 536a6e6905993f1270f7a8b742352ce832cbf144
+ unpetrify-ref: go1.3.3
+ build-depends: []
+- name: docker
+ repo: upstream:docker
+ morph: strata/go-docker/docker.morph
+ ref: c78088fe3d1b90640c637d8c3457de3caa0c7a24
+ unpetrify-ref: v1.3.0
+ build-depends:
+ - go
+- name: iptables
+ repo: upstream:iptables
+ ref: 3e6fa55d5e28c93f417afeae7a7d4f349ddffcf4
+ unpetrify-ref: baserock/morph
+ build-depends: []
diff --git a/strata/go-docker/docker.morph b/strata/go-docker/docker.morph
new file mode 100644
index 0000000..388f014
--- /dev/null
+++ b/strata/go-docker/docker.morph
@@ -0,0 +1,12 @@
+name: docker
+kind: chunk
+build-commands:
+- |
+ export AUTO_GOPATH=1
+ export DOCKER_BUILDTAGS='exclude_graphdriver_devicemapper'
+ export TMPDIR=/tmp
+ ./hack/make.sh binary
+install-commands:
+- mkdir -p "$DESTDIR$PREFIX/bin"
+- install -D bundles/*/binary/docker "$DESTDIR$PREFIX/bin/docker"
+- install -D contrib/check-config.sh "$DESTDIR$PREFIX/bin"
diff --git a/strata/go-docker/go.morph b/strata/go-docker/go.morph
new file mode 100644
index 0000000..24790bd
--- /dev/null
+++ b/strata/go-docker/go.morph
@@ -0,0 +1,16 @@
+name: go
+kind: chunk
+build-commands:
+- |
+ export GOROOT_FINAL="$PREFIX/lib/go"
+ export TMPDIR=/tmp
+ cd src && bash ./make.bash
+install-commands:
+- mkdir -p "$DESTDIR$PREFIX/lib/go"
+- cp -r bin "$DESTDIR$PREFIX/lib/go"
+- cp -r lib "$DESTDIR$PREFIX/lib/go"
+- cp -r src "$DESTDIR$PREFIX/lib/go"
+- cp -r pkg "$DESTDIR$PREFIX/lib/go"
+- mkdir -p "$DESTDIR$PREFIX/bin"
+- ln -s "$PREFIX/lib/go/bin/go" "$DESTDIR$PREFIX/bin/go"
+
diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph
index 969f32b..d20d1f1 100644
--- a/systems/devel-system-x86_64-generic.morph
+++ b/systems/devel-system-x86_64-generic.morph
@@ -28,6 +28,8 @@ strata:
morph: strata/ruby.morph
- name: nfs
morph: strata/nfs.morph
+- name: go-docker
+ morph: strata/go-docker.morph
configuration-extensions:
- set-hostname
- add-config-files