Common: updated aggregates for -x11 repos

mic-bootstrap aggregates not updated as still WIP

Change-Id: I242c911e2d7f579e943b520dedf7d17c374ad1a2
Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>

diff --git a/Tizen:Common/glibc_aggregate/_aggregate b/Tizen:Common/glibc_aggregate/_aggregate
index 39cb8de..b195336 100644 (file)
--- a/Tizen:Common/glibc_aggregate/_aggregate
+++ b/Tizen:Common/glibc_aggregate/_aggregate
@@ -4,5 +4,6 @@
     <binary>glibc-32bit</binary>
     <binary>glibc-devel-32bit</binary>
     <repository source="ia32-wayland" target="x86_64-wayland"/>
+    <repository source="ia32-x11" target="x86_64-x11"/>
   </aggregate>
 </aggregatelist>

diff --git a/Tizen:Common/glibc_aggregate/_meta b/Tizen:Common/glibc_aggregate/_meta
index 5bbcf2d..f5fd22e 100644 (file)
--- a/Tizen:Common/glibc_aggregate/_meta
+++ b/Tizen:Common/glibc_aggregate/_meta
@@ -2,9 +2,8 @@
   <title/>
   <description/>
   <build>
-    <disable arch="armv7l" repository="arm-wayland"/>
+    <disable/>
     <enable arch="i586" repository="x86_64-wayland"/>
-    <disable arch="x86_64" repository="x86_64-wayland"/>
-    <disable arch="i586" repository="ia32-wayland"/>
+    <enable arch="i586" repository="x86_64-x11"/>
   </build>
 </package>

diff --git a/Tizen:Common/qemu_aggregate/_aggregate b/Tizen:Common/qemu_aggregate/_aggregate
index 6854ce3..049a795 100644 (file)
--- a/Tizen:Common/qemu_aggregate/_aggregate
+++ b/Tizen:Common/qemu_aggregate/_aggregate
@@ -3,11 +3,13 @@
     <package>qemu</package>
     <binary>qemu-linux-user-cross-arm</binary>
     <repository source="ia32-wayland" target="arm-wayland"/>
+    <repository source="ia32-x11" target="arm-x11"/>
   </aggregate>
   <aggregate project="Tizen:Common" >
     <package>qemu-accel-armv7l</package>
     <binary>qemu-accel-armv7l</binary>
     <binary>qemu-accel-armv7l-cross-arm</binary>
     <repository source="ia32-wayland" target="arm-wayland"/>
+    <repository source="ia32-x11" target="arm-x11"/>
   </aggregate>
 </aggregatelist>

diff --git a/Tizen:Common/qemu_aggregate/_meta b/Tizen:Common/qemu_aggregate/_meta
index ca70eb9..8031d27 100644 (file)
--- a/Tizen:Common/qemu_aggregate/_meta
+++ b/Tizen:Common/qemu_aggregate/_meta
@@ -2,10 +2,8 @@
   <title/>
   <description/>
   <build>
-    <disable arch="armv7l" repository="arm-wayland"/>
-    <disable arch="x86_64" repository="arm-wayland"/>
+    <disable/>
     <enable arch="i586" repository="arm-wayland"/>
-    <disable arch="i586" repository="ia32-wayland"/>
-    <disable arch="x86_64" repository="x86_64-wayland"/>
+    <enable arch="i586" repository="arm-x11"/>
   </build>
 </package>