Merge remote-tracking branch 'origin/baserock/samthursfield/trove-public-urls'

Reviewed-By: Lars Wirzenius <lars.wirzenius@codethink.co.uk>

4 files changed, 72 insertions, 9 deletions

diff --git a/armv7lhf-cross-toolchain-system-x86_32-generic.morph b/armv7lhf-cross-toolchain-system-x86_32-generic.morph
new file mode 100644
index 00000000..ec5ca68f
--- /dev/null
+++ b/armv7lhf-cross-toolchain-system-x86_32-generic.morph
@@ -0,0 +1,13 @@
+name: armv7lhf-cross-toolchain-system-x86_32-generic
+kind: system
+arch: x86_32
+description: A system that contains an ARM cross compiler, intended to be used as a sysroot.
+strata:
+- morph: build-essential
+- morph: armv7lhf-cross-toolchain
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/armv7lhf-cross-toolchain-system-x86_64-generic.morph b/armv7lhf-cross-toolchain-system-x86_64-generic.morph
new file mode 100644
index 00000000..c8f53721
--- /dev/null
+++ b/armv7lhf-cross-toolchain-system-x86_64-generic.morph
@@ -0,0 +1,13 @@
+name: armv7lhf-cross-toolchain-system-x86_64-generic
+kind: system
+arch: x86_64
+description: A system that contains an ARM cross compiler, intended to be used as a sysroot.
+strata:
+- morph: build-essential
+- morph: armv7lhf-cross-toolchain
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/armv7lhf-cross-toolchain.morph b/armv7lhf-cross-toolchain.morph
new file mode 100644
index 00000000..e2a36229
--- /dev/null
+++ b/armv7lhf-cross-toolchain.morph
@@ -0,0 +1,37 @@
+name: armv7lhf-cross-toolchain
+kind: stratum
+description: Stratum for building an armv7lhf cross compiler for your native system.
+build-depends:
+- morph: build-essential
+chunks:
+- name: armv7lhf-cross-binutils
+  repo: upstream:binutils-redhat
+  ref: baserock/richardmaw/S10442/cross-toolchain
+  unpetrify-ref: baserock/build-essential
+  build-depends: []
+- name: armv7lhf-cross-linux-api-headers
+  repo: upstream:linux
+  ref: baserock/richardmaw/S10442/cross-toolchain
+  unpetrify-ref: baserock/build-essential
+  build-depends: []
+- name: armv7lhf-cross-gcc-nolibc
+  repo: upstream:gcc-tarball
+  ref: baserock/richardmaw/S10442/cross-toolchain
+  unpetrify-ref: baserock/build-essential
+  build-depends:
+  - armv7lhf-cross-binutils
+- name: armv7lhf-cross-eglibc
+  repo: upstream:eglibc2
+  ref: baserock/richardmaw/S10442/cross-toolchain
+  unpetrify-ref: baserock/2.15-build-essential
+  build-depends:
+  - armv7lhf-cross-binutils
+  - armv7lhf-cross-gcc-nolibc
+  - armv7lhf-cross-linux-api-headers
+- name: armv7lhf-cross-gcc
+  repo: upstream:gcc-tarball
+  ref: baserock/richardmaw/S10442/cross-toolchain
+  unpetrify-ref: baserock/build-essential
+  build-depends:
+  - armv7lhf-cross-binutils
+  - armv7lhf-cross-eglibc
diff --git a/trove.configure b/trove.configure
index 38a5d614..17686eb3 100755
--- a/trove.configure
+++ b/trove.configure
@@ -61,16 +61,16 @@ lua_escape()
 
 echo "Create /etc/trove-setup.sed for trove-early-setup"
 cat <<EOF > "$ROOT/etc/trove-setup.sed"
-s/##TROVE_HOSTNAME##/$TROVE_ID/
-s/##MASON_HOST##/$MASON_ID/
-s/##MASON_PORT##/18755/
-s/##TROVE_TITLE##/$TROVE_ID/
-s/##TROVE_COMPANY##/$TROVE_COMPANY/
-s/##TROVE_LOG_PREFIX##/$TROVE_ID/
-s/##ESC_PERSONAL_PREFIX##/people/
-s/##PREFIX##/$TROVE_ID/
+s/##TROVE_HOSTNAME##/$TROVE_ID/g
+s/##MASON_HOST##/$MASON_ID/g
+s/##MASON_PORT##/18755/g
+s/##TROVE_TITLE##/$TROVE_ID/g
+s/##TROVE_COMPANY##/$TROVE_COMPANY/g
+s/##TROVE_LOG_PREFIX##/$TROVE_ID/g
+s/##ESC_PERSONAL_PREFIX##/people/g
+s/##PREFIX##/$TROVE_ID/g
 ## The same prefix as above, only lua-pattern-escaped
-s/##ESC_PREFIX##/$(lua_escape "$TROVE_ID")/
+s/##ESC_PREFIX##/$(lua_escape "$TROVE_ID")/g
 EOF
 
 ##########################################################################