summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Ipsum <richard.ipsum@codethink.co.uk>2014-07-18 18:42:13 +0100
committerRichard Ipsum <richard.ipsum@codethink.co.uk>2014-07-18 18:42:13 +0100
commitb8c8958a7ccc58c99e30f2fedd349c20e2b7a994 (patch)
tree425700fe8638efe30f8fde95843b70e3e8b8732c
parent3c590894ff76c070360536868486f7398331fc9d (diff)
parent11c48d7b87dcb5ce63fcb6f1111167930c45f1ac (diff)
downloaddefinitions-b8c8958a7ccc58c99e30f2fedd349c20e2b7a994.tar.gz
Merge branch 'baserock/richardipsum/tegra-distbuild-system'
-rw-r--r--distbuild-system-armv7lhf-jetson.morph20
-rw-r--r--distbuild.configure23
2 files changed, 35 insertions, 8 deletions
diff --git a/distbuild-system-armv7lhf-jetson.morph b/distbuild-system-armv7lhf-jetson.morph
new file mode 100644
index 00000000..4bc4102a
--- /dev/null
+++ b/distbuild-system-armv7lhf-jetson.morph
@@ -0,0 +1,20 @@
+arch: armv7lhf
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- distbuild
+- fstab
+description: Morph distributed build node for armv7lhf jetson
+kind: system
+name: distbuild-system-armv7lhf-jetson
+strata:
+- morph: build-essential
+- morph: core
+- morph: foundation
+- morph: bsp-jetson-devel
+- morph: tools
+- morph: nfs
+- morph: distbuild
diff --git a/distbuild.configure b/distbuild.configure
index e565085b..6c298967 100644
--- a/distbuild.configure
+++ b/distbuild.configure
@@ -52,7 +52,6 @@ set -u
# Create the mount point for extra disk space.
install -d -o 0 -g 0 -m 0755 "$1/srv/distbuild"
-
# Configuration shared by all instances of Morph. For reasons of
# convenience, this sets the controller-initiator-address, so
# that when users invoke "morph", they don't need to manually
@@ -63,7 +62,7 @@ install -d -o 0 -g 0 -m 0755 "$1/srv/distbuild"
cat <<EOF > "$1/etc/morph.conf"
[config]
-log = /var/log/morph.log
+log = /srv/distbuild/morph.log
log-max = 100M
cachedir = /srv/distbuild
tempdir = /srv/distbuild/tmp
@@ -77,6 +76,7 @@ artifact-cache-server = http://$ARTIFACT_CACHE_SERVER:8080/
git-resolve-cache-server = http://$TROVE_HOST:8080/
EOF
+ln -s /srv/distbuild/morph.log "$1/var/log/morph.log"
# Configuration for a distbuild controller. This configuration
# file gets used by the systemd unit that runs the controller.
@@ -88,24 +88,28 @@ if [ "$DISTBUILD_CONTROLLER" = True ]
then
cat <<EOF > "$1/etc/morph-controller.conf"
[config]
-log = /var/log/morph-controller.log
+log = /srv/distbuild/morph-controller.log
log-max = 100M
writeable-cache-server = http://$ARTIFACT_CACHE_SERVER:8081/
worker = $WORKERS
controller-helper-address = 127.0.0.1
EOF
-
+
+ln -s /srv/distbuild/morph-controller.log "$1/var/log/morph-controller.log"
+
# Configuration for the controller's helper process. This
# gets used by the systemd unit that starts the helper.
cat <<EOF > "$1/etc/morph-controller-helper.conf"
[config]
-log = /var/log/morph-controller-helper.log
+log = /srv/distbuild/morph-controller-helper.log
log-max = 100M
parent-port = 5656
parent-address = 127.0.0.1
EOF
+ln -s /srv/distbuild/morph-controller-helper.log "$1/var/log/morph-controller-helper.log"
+
fi
# Configuration for a distbuild worker. This gets reference
@@ -118,12 +122,14 @@ if [ "$DISTBUILD_WORKER" = True ]
then
cat <<EOF > "$1/etc/morph-worker.conf"
[config]
-log = /var/log/morph-worker.log
+log = /srv/distbuild/morph-worker.log
log-max = 100M
controller-initiator-address =
EOF
- # This will be used for a systemd generator which
+ln -s /srv/distbuild/morph-worker.log "$1/var/log/morph-worker.log"
+
+ # This will be used for a systemd generator which
# nfs mounts the ccache from the trove
echo "$TROVE_HOST" > "$1/etc/trove-host"
@@ -132,11 +138,12 @@ EOF
cat <<EOF > "$1/etc/morph-worker-helper.conf"
[config]
-log = /var/log/morph-worker-helper.log
+log = /srv/distbuild/morph-worker-helper.log
log-max = 100M
parent-address = 127.0.0.1
EOF
+ln -s /srv/distbuild/morph-worker-helper.log "$1/var/log/morph-worker-helper.log"
# Configuration for the Morph cache server daemon. We
# only run the cache server on workers.