Merge branch 'master' of git://git.baserock.org/baserock/baserock/definitions

6 files changed, 50 insertions, 11 deletions

diff --git a/armv7lhf-cross-toolchain.morph b/armv7lhf-cross-toolchain.morph
index 8d21fa6c..37553c6c 100644
--- a/armv7lhf-cross-toolchain.morph
+++ b/armv7lhf-cross-toolchain.morph
@@ -16,7 +16,7 @@ chunks:
   build-depends: []
 - name: armv7lhf-cross-gcc-nolibc
   repo: upstream:gcc-tarball
-  ref: dd78b627480ed8d3c135271cd627096ae76fa5fc
+  ref: 0a1a077d3466cd99a4ed5590db2146b3fec6fff1
   unpetrify-ref: baserock/build-essential
   build-depends:
   - armv7lhf-cross-binutils
@@ -30,8 +30,8 @@ chunks:
   - armv7lhf-cross-linux-api-headers
 - name: armv7lhf-cross-gcc
   repo: upstream:gcc-tarball
-  ref: dd78b627480ed8d3c135271cd627096ae76fa5fc
-  unpetrify-ref: baserock/build-essential
+  ref: b0254026149b13782eae26d38435a4c62a002cf0
+  unpetrify-ref: baserock/build-essential-4.7
   build-depends:
   - armv7lhf-cross-binutils
   - armv7lhf-cross-eglibc
diff --git a/build-essential.morph b/build-essential.morph
index 628fffcb..7729611b 100644
--- a/build-essential.morph
+++ b/build-essential.morph
@@ -46,7 +46,7 @@ chunks:
   prefix: /tools
 - name: stage1-gcc
   repo: upstream:gcc-tarball
-  ref: dd78b627480ed8d3c135271cd627096ae76fa5fc
+  ref: 0a1a077d3466cd99a4ed5590db2146b3fec6fff1
   unpetrify-ref: baserock/build-essential
   build-depends:
   - stage1-binutils
@@ -83,7 +83,7 @@ chunks:
   prefix: /tools
 - name: stage2-gcc-fixed-headers
   repo: upstream:gcc-tarball
-  ref: dd78b627480ed8d3c135271cd627096ae76fa5fc
+  ref: 0a1a077d3466cd99a4ed5590db2146b3fec6fff1
   unpetrify-ref: baserock/build-essential
   build-depends:
   - stage1-binutils
@@ -93,7 +93,7 @@ chunks:
   prefix: /tools
 - name: stage2-gcc
   repo: upstream:gcc-tarball
-  ref: dd78b627480ed8d3c135271cd627096ae76fa5fc
+  ref: 0a1a077d3466cd99a4ed5590db2146b3fec6fff1
   unpetrify-ref: baserock/build-essential
   build-depends:
   - stage1-binutils
@@ -276,8 +276,8 @@ chunks:
   prefix: /usr
 - name: gcc
   repo: upstream:gcc-tarball
-  ref: 088b7ab28fe53b198ec5c4eaba0f54176c4c35a0
-  unpetrify-ref: baserock/build-essential
+  ref: b0254026149b13782eae26d38435a4c62a002cf0
+  unpetrify-ref: baserock/build-essential-4.7
   build-depends:
   - stage2-binutils
   - stage2-busybox
diff --git a/nodejs-system-x86_64.morph b/nodejs-system-x86_64.morph
new file mode 100644
index 00000000..876f1432
--- /dev/null
+++ b/nodejs-system-x86_64.morph
@@ -0,0 +1,28 @@
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+description: A system that is able to build other systems based on the 64-bit x86
+  architecture.
+kind: system
+name: nodejs-system-x86_64
+strata:
+- morph: build-essential
+- morph: core
+- morph: foundation
+- morph: genivi-foundation
+- morph: bsp-x86_64-generic
+- morph: connectivity
+- morph: audio-bluetooth
+- morph: x-common
+- morph: x-x86_64-generic
+- morph: multimedia
+- morph: genivi
+- morph: genivi-x-x86_64-generic
+- morph: tools
+- morph: virtualization
+- morph: glanceclient
+- morph: nodejs
diff --git a/nodejs.morph b/nodejs.morph
new file mode 100644
index 00000000..aece2d2a
--- /dev/null
+++ b/nodejs.morph
@@ -0,0 +1,11 @@
+name: nodejs
+kind: stratum
+description: Stratum for nodejs related stuff
+build-depends:
+- morph: core
+chunks:
+- name: node
+  repo: upstream:node
+  ref: cc56c62ed879ad4f93b1fdab3235c43e60f48b7e
+  unpetrify-ref: v0.10.26
+  build-depends: []
diff --git a/tools.morph b/tools.morph
index a74095e5..8004c79c 100644
--- a/tools.morph
+++ b/tools.morph
@@ -51,7 +51,7 @@ chunks:
   build-depends: []
 - name: distcc
   repo: upstream:distcc
-  ref: 2f422c03925e82bf88b05da823813073a985b0e5
+  ref: c9691a9604fdf9d6711204999787d332b7141692
   unpetrify-ref: baserock/morph
   build-depends: []
 - name: e2fsprogs
@@ -92,7 +92,7 @@ chunks:
   - six
 - name: morph
   repo: baserock:baserock/morph
-  ref: 2c682e6192b86eccaa869c23d82cde81b4ea42d4
+  ref: 9ea146fdcfbe9b93b297165b1b5222e1eadb9d23
   unpetrify-ref: master
   build-depends:
   - cliapp
diff --git a/virtualization.morph b/virtualization.morph
index 4300b627..33e662b4 100644
--- a/virtualization.morph
+++ b/virtualization.morph
@@ -27,7 +27,7 @@ chunks:
   - lvm2
 - name: qemu
   repo: upstream:qemu
-  ref: 5e4eac434b4ff85af2a8821cce8a4ef2b12d8e5e
+  ref: f8d1fb61e65575011a67d7ba97b690feb5630c91
   unpetrify-ref: baserock/morph
   build-depends: []
 - name: xorg-util-macros