diff options
| author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2015-05-07 12:40:21 +0000 |
|---|---|---|
| committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2015-05-07 12:46:09 +0000 |
| commit | 085b4b3c8386164d5247b02f8ff07d8ded79ffd5 (patch) | |
| tree | a7da268e86244badb5bcd500f160c83235dd367a | |
| parent | bcd58649fd1ebc4d06d3161c27dd740c42df5ffc (diff) | |
| download | definitions-085b4b3c8386164d5247b02f8ff07d8ded79ffd5.tar.gz | |
Use the baserock-standard pygobject
Change-Id: Ie2eac8e580010f92d50b684af6e866f10e3a8c23
| -rw-r--r-- | strata/genivi-demo-platform.morph | 13 | ||||
| -rw-r--r-- | strata/genivi-demo-platform/pygobject.morph | 8 | ||||
| -rw-r--r-- | systems/genivi-demo-platform-x86_64-generic.morph | 2 |
3 files changed, 3 insertions, 20 deletions
diff --git a/strata/genivi-demo-platform.morph b/strata/genivi-demo-platform.morph index ab051e99..6dc076ae 100644 --- a/strata/genivi-demo-platform.morph +++ b/strata/genivi-demo-platform.morph @@ -9,6 +9,7 @@ build-depends: - morph: strata/genivi.morph - morph: strata/wayland-generic.morph - morph: strata/weston-genivi.morph +- morph: strata/python-pygobject.morph chunks: - name: mm-common morph: strata/genivi-demo-platform/mm-common.morph @@ -58,17 +59,6 @@ chunks: repo: upstream:dbus-python ref: d0d5b5be685dc4c16b21c54335becc87ca4d6f58 unpetrify-ref: dbus-python-1.2.0 -- name: gnome-common - repo: upstream:gnome-common - ref: d213283fcb5228d05eb2c796579f18240e8467e8 - unpetrify-ref: 3.12.0 -- name: pygobject - morph: strata/genivi-demo-platform/pygobject.morph - repo: upstream:pygobject - ref: ecb2e6c64cbc420ed8f0d8dc8d1c3f6c516d6f63 - unpetrify-ref: pygobject-3-16 - build-depends: - - gnome-common - name: automotive-message-broker morph: strata/genivi-demo-platform/automotive-message-broker.morph repo: upstream:automotive-message-broker @@ -76,7 +66,6 @@ chunks: unpetrify-ref: "0.14" build-depends: - dbus-python - - pygobject - boost - name: audiomanager-poc morph: strata/genivi-demo-platform/audiomanager-poc.morph diff --git a/strata/genivi-demo-platform/pygobject.morph b/strata/genivi-demo-platform/pygobject.morph deleted file mode 100644 index d7582bec..00000000 --- a/strata/genivi-demo-platform/pygobject.morph +++ /dev/null @@ -1,8 +0,0 @@ -name: pygobject -kind: chunk -build-system: autotools -pre-configure-commands: -- sed -i 's/automake-1.11/automake-1.15/g' autogen.sh -- sed -i 's/aclocal-1.11/aclocal-1.15/g' autogen.sh -configure-commands: -- ./autogen.sh --prefix="$PREFIX" --disable-cairo diff --git a/systems/genivi-demo-platform-x86_64-generic.morph b/systems/genivi-demo-platform-x86_64-generic.morph index 86c55956..82bdc09f 100644 --- a/systems/genivi-demo-platform-x86_64-generic.morph +++ b/systems/genivi-demo-platform-x86_64-generic.morph @@ -49,6 +49,8 @@ strata: morph: strata/qt5-tools-qtwebkit.morph - name: gtk2 morph: strata/gtk2.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: genivi-demo-platform morph: strata/genivi-demo-platform.morph - name: tools |