From 9be2d02b4751fa3868c106a012a970f1651e6d4c Mon Sep 17 00:00:00 2001
From: Martyn Welch <martyn.welch@collabora.com>
Date: Tue, 2 Apr 2019 17:23:34 +0100
Subject: [PATCH] Rhosydd: Re-enable in SDK (in one place) and add headers to
devroot
Rhosydd had been re-enabled in the target, but not in the SDK or devroot
where it had also previously been installed. Re-enable it on the SDK, but
just in 1 place, deleting the second. On the devroot, we should really
have the relevant library headers rather than rhosydd its self, so add
libcroesor-0-dev and librhosydd-0-dev to that image instead.
Signed-off-by: Martyn Welch <martyn.welch@collabora.com>
---
apertis-ospack-devroot.yaml | 3 ++-
apertis-ospack-sdk.yaml | 3 +--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/apertis-ospack-devroot.yaml b/apertis-ospack-devroot.yaml
index f5809fd6..fdcd8c08 100644
--- a/apertis-ospack-devroot.yaml
+++ b/apertis-ospack-devroot.yaml
@@ -192,7 +192,6 @@ actions:
- newport
- ofono
#- prestwood
- #- rhosydd
- ribchester
- shapwick
- syncevolution
@@ -266,6 +265,7 @@ actions:
- libclutter-gst-3.0-dev
- libclutter-gtk-1.0-dev
- libcogl-dev
+ - libcroesor-0-dev
- libcurl4-nss-dev
- libenchant-dev
- libffi-dev
@@ -290,6 +290,7 @@ actions:
- libpoppler-glib-dev
- libproxy-dev
- libpulse-dev
+ - librhosydd-0-dev
- libsecret-1-0
- libsecret-1-dev
- libsecret-common
diff --git a/apertis-ospack-sdk.yaml b/apertis-ospack-sdk.yaml
index cf098586..7f0d59c6 100644
--- a/apertis-ospack-sdk.yaml
+++ b/apertis-ospack-sdk.yaml
@@ -186,7 +186,7 @@ actions:
#- newport
- ofono
#- prestwood
- #- rhosydd
+ - rhosydd
- ribchester
#- shapwick
- syncevolution
@@ -642,7 +642,6 @@ actions:
- ofono
#- prestwood-dev
#- prestwood-doc
- #- rhosydd
- ribchester-dev
#- ribchester-doc
- shapwick-dev
--
GitLab