From 4e2746875acc6ddb7c568f8bc6e872efc462a42a Mon Sep 17 00:00:00 2001
From: Joonsub Lee <joon-sub.lee@samsung.com>
Date: Tue, 19 Jan 2016 15:20:03 +0900
Subject: Tizen:Base: Adjust link and aggregate package

To apply linaro-based common toolchain

+ Set enable emulator-kernel in Tizen:Mobile's all repositories

Change-Id: I7fe43c13119e8bf7cbdd91c292e0ceb7c5942e08
Signed-off-by: Joonsub Lee <joon-sub.lee@samsung.com>
---
 Tizen:Base/_config                      | 0
 Tizen:Base/binutils-aarch64/_link       | 4 ++++
 Tizen:Base/binutils-armv7l/_link        | 4 ++++
 Tizen:Base/cross-aarch64-binutils/_link | 4 ----
 Tizen:Base/cross-aarch64-gcc49/_link    | 4 ----
 Tizen:Base/cross-arm-binutils/_link     | 4 ----
 Tizen:Base/cross-armv7hl-gcc49/_link    | 4 ----
 Tizen:Base/cross-armv7l-gcc49/_link     | 4 ----
 Tizen:Base/gcc-aarch64/_link            | 4 ++++
 Tizen:Base/gcc-armv7l/_link             | 4 ++++
 Tizen:Base/glibc_aggregate/_aggregate   | 2 +-
 Tizen:Base/qemu_aggregate/_aggregate    | 8 +++-----
 Tizen:Base/qemu_aggregate/_meta         | 2 +-
 13 files changed, 21 insertions(+), 27 deletions(-)
 mode change 100755 => 100644 Tizen:Base/_config
 create mode 100644 Tizen:Base/binutils-aarch64/_link
 create mode 100644 Tizen:Base/binutils-armv7l/_link
 delete mode 100644 Tizen:Base/cross-aarch64-binutils/_link
 delete mode 100644 Tizen:Base/cross-aarch64-gcc49/_link
 delete mode 100644 Tizen:Base/cross-arm-binutils/_link
 delete mode 100644 Tizen:Base/cross-armv7hl-gcc49/_link
 delete mode 100644 Tizen:Base/cross-armv7l-gcc49/_link
 create mode 100644 Tizen:Base/gcc-aarch64/_link
 create mode 100644 Tizen:Base/gcc-armv7l/_link

(limited to 'Tizen:Base')

diff --git a/Tizen:Base/_config b/Tizen:Base/_config
old mode 100755
new mode 100644
diff --git a/Tizen:Base/binutils-aarch64/_link b/Tizen:Base/binutils-aarch64/_link
new file mode 100644
index 0000000..a2c6b4e
--- /dev/null
+++ b/Tizen:Base/binutils-aarch64/_link
@@ -0,0 +1,4 @@
+<link  package="linaro-binutils" cicount="copy">
+<patches>
+</patches>
+</link>
diff --git a/Tizen:Base/binutils-armv7l/_link b/Tizen:Base/binutils-armv7l/_link
new file mode 100644
index 0000000..a2c6b4e
--- /dev/null
+++ b/Tizen:Base/binutils-armv7l/_link
@@ -0,0 +1,4 @@
+<link  package="linaro-binutils" cicount="copy">
+<patches>
+</patches>
+</link>
diff --git a/Tizen:Base/cross-aarch64-binutils/_link b/Tizen:Base/cross-aarch64-binutils/_link
deleted file mode 100644
index d7ad1a7..0000000
--- a/Tizen:Base/cross-aarch64-binutils/_link
+++ /dev/null
@@ -1,4 +0,0 @@
-<link package="binutils" cicount="copy">
-  <patches>
-  </patches>
-</link>
diff --git a/Tizen:Base/cross-aarch64-gcc49/_link b/Tizen:Base/cross-aarch64-gcc49/_link
deleted file mode 100644
index 9395288..0000000
--- a/Tizen:Base/cross-aarch64-gcc49/_link
+++ /dev/null
@@ -1,4 +0,0 @@
-<link  package="gcc49" cicount="copy">
-  <patches>
-  </patches>
-</link>
diff --git a/Tizen:Base/cross-arm-binutils/_link b/Tizen:Base/cross-arm-binutils/_link
deleted file mode 100644
index d7ad1a7..0000000
--- a/Tizen:Base/cross-arm-binutils/_link
+++ /dev/null
@@ -1,4 +0,0 @@
-<link package="binutils" cicount="copy">
-  <patches>
-  </patches>
-</link>
diff --git a/Tizen:Base/cross-armv7hl-gcc49/_link b/Tizen:Base/cross-armv7hl-gcc49/_link
deleted file mode 100644
index 9395288..0000000
--- a/Tizen:Base/cross-armv7hl-gcc49/_link
+++ /dev/null
@@ -1,4 +0,0 @@
-<link  package="gcc49" cicount="copy">
-  <patches>
-  </patches>
-</link>
diff --git a/Tizen:Base/cross-armv7l-gcc49/_link b/Tizen:Base/cross-armv7l-gcc49/_link
deleted file mode 100644
index 9395288..0000000
--- a/Tizen:Base/cross-armv7l-gcc49/_link
+++ /dev/null
@@ -1,4 +0,0 @@
-<link  package="gcc49" cicount="copy">
-  <patches>
-  </patches>
-</link>
diff --git a/Tizen:Base/gcc-aarch64/_link b/Tizen:Base/gcc-aarch64/_link
new file mode 100644
index 0000000..cbbfab1
--- /dev/null
+++ b/Tizen:Base/gcc-aarch64/_link
@@ -0,0 +1,4 @@
+<link  package="linaro-gcc" cicount="copy">
+<patches>
+</patches>
+</link>
diff --git a/Tizen:Base/gcc-armv7l/_link b/Tizen:Base/gcc-armv7l/_link
new file mode 100644
index 0000000..cbbfab1
--- /dev/null
+++ b/Tizen:Base/gcc-armv7l/_link
@@ -0,0 +1,4 @@
+<link  package="linaro-gcc" cicount="copy">
+<patches>
+</patches>
+</link>
diff --git a/Tizen:Base/glibc_aggregate/_aggregate b/Tizen:Base/glibc_aggregate/_aggregate
index db18ab6..a6cdf35 100644
--- a/Tizen:Base/glibc_aggregate/_aggregate
+++ b/Tizen:Base/glibc_aggregate/_aggregate
@@ -1,6 +1,6 @@
 <aggregatelist>
   <aggregate project="Tizen:Base">
-    <package>glibc</package>
+    <package>linaro-glibc</package>
     <binary>glibc-32bit</binary>
     <binary>glibc-devel-32bit</binary>
     <repository source="ia32" target="x86_64"/>
diff --git a/Tizen:Base/qemu_aggregate/_aggregate b/Tizen:Base/qemu_aggregate/_aggregate
index 7d1e537..7a16818 100644
--- a/Tizen:Base/qemu_aggregate/_aggregate
+++ b/Tizen:Base/qemu_aggregate/_aggregate
@@ -1,22 +1,20 @@
 <aggregatelist>
   <aggregate project="Tizen:Base">
     <package>qemu</package>
-    <binary>qemu-linux-user-cross-arm</binary>
+    <binary>qemu-linux-user-cross</binary>
     <repository source="ia32" target="arm"/>
     <repository source="x86_64" target="arm64"/>
   </aggregate>
   <aggregate project="Tizen:Base" >
     <package>qemu-accel-armv7l</package>
     <binary>qemu-accel-armv7l</binary>
-    <binary>qemu-accel-armv7l-cross-arm</binary>
-    <binary>python-accel-armv7l-cross-arm</binary>
+    <binary>python-accel-armv7l</binary>
     <repository source="ia32" target="arm"/>
   </aggregate>
   <aggregate project="Tizen:Base" >
     <package>qemu-accel-aarch64</package>
     <binary>qemu-accel-aarch64</binary>
-    <binary>qemu-accel-aarch64-cross-aarch64</binary>
-    <binary>python-accel-aarch64-cross-aarch64</binary>
+    <binary>python-accel-aarch64</binary>
     <repository source="x86_64" target="arm64"/>
   </aggregate>
 </aggregatelist>
diff --git a/Tizen:Base/qemu_aggregate/_meta b/Tizen:Base/qemu_aggregate/_meta
index 334cf73..870cd64 100644
--- a/Tizen:Base/qemu_aggregate/_meta
+++ b/Tizen:Base/qemu_aggregate/_meta
@@ -3,7 +3,7 @@
   <description/>
   <build>
     <disable/>
-    <enable arch="i586" repository="arm"/>
     <enable arch="x86_64" repository="arm64"/>
+    <enable arch="i586" repository="arm"/>
   </build>
 </package>
-- 
cgit v1.2.3