diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-11-05 13:57:33 +0000 |
---|---|---|
committer | Morph (on behalf of Lars Wirzenius) <lars.wirzenius@codethink.co.uk> | 2013-11-05 13:57:33 +0000 |
commit | c758c3f6130c5e834f2b70f956fee2a2997079d3 (patch) | |
tree | a7eeca42cf299437962b4e22c65609f914531a2d | |
parent | a7e7ca3194a4b0165ad581097174c46fb07bbfb6 (diff) | |
download | morphs-c758c3f6130c5e834f2b70f956fee2a2997079d3.tar.gz |
Morph build 81a8436bf25b47f9a67e53104f7c78fb
System branch: master
-rw-r--r-- | audio-bluetooth.morph | 2 | ||||
-rw-r--r-- | connectivity.morph | 2 | ||||
-rw-r--r-- | devel-system-x86_64-generic.morph | 28 | ||||
-rw-r--r-- | enlightenment.morph | 12 | ||||
-rw-r--r-- | genivi-foundation.morph | 4 | ||||
-rw-r--r-- | genivi-x-x86_64-generic.morph | 10 | ||||
-rw-r--r-- | genivi.morph | 6 | ||||
-rw-r--r-- | glanceclient.morph | 12 | ||||
-rw-r--r-- | lua.morph | 2 | ||||
-rw-r--r-- | multimedia-gstreamer-0.10.morph | 6 | ||||
-rw-r--r-- | multimedia.morph | 6 | ||||
-rw-r--r-- | qt5-devel-system-x86_64-generic.morph | 28 | ||||
-rw-r--r-- | qt5-sdk.morph | 2 | ||||
-rw-r--r-- | qt5-tools.morph | 6 | ||||
-rw-r--r-- | tools.morph | 10 | ||||
-rw-r--r-- | x-common.morph | 2 | ||||
-rw-r--r-- | x-x86_64-generic.morph | 2 |
17 files changed, 72 insertions, 68 deletions
diff --git a/audio-bluetooth.morph b/audio-bluetooth.morph index e784a77..0c7e0da 100644 --- a/audio-bluetooth.morph +++ b/audio-bluetooth.morph @@ -6,7 +6,7 @@ build-depends: ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs - morph: genivi-foundation - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs chunks: - build-depends: [] diff --git a/connectivity.morph b/connectivity.morph index b6c7890..2396253 100644 --- a/connectivity.morph +++ b/connectivity.morph @@ -6,7 +6,7 @@ build-depends: ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs - morph: genivi-foundation - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs chunks: - build-depends: [] diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph index b730087..dd65d7c 100644 --- a/devel-system-x86_64-generic.morph +++ b/devel-system-x86_64-generic.morph @@ -12,44 +12,44 @@ kind: system name: devel-system-x86_64-generic strata: - morph: build-essential - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs - morph: core - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs - morph: foundation - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs - morph: genivi-foundation - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs - morph: bsp-x86_64-generic - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs - morph: connectivity - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs - morph: audio-bluetooth - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs - morph: x-common - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs - morph: x-x86_64-generic - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs - morph: multimedia - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs - morph: genivi - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs - morph: genivi-x-x86_64-generic - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs - morph: tools - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs - morph: glanceclient - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs diff --git a/enlightenment.morph b/enlightenment.morph index d037652..0eb47e6 100644 --- a/enlightenment.morph +++ b/enlightenment.morph @@ -1,21 +1,21 @@ build-depends: - morph: tools - ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 + ref: master repo: baserock:baserock/morphs - morph: x-x86_64-generic - ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 + ref: master repo: baserock:baserock/morphs - morph: lua - ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 + ref: master repo: baserock:baserock/morphs - morph: audio-bluetooth - ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 + ref: master repo: baserock:baserock/morphs - morph: multimedia-gstreamer-0.10 - ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 + ref: master repo: baserock:baserock/morphs - morph: connectivity - ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 + ref: master repo: baserock:baserock/morphs chunks: - build-depends: [] diff --git a/genivi-foundation.morph b/genivi-foundation.morph index 39b5efa..37ece70 100644 --- a/genivi-foundation.morph +++ b/genivi-foundation.morph @@ -1,9 +1,9 @@ build-depends: - morph: core - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs - morph: foundation - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs chunks: - build-depends: [] diff --git a/genivi-x-x86_64-generic.morph b/genivi-x-x86_64-generic.morph index b3f475e..003f269 100644 --- a/genivi-x-x86_64-generic.morph +++ b/genivi-x-x86_64-generic.morph @@ -1,18 +1,18 @@ build-depends: - morph: core - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs - morph: foundation - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs - morph: genivi-foundation - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs - morph: genivi - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs - morph: x-x86_64-generic - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs chunks: - build-depends: [] diff --git a/genivi.morph b/genivi.morph index 6b14901..204dbc6 100644 --- a/genivi.morph +++ b/genivi.morph @@ -1,12 +1,12 @@ build-depends: - morph: core - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs - morph: foundation - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs - morph: genivi-foundation - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs chunks: - build-depends: [] diff --git a/glanceclient.morph b/glanceclient.morph index 0ed5edb..d9e06a6 100644 --- a/glanceclient.morph +++ b/glanceclient.morph @@ -1,19 +1,15 @@ build-depends: - morph: build-essential - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs - morph: core - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs - morph: tools - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs chunks: - build-depends: [] - name: six - ref: baserock/morph - repo: upstream:six -- build-depends: [] name: jsonschema ref: baserock/morph repo: upstream:jsonschema @@ -26,7 +22,6 @@ chunks: ref: baserock/morph repo: upstream:python-json-patch - build-depends: - - six - jsonschema - python-json-pointer - python-json-patch @@ -80,7 +75,6 @@ chunks: - python-prettytable - python-requests - simplejson - - six - netaddr - babel name: python-keystoneclient @@ -1,6 +1,6 @@ build-depends: - morph: tools - ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 + ref: master repo: baserock:baserock/morphs chunks: - build-depends: [] diff --git a/multimedia-gstreamer-0.10.morph b/multimedia-gstreamer-0.10.morph index bcd5474..f58833c 100644 --- a/multimedia-gstreamer-0.10.morph +++ b/multimedia-gstreamer-0.10.morph @@ -1,12 +1,12 @@ build-depends: - morph: core - ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 + ref: master repo: baserock:baserock/morphs - morph: foundation - ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 + ref: master repo: baserock:baserock/morphs - morph: audio-bluetooth - ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 + ref: master repo: baserock:baserock/morphs chunks: - build-depends: [] diff --git a/multimedia.morph b/multimedia.morph index 5c83fa9..db2dae3 100644 --- a/multimedia.morph +++ b/multimedia.morph @@ -1,12 +1,12 @@ build-depends: - morph: core - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs - morph: foundation - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs - morph: audio-bluetooth - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs chunks: - build-depends: [] diff --git a/qt5-devel-system-x86_64-generic.morph b/qt5-devel-system-x86_64-generic.morph index b898fa1..3509ad5 100644 --- a/qt5-devel-system-x86_64-generic.morph +++ b/qt5-devel-system-x86_64-generic.morph @@ -12,44 +12,44 @@ kind: system name: qt5-devel-system-x86_64-generic strata: - morph: build-essential - ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 + ref: master repo: baserock:baserock/morphs - morph: core - ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 + ref: master repo: baserock:baserock/morphs - morph: foundation - ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 + ref: master repo: baserock:baserock/morphs - morph: audio-bluetooth - ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 + ref: master repo: baserock:baserock/morphs - morph: multimedia-gstreamer-0.10 - ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 + ref: master repo: baserock:baserock/morphs - morph: bsp-x86_64-generic - ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 + ref: master repo: baserock:baserock/morphs - morph: tools - ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 + ref: master repo: baserock:baserock/morphs - morph: x-common - ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 + ref: master repo: baserock:baserock/morphs - morph: x-x86_64-generic - ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 + ref: master repo: baserock:baserock/morphs - morph: qt5-tools - ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 + ref: master repo: baserock:baserock/morphs - morph: qt5-sdk - ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 + ref: master repo: baserock:baserock/morphs - morph: lua - ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 + ref: master repo: baserock:baserock/morphs - morph: connectivity - ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 + ref: master repo: baserock:baserock/morphs - morph: enlightenment - ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 + ref: master repo: baserock:baserock/morphs diff --git a/qt5-sdk.morph b/qt5-sdk.morph index 49770cb..9fa83f9 100644 --- a/qt5-sdk.morph +++ b/qt5-sdk.morph @@ -1,6 +1,6 @@ build-depends: - morph: qt5-tools - ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 + ref: master repo: baserock:baserock/morphs chunks: - build-depends: [] diff --git a/qt5-tools.morph b/qt5-tools.morph index 75c81ec..866e9fe 100644 --- a/qt5-tools.morph +++ b/qt5-tools.morph @@ -1,12 +1,12 @@ build-depends: - morph: tools - ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 + ref: master repo: baserock:baserock/morphs - morph: x-x86_64-generic - ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 + ref: master repo: baserock:baserock/morphs - morph: multimedia-gstreamer-0.10 - ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 + ref: master repo: baserock:baserock/morphs chunks: - build-depends: [] diff --git a/tools.morph b/tools.morph index 9f1f039..dbdfc1f 100644 --- a/tools.morph +++ b/tools.morph @@ -4,6 +4,10 @@ build-depends: repo: baserock:baserock/morphs chunks: - build-depends: [] + name: six + ref: baserock/morph + repo: upstream:six +- build-depends: [] name: patch ref: baserock/morph repo: upstream:patch @@ -70,9 +74,15 @@ chunks: ref: baserock/morph repo: upstream:lsof - build-depends: + - six + name: pyfilesystem + ref: baserock/morph + repo: upstream:pyfilesystem +- build-depends: - cliapp - cmdtest - python-coverage-test-runner + - pyfilesystem name: morph ref: master repo: baserock:baserock/morph diff --git a/x-common.morph b/x-common.morph index 8845175..1be21ec 100644 --- a/x-common.morph +++ b/x-common.morph @@ -6,7 +6,7 @@ build-depends: ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs - morph: genivi-foundation - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs chunks: - build-depends: [] diff --git a/x-x86_64-generic.morph b/x-x86_64-generic.morph index 6dc7844..140b978 100644 --- a/x-x86_64-generic.morph +++ b/x-x86_64-generic.morph @@ -6,7 +6,7 @@ build-depends: ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs - morph: genivi-foundation - ref: master + ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 repo: baserock:baserock/morphs - morph: x-common ref: baserock/builds/d464c755f1c3472e97a814cc684748ad/aaf4e570e9c64c1c9cdc5d0162f23b03 |