Tizen:Wearable: Add Wayland repos and set build disable at x11 repos

Change-Id: I88aaffd9f3189949b9dfad130a100c82514bb2e8
Signed-off-by: Joonsub Lee <joon-sub.lee@samsung.com>

diff --git a/Tizen:Wearable/_config b/Tizen:Wearable/_config
index 0d20d55..8d7476c 100644 (file)
--- a/Tizen:Wearable/_config
+++ b/Tizen:Wearable/_config
@@ -142,11 +142,12 @@ Macros:
 
 ############################# emulator repositories ############################
 
-%if "%_repository" == "emulator32-x11"
+%if "%_repository" == "emulator32-x11" || "%_repository" == "emulator32-wayland"
 
 Prefer: mesa-libGLESv2
 Prefer: mesa-libGL
 Prefer: mesa-libEGL
+Prefer: emulator-yagl
 
 Substitute: pkgconfig(gles20)  pkgconfig(egl) pkgconfig(glesv2)
 Substitute: pkgconfig(gles11)  pkgconfig(egl) pkgconfig(glesv1) pkgconfig(gl)

diff --git a/Tizen:Wearable/_meta b/Tizen:Wearable/_meta
index cf52601..f14f87c 100644 (file)
--- a/Tizen:Wearable/_meta
+++ b/Tizen:Wearable/_meta
@@ -16,7 +16,9 @@ http://download.tizen.org/snapshots/tizen/wearable/
   <person userid="alone" role="maintainer"/>
   <person userid="hglee" role="maintainer"/>
   <build>
-    <disable arch="i586" repository="arm-x11"/>
+    <disable repository="arm-x11"/>
+    <disable repository="emulator32-x11"/>
+    <disable arch="i586" repository="arm-wayland"/>
   </build>
   <debuginfo>
     <enable/>
@@ -28,4 +30,14 @@ http://download.tizen.org/snapshots/tizen/wearable/
     <arch>armv7l</arch>
     <arch>i586</arch>
   </repository>
+  <repository name="emulator32-wayland">
+    <path project="Tizen:Wearable" repository="emulator32-x11"/>
+    <arch>i586</arch>
+  </repository>
+  <repository name="arm-wayland" block="never">
+    <path project="Tizen:Wearable" repository="arm-x11"/>
+    <arch>armv7l</arch>
+    <arch>i586</arch>
+  </repository>
+
 </project>

diff --git a/Tizen:Wearable/glibc_aggregate/_aggregate b/Tizen:Wearable/glibc_aggregate/_aggregate
index 8d9e8f8..85e266e 100644 (file)
--- a/Tizen:Wearable/glibc_aggregate/_aggregate
+++ b/Tizen:Wearable/glibc_aggregate/_aggregate
@@ -4,5 +4,6 @@
     <binary>glibc-32bit</binary>
     <binary>glibc-devel-32bit</binary>
     <repository source="emulator32-x11" target="x86_64-x11"/>
+    <repository source="emulator32-wayland" target="x86_64-wayland"/>
   </aggregate>
 </aggregatelist>

diff --git a/Tizen:Wearable/mic-bootstrap_aggregate/_aggregate b/Tizen:Wearable/mic-bootstrap_aggregate/_aggregate
index 149ad7c..9571eb6 100644 (file)
--- a/Tizen:Wearable/mic-bootstrap_aggregate/_aggregate
+++ b/Tizen:Wearable/mic-bootstrap_aggregate/_aggregate
@@ -3,5 +3,6 @@
     <package>mic-bootstrap</package>
     <binary>mic-bootstrap-x86-arm</binary>
     <repository source="emulator32-x11" target="arm-x11"/>
+    <repository source="emulator32-wayland" target="arm-wayland"/>
   </aggregate>
 </aggregatelist>

diff --git a/Tizen:Wearable/qemu_aggregate/_aggregate b/Tizen:Wearable/qemu_aggregate/_aggregate
index 7e95e42..f1b7917 100644 (file)
--- a/Tizen:Wearable/qemu_aggregate/_aggregate
+++ b/Tizen:Wearable/qemu_aggregate/_aggregate
@@ -3,6 +3,7 @@
     <package>qemu</package>
     <binary>qemu-linux-user-cross-arm</binary>
     <repository source="emulator32-x11" target="arm-x11"/>
+    <repository source="emulator32-wayland" target="arm-wayland"/>
   </aggregate>
   <aggregate project="Tizen:Wearable" >
     <package>qemu-accel-armv7l</package>
@@ -10,5 +11,6 @@
     <binary>qemu-accel-armv7l-cross-arm</binary>
     <binary>python-accel-armv7l-cross-arm</binary>
     <repository source="emulator32-x11" target="arm-x11"/>
+    <repository source="emulator32-wayland" target="arm-wayland"/>
   </aggregate>
 </aggregatelist>