summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-09-30 10:46:22 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-09-30 10:46:22 +0000
commitb12b320e86a54d69aa9661f5bff95dfcac2c8b78 (patch)
treeca245e371ca040a6c86844bec33bd6fd7c9813a4
parentedf589f356930ab47a04fec39bfcf55bac10329c (diff)
parent02c02a6eb6b8a577d8a684d039c529e449646c8b (diff)
downloaddefinitions-b12b320e86a54d69aa9661f5bff95dfcac2c8b78.tar.gz
Merge branch 'baserock/sam/mason-deploy-fix'
-rw-r--r--clusters/jetson-upgrade.morph3
-rw-r--r--distbuild.configure3
-rw-r--r--mason.configure7
-rw-r--r--strata/armv7lhf-cross-toolchain.morph4
-rw-r--r--strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph1
-rw-r--r--strata/build-essential.morph8
-rw-r--r--strata/build-essential/linux-api-headers.morph1
-rw-r--r--strata/build-essential/stage2-linux-api-headers.morph1
-rw-r--r--strata/core.morph4
9 files changed, 13 insertions, 19 deletions
diff --git a/clusters/jetson-upgrade.morph b/clusters/jetson-upgrade.morph
index e378cca5..59f7155f 100644
--- a/clusters/jetson-upgrade.morph
+++ b/clusters/jetson-upgrade.morph
@@ -1,7 +1,7 @@
name: jetson-upgrade
kind: cluster
systems:
-- morph: devel-system-armv7lhf-jetson
+- morph: systems/devel-system-armv7lhf-jetson.morph
deploy-defaults:
TROVE_HOST: TROVE_HOST
TROVE_ID: TROVE_ID
@@ -15,4 +15,3 @@ systems:
jetson:
type: ssh-rsync
location: root@localhost
- HOSTNAME: baserock-jetson
diff --git a/distbuild.configure b/distbuild.configure
index 79148106..d9b9fb8a 100644
--- a/distbuild.configure
+++ b/distbuild.configure
@@ -40,13 +40,12 @@
set -e
-set -u
-
if [ -n "$DISTBUILD_GENERIC" ]; then
echo "Not configuring the distbuild node, it will be generic"
exit 0
fi
+set -u
# Check that all the variables needed are present:
diff --git a/mason.configure b/mason.configure
index 4341d8c0..4d11feb4 100644
--- a/mason.configure
+++ b/mason.configure
@@ -102,19 +102,18 @@ mkdir -p "$MASON_DATA"
python <<'EOF' >"$MASON_DATA/mason.conf"
import os, sys, yaml
-trove_configuration={
- 'ARTIFACT_CACHE_SERVIER': os.environ['ARTIFACT_CACHE_SERVER'],
+mason_configuration={
+ 'ARTIFACT_CACHE_SERVER': os.environ['ARTIFACT_CACHE_SERVER'],
'MASON_CLUSTER_MORPHOLOGY': os.environ['MASON_CLUSTER_MORPHOLOGY'],
'MASON_DEFINITIONS_REF': os.environ['MASON_DEFINITIONS_REF'],
'MASON_DISTBUILD_ARCH': os.environ['MASON_DISTBUILD_ARCH'],
'MASON_TEST_HOST': os.environ['MASON_TEST_HOST'],
- 'TROVE_ADMIN_NAME': os.environ['TROVE_ADMIN_NAME'],
'TROVE_ID': os.environ['TROVE_ID'],
'TROVE_HOST': os.environ['TROVE_HOST'],
'CONTROLLERHOST': os.environ['CONTROLLERHOST'],
}
-yaml.dump(trove_configuration, sys.stdout, default_flow_style=False)
+yaml.dump(mason_configuration, sys.stdout, default_flow_style=False)
EOF
diff --git a/strata/armv7lhf-cross-toolchain.morph b/strata/armv7lhf-cross-toolchain.morph
index 0e2f7922..c76ae537 100644
--- a/strata/armv7lhf-cross-toolchain.morph
+++ b/strata/armv7lhf-cross-toolchain.morph
@@ -13,8 +13,8 @@ chunks:
- name: armv7lhf-cross-linux-api-headers
morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph
repo: upstream:linux
- ref: eff825d6e284eb0fb04b434429a3e3b2e10cabf8
- unpetrify-ref: baserock/build-essential
+ ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa
+ unpetrify-ref: baserock/v3.8
build-depends: []
- name: armv7lhf-cross-gcc-nolibc
morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph
diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph
index 351134b7..c2654419 100644
--- a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph
+++ b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph
@@ -1,7 +1,6 @@
name: armv7lhf-cross-linux-api-headers
kind: chunk
install-commands:
-- make mrproper
- ARCH=arm make INSTALL_HDR_PATH=dest headers_install
- |
# Copy headers to the sysroot where the eglibc build will find them,
diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index 3918a13e..7886b610 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -58,8 +58,8 @@ chunks:
- name: stage2-linux-api-headers
morph: strata/build-essential/stage2-linux-api-headers.morph
repo: upstream:linux
- ref: eff825d6e284eb0fb04b434429a3e3b2e10cabf8
- unpetrify-ref: baserock/build-essential
+ ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa
+ unpetrify-ref: baserock/v3.8
build-depends:
- stage1-binutils
- stage1-gcc
@@ -181,8 +181,8 @@ chunks:
- name: linux-api-headers
morph: strata/build-essential/linux-api-headers.morph
repo: upstream:linux
- ref: eff825d6e284eb0fb04b434429a3e3b2e10cabf8
- unpetrify-ref: baserock/build-essential
+ ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa
+ unpetrify-ref: baserock/v3.8
build-depends:
- stage2-binutils
- stage2-busybox
diff --git a/strata/build-essential/linux-api-headers.morph b/strata/build-essential/linux-api-headers.morph
index d28b0905..e1ff2638 100644
--- a/strata/build-essential/linux-api-headers.morph
+++ b/strata/build-essential/linux-api-headers.morph
@@ -1,7 +1,6 @@
name: linux-api-headers
kind: chunk
install-commands:
-- make mrproper
- ARCH=$(./morph-arch) make INSTALL_HDR_PATH=dest headers_install
- install -d "$DESTDIR${PREFIX-/usr}/include"
- cp -r dest/include/* "$DESTDIR/${PREFIX-/usr}/include"
diff --git a/strata/build-essential/stage2-linux-api-headers.morph b/strata/build-essential/stage2-linux-api-headers.morph
index e7d1f8ed..5cbf2f05 100644
--- a/strata/build-essential/stage2-linux-api-headers.morph
+++ b/strata/build-essential/stage2-linux-api-headers.morph
@@ -1,7 +1,6 @@
name: stage2-linux-api-headers
kind: chunk
install-commands:
-- make mrproper
- |
export ARCH=$(./morph-arch)
make INSTALL_HDR_PATH=dest headers_install
diff --git a/strata/core.morph b/strata/core.morph
index 4c6a23bf..14bdf717 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -13,8 +13,8 @@ chunks:
- name: cmake
morph: strata/core/cmake.morph
repo: upstream:cmake
- ref: 99c4f0a49237633372f218a44e3503e0a2bddae6
- unpetrify-ref: baserock/morph
+ ref: 0b3781e4c497566acaa504d4106d11c02a642501
+ unpetrify-ref: v2.8.12.2
build-depends: []
- name: gdbm
morph: strata/core/gdbm.morph