From d33886db049d3ddc830dd29af9e3738074c30a0f Mon Sep 17 00:00:00 2001 From: Jonathan Maw Date: Wed, 6 May 2015 15:05:19 +0000 Subject: Use a version of automotive-message-broker that has fewer things wrong with it Change-Id: Iddf615fb5f7e08d73a7c72cdd2723de772d053be --- strata/genivi-demo-platform.morph | 8 ++++---- strata/genivi-demo-platform/automotive-message-broker.morph | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/strata/genivi-demo-platform.morph b/strata/genivi-demo-platform.morph index 878ddf81..a66beec7 100644 --- a/strata/genivi-demo-platform.morph +++ b/strata/genivi-demo-platform.morph @@ -65,15 +65,15 @@ chunks: - name: pygobject morph: strata/genivi-demo-platform/pygobject.morph repo: upstream:pygobject - ref: 9456ba70fdb98b3a4eb7ee2f630182387a54ca00 - unpetrify-ref: pygobject-2-28 + 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 - ref: 2b8c0be99cf8d99ede79d4842191ae39d7c6e15a - unpetrify-ref: 0.13 + ref: 5cac4bd2958ea24ac6913be5baa0dfcda6466089 + unpetrify-ref: "0.14" build-depends: - dbus-python - pygobject diff --git a/strata/genivi-demo-platform/automotive-message-broker.morph b/strata/genivi-demo-platform/automotive-message-broker.morph index b877564b..22ea0eff 100644 --- a/strata/genivi-demo-platform/automotive-message-broker.morph +++ b/strata/genivi-demo-platform/automotive-message-broker.morph @@ -3,8 +3,6 @@ kind: chunk description: The GENIVI Automotive Message Broker build-system: cmake pre-configure-commands: -- sed -i 's:pkg_check_modules(json REQUIRED json):pkg_check_modules(json REQUIRED json-c):' $(find -name 'CMakeLists.txt') -- sed -i 's:::' $(find . -name '*.h' -o -name '*.c' -o -name '*.hpp' -o -name '*.cpp') post-install-commands: - mkdir -p "$DESTDIR/usr/lib/systemd/system" - | -- cgit v1.2.1