From 8600f34687064b49ad8ec84a5ec4b6ba6fb6c921 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Fri, 5 Sep 2014 10:08:02 +0000 Subject: go-docker: Bring chunk morphs into definitions --- go-docker.morph | 19 ------------------- strata/go-docker.morph | 21 +++++++++++++++++++++ strata/go-docker/docker.morph | 10 ++++++++++ strata/go-docker/go.morph | 12 ++++++++++++ 4 files changed, 43 insertions(+), 19 deletions(-) delete mode 100644 go-docker.morph create mode 100644 strata/go-docker.morph create mode 100644 strata/go-docker/docker.morph create mode 100644 strata/go-docker/go.morph diff --git a/go-docker.morph b/go-docker.morph deleted file mode 100644 index c32c2a2b..00000000 --- a/go-docker.morph +++ /dev/null @@ -1,19 +0,0 @@ -name: go-docker -kind: stratum -build-depends: -- morph: tools -chunks: -- name: go - repo: upstream:go - ref: baserock/go1.2.2 - build-depends: [] -- name: docker - repo: upstream:docker - ref: baserock/ps/add-go-docker - build-depends: - - go -- name: iptables - repo: upstream:iptables - ref: 3e6fa55d5e28c93f417afeae7a7d4f349ddffcf4 - unpetrify-ref: baserock/morph - build-depends: [] diff --git a/strata/go-docker.morph b/strata/go-docker.morph new file mode 100644 index 00000000..fb4533fb --- /dev/null +++ b/strata/go-docker.morph @@ -0,0 +1,21 @@ +name: go-docker +kind: stratum +build-depends: +- morph: strata/tools.morph +chunks: +- name: go + morph: strata/go-docker/go.morph + repo: upstream:go + ref: baserock/go1.2.2 + build-depends: [] +- name: docker + morph: strata/go-docker/docker.morph + repo: upstream:docker + ref: baserock/ps/add-go-docker + 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 00000000..0247e191 --- /dev/null +++ b/strata/go-docker/docker.morph @@ -0,0 +1,10 @@ +name: docker +kind: chunk +build-commands: +- export AUTO_GOPATH=1 && export DOCKER_BUILDTAGS='exclude_graphdriver_devicemapper' && export TMPDIR=/tmp && ./hack/make.sh binary +#- export DOCKER_CLIENTONLY=1 +#- ./hack/make.sh dynbinary +install-commands: +- mkdir -p "$DESTDIR$PREFIX/bin" +- cp ./bundles/*/binary/docker "$DESTDIR$PREFIX/bin/docker" +- cp ./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 00000000..b3ddcda0 --- /dev/null +++ b/strata/go-docker/go.morph @@ -0,0 +1,12 @@ +name: go +kind: chunk +build-commands: +- export GOROOT_FINAL="$PREFIX/lib/go" && export TMPDIR=/tmp && cd src && bash ./all.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" -- cgit v1.2.1