Tizen:TV,Tizen:Wearable: disable ia32 build and adjust aggregate setting

In Tizen:TV and Wearable, we have no require package building at ia32(atom) and x86_64 repositories.
Before delete those from obs environment, we set them to disable and adjust some aggregate packages' setting.
'*_aggregate' packages will be built from emulator32 repositories.

Change-Id: I0f85c07a69b19f4c63ad4ee81dc6be5b1a301adb

13 files changed, 16 insertions, 44 deletions

diff --git a/Tizen:TV/_meta b/Tizen:TV/_meta
index 39ef02f..d4e5775 100644
--- a/Tizen:TV/_meta
+++ b/Tizen:TV/_meta
@@ -4,10 +4,11 @@
 
 Contacts
 - PL : jh106.choi@samsung.com
-- RE : hyunggi.lee@samsung.com, joon-sub.lee@samsung.com / yooduck.seo@samsung.com</description>
+- RE : hyunggi.lee@samsung.com, joon-sub.lee@samsung.com / yooduck.seo@samsung.com
 
-Download address:
+Download address:&#13;
 http://download.tizen.org/snapshots/tizen/tv/
+  </description>
   <person userid="marquiz" role="maintainer"/>
   <person userid="bartosh" role="maintainer"/>
   <person userid="jang798" role="maintainer"/>
@@ -29,6 +30,8 @@ http://download.tizen.org/snapshots/tizen/tv/
     <disable arch="x86_64" repository="arm64-wayland"/>
     <disable arch="i586" repository="x86_64-wayland"/>
     <disable arch="x86_64" repository="x86_64-wayland"/>
+    <disable arch="i586" repository="ia32-wayland"/>
+    <disable arch="i586" repository="ia32-x11"/>
   </build>
   <debuginfo>
     <enable/>
diff --git a/Tizen:TV/glibc_aggregate/_meta b/Tizen:TV/glibc_aggregate/_meta
index 2efa79c..b41043a 100644
--- a/Tizen:TV/glibc_aggregate/_meta
+++ b/Tizen:TV/glibc_aggregate/_meta
@@ -3,7 +3,5 @@
   <description/>
   <build>
     <disable/>
-    <enable arch="i586" repository="x86_64-x11"/>
-    <enable arch="i586" repository="x86_64-wayland"/>
   </build>
 </package>
diff --git a/Tizen:TV/mic-bootstrap_aggregate/_aggregate b/Tizen:TV/mic-bootstrap_aggregate/_aggregate
index 687176e..cdb1ca6 100644
--- a/Tizen:TV/mic-bootstrap_aggregate/_aggregate
+++ b/Tizen:TV/mic-bootstrap_aggregate/_aggregate
@@ -2,9 +2,7 @@
   <aggregate project="Tizen:TV">
     <package>mic-bootstrap</package>
     <binary>mic-bootstrap-x86-arm</binary>
-    <repository source="ia32-x11" target="arm-x11"/>
-    <repository source="ia32-wayland" target="arm-wayland"/>
-    <repository source="x86_64-x11" target="arm64-x11"/>
-    <repository source="x86_64-wayland" target="arm64-wayland"/>
+    <repository source="emulator32-x11" target="arm-x11"/>
+    <repository source="emulator32-wayland" target="arm-wayland"/>
    </aggregate>
 </aggregatelist>
diff --git a/Tizen:TV/mic-bootstrap_aggregate/_meta b/Tizen:TV/mic-bootstrap_aggregate/_meta
index 29dcd1b..e67178a 100644
--- a/Tizen:TV/mic-bootstrap_aggregate/_meta
+++ b/Tizen:TV/mic-bootstrap_aggregate/_meta
@@ -5,7 +5,5 @@
     <disable/>
     <enable arch="i586" repository="arm-x11"/>
     <enable arch="i586" repository="arm-wayland"/>
-    <enable arch="x86_64" repository="arm64-x11"/>
-    <enable arch="x86_64" repository="arm64-wayland"/>
   </build>
 </package>
diff --git a/Tizen:TV/qemu_aggregate/_aggregate b/Tizen:TV/qemu_aggregate/_aggregate
index dbd31a3..2918298 100644
--- a/Tizen:TV/qemu_aggregate/_aggregate
+++ b/Tizen:TV/qemu_aggregate/_aggregate
@@ -2,23 +2,14 @@
   <aggregate project="Tizen:TV">
     <package>qemu</package>
     <binary>qemu-linux-user-cross-arm</binary>
-    <repository source="ia32-x11" target="arm-x11"/>
-    <repository source="ia32-wayland" target="arm-wayland"/>
-    <repository source="x86_64-x11" target="arm64-x11"/>
-    <repository source="x86_64-wayland" target="arm64-wayland"/>
+    <repository source="emulator32-x11" target="arm-x11"/>
+    <repository source="emulator32-wayland" target="arm-wayland"/>
   </aggregate>
   <aggregate project="Tizen:TV" >
     <package>qemu-accel-armv7l</package>
     <binary>qemu-accel-armv7l</binary>
     <binary>qemu-accel-armv7l-cross-arm</binary>
-    <repository source="ia32-x11" target="arm-x11"/>
-    <repository source="ia32-wayland" target="arm-wayland"/>
+    <repository source="emulator32-x11" target="arm-x11"/>
+    <repository source="emulator32-wayland" target="arm-wayland"/>
   </aggregate>
-  <aggregate project="Tizen:TV" >
-    <package>qemu-accel-aarch64</package>
-    <binary>qemu-accel-aarch64</binary>
-    <binary>qemu-accel-aarch64-cross-aarch64</binary>
-    <repository source="x86_64-x11" target="arm64-x11"/>
-    <repository source="x86_64-wayland" target="arm64-wayland"/>
-    </aggregate>
 </aggregatelist>
diff --git a/Tizen:TV/qemu_aggregate/_meta b/Tizen:TV/qemu_aggregate/_meta
index daee14c..a3601bc 100644
--- a/Tizen:TV/qemu_aggregate/_meta
+++ b/Tizen:TV/qemu_aggregate/_meta
@@ -3,8 +3,6 @@
   <description/>
   <build>
     <disable/>
-    <enable arch="x86_64" repository="arm64-x11"/>
-    <enable arch="x86_64" repository="arm64-wayland"/>
     <enable arch="i586" repository="arm-x11"/>
     <enable arch="i586" repository="arm-wayland"/>
   </build>
diff --git a/Tizen:Wearable/_meta b/Tizen:Wearable/_meta
index 3b5b055..4852801 100644
--- a/Tizen:Wearable/_meta
+++ b/Tizen:Wearable/_meta
@@ -22,6 +22,7 @@ http://download.tizen.org/snapshots/tizen/wearable/
     <disable arch="x86_64" repository="arm64-x11"/>
     <disable arch="aarch64" repository="arm64-x11"/>
     <disable arch="i586" repository="arm64-x11"/>
+    <disable arch="i586" repository="ia32-x11"/>
   </build>
   <debuginfo>
     <enable/>
diff --git a/Tizen:Wearable/glibc_aggregate/_aggregate b/Tizen:Wearable/glibc_aggregate/_aggregate
index 714fe8b..8d9e8f8 100644
--- a/Tizen:Wearable/glibc_aggregate/_aggregate
+++ b/Tizen:Wearable/glibc_aggregate/_aggregate
@@ -3,6 +3,6 @@
     <package>glibc</package>
     <binary>glibc-32bit</binary>
     <binary>glibc-devel-32bit</binary>
-    <repository source="ia32-x11" target="x86_64-x11"/>
+    <repository source="emulator32-x11" target="x86_64-x11"/>
   </aggregate>
 </aggregatelist>
diff --git a/Tizen:Wearable/glibc_aggregate/_meta b/Tizen:Wearable/glibc_aggregate/_meta
index 2de360b..c888082 100644
--- a/Tizen:Wearable/glibc_aggregate/_meta
+++ b/Tizen:Wearable/glibc_aggregate/_meta
@@ -3,6 +3,5 @@
   <description/>
   <build>
     <disable/>
-    <enable arch="i586" repository="x86_64-x11"/>
   </build>
 </package>
diff --git a/Tizen:Wearable/mic-bootstrap_aggregate/_aggregate b/Tizen:Wearable/mic-bootstrap_aggregate/_aggregate
index 81824b8..149ad7c 100644
--- a/Tizen:Wearable/mic-bootstrap_aggregate/_aggregate
+++ b/Tizen:Wearable/mic-bootstrap_aggregate/_aggregate
@@ -2,11 +2,6 @@
   <aggregate project="Tizen:Wearable">
     <package>mic-bootstrap</package>
     <binary>mic-bootstrap-x86-arm</binary>
-    <repository source="ia32-x11" target="arm-x11"/>
+    <repository source="emulator32-x11" target="arm-x11"/>
   </aggregate>
-  <aggregate project="Tizen:Wearable">
-    <package>mic-bootstrap</package>
-    <binary>mic-bootstrap-x86-arm</binary>
-    <repository source="x86_64-x11" target="arm64-x11"/>
-   </aggregate>
 </aggregatelist>
diff --git a/Tizen:Wearable/mic-bootstrap_aggregate/_meta b/Tizen:Wearable/mic-bootstrap_aggregate/_meta
index 3bbf777..c543449 100644
--- a/Tizen:Wearable/mic-bootstrap_aggregate/_meta
+++ b/Tizen:Wearable/mic-bootstrap_aggregate/_meta
@@ -3,7 +3,6 @@
   <description/>
   <build>
     <enable arch="i586" repository="arm-x11"/>
-    <enable arch="x86_64" repository="arm64-x11"/>
     <disable/>
   </build>
 </package>
diff --git a/Tizen:Wearable/qemu_aggregate/_aggregate b/Tizen:Wearable/qemu_aggregate/_aggregate
index 829bd71..3872511 100644
--- a/Tizen:Wearable/qemu_aggregate/_aggregate
+++ b/Tizen:Wearable/qemu_aggregate/_aggregate
@@ -2,19 +2,12 @@
   <aggregate project="Tizen:Wearable">
     <package>qemu</package>
     <binary>qemu-linux-user-cross-arm</binary>
-    <repository source="ia32-x11" target="arm-x11"/>
-    <repository source="x86_64-x11" target="arm64-x11"/>
+    <repository source="emulator32-x11" target="arm-x11"/>
   </aggregate>
   <aggregate project="Tizen:Wearable" >
     <package>qemu-accel-armv7l</package>
     <binary>qemu-accel-armv7l</binary>
     <binary>qemu-accel-armv7l-cross-arm</binary>
-    <repository source="ia32-x11" target="arm-x11"/>
+    <repository source="emulator32-x11" target="arm-x11"/>
   </aggregate>
-  <aggregate project="Tizen:Wearable" >
-    <package>qemu-accel-aarch64</package>
-    <binary>qemu-accel-aarch64</binary>
-    <binary>qemu-accel-aarch64-cross-aarch64</binary>
-    <repository source="x86_64-x11" target="arm64-x11"/>
-    </aggregate>
 </aggregatelist>
diff --git a/Tizen:Wearable/qemu_aggregate/_meta b/Tizen:Wearable/qemu_aggregate/_meta
index 3e1b71e..499a5a6 100644
--- a/Tizen:Wearable/qemu_aggregate/_meta
+++ b/Tizen:Wearable/qemu_aggregate/_meta
@@ -3,7 +3,6 @@
   <description/>
   <build>
     <disable/>
-    <enable arch="x86_64" repository="arm64-x11"/>
     <enable arch="i586" repository="arm-x11"/>
   </build>
 </package>