From 673c16a088e35424078fab324cf387ac8ab46492 Mon Sep 17 00:00:00 2001
From: Taejin Woo <tt.woo@samsung.com>
Date: Mon, 4 Sep 2017 16:00:12 +0900
Subject: [PATCH] Simplified Tizen:Base's meta info

- multilib_aggregate, qemu-accel_aggregate are not needed.
- duplicate builds can be removed as below.
* AS-IS: 6 repositories / 14 architectures
* TO-BE: 1 repository / 4 architectures

Change-Id: Ic752a44268d94e0d986fd1f4000963ebaeb02bb7
Signed-off-by: Dongkyun, Son <dongkyun.s@samsung.com>
---
 Tizen:Base/_meta                           | 34 ++--------------------
 Tizen:Base/multilib_aggregate/_aggregate   | 46 ------------------------------
 Tizen:Base/multilib_aggregate/_meta        | 11 -------
 Tizen:Base/qemu-accel_aggregate/_aggregate | 27 ------------------
 Tizen:Base/qemu-accel_aggregate/_meta      | 14 ---------
 Tizen:Base/qemu_aggregate/_aggregate       | 14 ++-------
 Tizen:Base/qemu_aggregate/_meta            |  9 ++----
 7 files changed, 6 insertions(+), 149 deletions(-)
 delete mode 100644 Tizen:Base/multilib_aggregate/_aggregate
 delete mode 100644 Tizen:Base/multilib_aggregate/_meta
 delete mode 100644 Tizen:Base/qemu-accel_aggregate/_aggregate
 delete mode 100644 Tizen:Base/qemu-accel_aggregate/_meta

diff --git a/Tizen:Base/_meta b/Tizen:Base/_meta
index cbe877c..4b357e5 100644
--- a/Tizen:Base/_meta
+++ b/Tizen:Base/_meta
@@ -11,42 +11,12 @@
   <person userid="mwereski" role="maintainer"/>
   <person userid="pwieczorek" role="maintainer"/>
   <person userid="gagarin" role="maintainer"/>
-  <build>
-    <disable arch="i586" repository="arm"/>
-    <disable arch="x86_64" repository="arm"/>
-    <disable arch="i586" repository="arm64"/>
-    <disable arch="x86_64" repository="arm64"/>
-    <disable arch="i586" repository="x86_64"/>
-    <disable arch="i586" repository="emulator64"/>
-    <disable arch="x86_64" repository="ia32"/>
-    <disable arch="x86_64" repository="emulator32"/>
-  </build>
   <debuginfo>
     <enable/>
   </debuginfo>
-  <repository name="x86_64">
-    <arch>x86_64</arch>
-    <arch>i586</arch>
-  </repository>
-  <repository name="ia32">
-    <arch>x86_64</arch>
-    <arch>i586</arch>
-  </repository>
-  <repository name="emulator64">
-    <arch>i586</arch>
-    <arch>x86_64</arch>
-  </repository>
-  <repository name="emulator32">
-    <arch>i586</arch>
-    <arch>x86_64</arch>
-  </repository>
-  <repository name="arm64">
-    <arch>aarch64</arch>
-    <arch>i586</arch>
-    <arch>x86_64</arch>
-  </repository>
-  <repository name="arm">
+  <repository name="standard">
     <arch>armv7l</arch>
+    <arch>aarch64</arch>
     <arch>i586</arch>
     <arch>x86_64</arch>
   </repository>
diff --git a/Tizen:Base/multilib_aggregate/_aggregate b/Tizen:Base/multilib_aggregate/_aggregate
deleted file mode 100644
index ff4fdcd..0000000
--- a/Tizen:Base/multilib_aggregate/_aggregate
+++ /dev/null
@@ -1,46 +0,0 @@
-<aggregatelist>
-  <aggregate project="Tizen:Base">
-    <package>glibc</package>
-    <binary>glibc-32bit</binary>
-    <binary>glibc-devel-32bit</binary>
-    <repository source="ia32" target="x86_64"/>
-    <repository source="emulator32" target="emulator64"/>
-  </aggregate>
-  <aggregate project="Tizen:Base">
-    <package>linaro-gcc</package>
-    <binary>libgcc-64bit</binary>
-    <binary>libstdc++-64bit</binary>
-    <repository source="x86_64" target="ia32"/>
-    <repository source="emulator64" target="emulator32"/>
-  </aggregate>
-  <aggregate project="Tizen:Base">
-    <package>glibc</package>
-    <binary>glibc-64bit</binary>
-    <repository source="x86_64" target="ia32"/>
-    <repository source="emulator64" target="emulator32"/>
-  </aggregate>
-  <aggregate project="Tizen:Base">
-    <package>libunwind</package>
-    <binary>libunwind-64bit</binary>
-    <repository source="x86_64" target="ia32"/>
-    <repository source="emulator64" target="emulator32"/>
-  </aggregate>
-  <aggregate project="Tizen:Base">
-    <package>util-linux</package>
-    <binary>libuuid-64bit</binary>
-    <repository source="x86_64" target="ia32"/>
-    <repository source="emulator64" target="emulator32"/>
-  </aggregate>
-  <aggregate project="Tizen:Base">
-    <package>zlib</package>
-    <binary>zlib-64bit</binary>
-    <repository source="x86_64" target="ia32"/>
-    <repository source="emulator64" target="emulator32"/>
-  </aggregate>
-  <aggregate project="Tizen:Base">
-    <package>openssl</package>
-    <binary>libopenssl-64bit</binary>
-    <repository source="x86_64" target="ia32"/>
-    <repository source="emulator64" target="emulator32"/>
-  </aggregate>
-</aggregatelist>
diff --git a/Tizen:Base/multilib_aggregate/_meta b/Tizen:Base/multilib_aggregate/_meta
deleted file mode 100644
index 4d83998..0000000
--- a/Tizen:Base/multilib_aggregate/_meta
+++ /dev/null
@@ -1,11 +0,0 @@
-<package name="multilib_aggregate" project="Tizen:Base">
-  <title/>
-  <description/>
-  <build>
-    <disable/>
-    <enable arch="x86_64" repository="ia32"/>
-    <enable arch="x86_64" repository="emulator32"/>
-    <enable arch="i586" repository="x86_64"/>
-    <enable arch="i586" repository="emulator64"/>
-  </build>
-</package>
diff --git a/Tizen:Base/qemu-accel_aggregate/_aggregate b/Tizen:Base/qemu-accel_aggregate/_aggregate
deleted file mode 100644
index 73c6ef5..0000000
--- a/Tizen:Base/qemu-accel_aggregate/_aggregate
+++ /dev/null
@@ -1,27 +0,0 @@
-<aggregatelist>
-  <aggregate project="Tizen:Base" >
-    <package>qemu-accel-armv7l</package>
-    <binary>qemu-accel-armv7l</binary>
-    <binary>python-accel-armv7l</binary>
-    <binary>qemu-accel-x86-armv7l</binary>
-    <binary>python-accel-x86-armv7l</binary>
-    <binary>clang-accel-x86-armv7l</binary>
-    <repository source="ia32" target="arm"/>
-  </aggregate>
-  <aggregate project="Tizen:Base" >
-    <package>qemu-accel-armv7l</package>
-    <binary>qemu-accel-x86_64-armv7l</binary>
-    <binary>python-accel-x86_64-armv7l</binary>
-    <binary>clang-accel-x86_64-armv7l</binary>
-    <repository source="x86_64" target="arm"/>
-  </aggregate>
-  <aggregate project="Tizen:Base" >
-    <package>qemu-accel-aarch64</package>
-    <binary>qemu-accel-aarch64</binary>
-    <binary>python-accel-aarch64</binary>
-    <binary>qemu-accel-x86_64-aarch64</binary>
-    <binary>python-accel-x86_64-aarch64</binary>
-    <binary>clang-accel-x86_64-aarch64</binary>
-    <repository source="x86_64" target="arm64"/>
-  </aggregate>
-</aggregatelist>
diff --git a/Tizen:Base/qemu-accel_aggregate/_meta b/Tizen:Base/qemu-accel_aggregate/_meta
deleted file mode 100644
index 64a2140..0000000
--- a/Tizen:Base/qemu-accel_aggregate/_meta
+++ /dev/null
@@ -1,14 +0,0 @@
-<package name="qemu-accel_aggregate" project="Tizen:Base">
-  <title/>
-  <description/>
-  <build>
-    <disable/>
-    <enable arch="x86_64" repository="arm64"/>
-    <enable arch="x86_64" repository="arm"/>
-    <enable arch="i586" repository="arm"/>
-    <enable arch="x86_64" repository="x86_64"/>
-    <enable arch="i586" repository="ia32"/>
-    <enable arch="x86_64" repository="emulator64"/>
-    <enable arch="i586" repository="emulator32"/>
-  </build>
-</package>
diff --git a/Tizen:Base/qemu_aggregate/_aggregate b/Tizen:Base/qemu_aggregate/_aggregate
index e3897a4..732f183 100644
--- a/Tizen:Base/qemu_aggregate/_aggregate
+++ b/Tizen:Base/qemu_aggregate/_aggregate
@@ -2,12 +2,7 @@
   <aggregate project="Tools:qemu:2.7.x">
     <package>qemu</package>
     <binary>qemu-tools</binary>
-    <repository source="openSUSE_12.3" target="arm"/>
-    <repository source="openSUSE_12.3" target="arm64"/>
-    <repository source="openSUSE_12.3" target="ia32"/>
-    <repository source="openSUSE_12.3" target="x86_64"/>
-    <repository source="openSUSE_12.3" target="emulator32"/>
-    <repository source="openSUSE_12.3" target="emulator64"/>
+    <repository source="openSUSE_12.3" target="standard"/>
   </aggregate>
   <aggregate project="Tools:qemu:2.7.x">
     <package>qemu-linux-user</package>
@@ -15,11 +10,6 @@
     <binary>qemu-linux-user-x86-cross</binary>
     <binary>qemu-linux-user-x86_64-cross</binary>
     <binary>qemu-linux-user</binary>
-    <repository source="openSUSE_12.3" target="arm"/>
-    <repository source="openSUSE_12.3" target="arm64"/>
-    <repository source="openSUSE_12.3" target="ia32"/>
-    <repository source="openSUSE_12.3" target="x86_64"/>
-    <repository source="openSUSE_12.3" target="emulator32"/>
-    <repository source="openSUSE_12.3" target="emulator64"/>
+    <repository source="openSUSE_12.3" target="standard"/>
   </aggregate>
 </aggregatelist>
diff --git a/Tizen:Base/qemu_aggregate/_meta b/Tizen:Base/qemu_aggregate/_meta
index 2a8f2ab..4b34175 100644
--- a/Tizen:Base/qemu_aggregate/_meta
+++ b/Tizen:Base/qemu_aggregate/_meta
@@ -3,12 +3,7 @@
   <description/>
   <build>
     <disable/>
-    <enable arch="x86_64" repository="arm64"/>
-    <enable arch="x86_64" repository="arm"/>
-    <enable arch="i586" repository="arm"/>
-    <enable arch="x86_64" repository="x86_64"/>
-    <enable arch="i586" repository="ia32"/>
-    <enable arch="x86_64" repository="emulator64"/>
-    <enable arch="i586" repository="emulator32"/>
+    <enable arch="x86_64" repository="standard"/>
+    <enable arch="i586" repository="standard"/>
   </build>
 </package>
-- 
2.7.4