Tizen:Common: Adjust project configuration to Base

This patch adds Tizen:Base repositories to Tizen:Common project, removes
duplicated packages and updates configuration to apply Linaro-based
common toolchain.

Change-Id: I81960a18cea856f42bcc04478f2a9aca5580c47e
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>

diff --git a/Tizen:Common/_config b/Tizen:Common/_config
index 57c89b8..bfc9d32 100644 (file)
--- a/Tizen:Common/_config
+++ b/Tizen:Common/_config
@@ -1,3 +1,5 @@
+Substitute: python-accel-armv7l-cross-arm python-accel-armv7l
+Substitute: python-accel-aarch64-cross-aarch64 python-accel-aarch64
 ################################################################################
 # OBS Project config for Tizen:Common
 #
@@ -263,31 +265,23 @@ Target: aarch64-tizen-linux
 
 ########## cross build ##########
 
-%ifarch %arm armv7l
+%ifarch %arm armv7l aarch64
 Hostarch: x86_64
 # cross build support for the build hosts
-Preinstall: qemu-linux-user-cross-arm
-Keep: qemu-linux-user-cross-arm
-%endif
-
-%ifarch armv7hl
-Preinstall: qemu-accel-armv7hl
-Runscripts: qemu-accel-armv7hl
-Preinstall: libmount libblkid libuuid
+Preinstall: qemu-linux-user-cross
+Runscripts: qemu-linux-user-cross
+Keep: qemu-linux-user-cross
 %endif
 
 %ifarch armv7l
-Preinstall: qemu-accel-armv7l-cross-arm
-Runscripts: qemu-accel-armv7l-cross-arm
+Preinstall: qemu-accel-armv7l
+Runscripts: qemu-accel-armv7l
 Preinstall: libmount libblkid libuuid
 %endif
 
 %ifarch aarch64
-Hostarch: x86_64
-Preinstall: qemu-linux-user-cross-arm
-Keep: qemu-linux-user-cross-arm
-Preinstall: qemu-accel-aarch64-cross-aarch64
-Runscripts: qemu-accel-aarch64-cross-aarch64
+Preinstall: qemu-accel-aarch64
+Runscripts: qemu-accel-aarch64
 Preinstall: libmount libblkid libuuid
 %endif # aarch64
 
@@ -305,7 +299,7 @@ RunScripts: setup
 Preinstall: bash bzip2 coreutils diffutils grep rpm
 Preinstall: glibc libacl libattr
 Preinstall: libcap
-Preinstall: libgcc_s1
+Preinstall: libgcc
 Preinstall: libpopt sed tar zlib
 Preinstall: libncurses libreadline
 Preinstall: libelf libbz2
@@ -321,6 +315,7 @@ VMinstall: perl libmount libblkid libext2fs libuuid  grep libpcre util-linux lib
 
 
 Required: binutils gcc glibc rpm-build libtool
+Required: gcc-c++
 
 Support: glibc-locale
 Support: perl
@@ -334,12 +329,13 @@ Support: util-linux
 Support: less
 Support: which  elfutils
 Support: update-alternatives
+Support: libstdc++-devel
+Support: cpp
+Support: libatomic
+Support: libgomp
+Support: libitm
 
-# FIXME: TO REMOVE (? comes from IVI)
-Support: gcc-c++
-
-Keep: cpp%{gcc_version} gcc%{gcc_version} gcc%{gcc_version}-ada libstdc++%{gcc_version}
-Keep: libstdc++%{gcc_version}-devel gcc%{gcc_version}-c++
+Keep: libstdc++-devel
 Keep: cpp gcc libstdc++
 Keep: pam
 Keep: binutils cpp  libmagic-data file findutils gawk gcc  gcc-c++
@@ -353,13 +349,17 @@ Keep: libcloog libppl libgmpxx
 Keep: nss-softokn-freebl libmagic libmagic-data
 Keep: setup
 Keep: update-alternatives
-Prefer: libstdc++%{gcc_version} libgcc%{gcc_version}
-Prefer: libstdc++%{gcc_version}-32bit libstdc++%{gcc_version}-64bit
+Keep: cpp
+Keep: gcc-c++
+Keep: libatomic
+Keep: libgomp
+Keep: libitm
 
 Substitute: gettext gettext-tools
 
 %ifarch x86_64
 Substitute: glibc-devel-32bit glibc-devel-32bit glibc-32bit
+Substitute: libgcc_s1-32bit libgcc-32bit
 %else
 Substitute: glibc-devel-32bit
 %endif
@@ -377,4 +377,4 @@ Optflags: x86_64 %{__global_cflags} -m64 -march=corei7 -mtune=corei7-avx -msse4.
 #activate neon FPU instructions set (crosswalk build)
 Optflags: armv7l %{__global_cflags} -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -Wp,-D__SOFTFP__
 
-Optflags: aarch64 %{__global_cflags} -march=armv8-a+fp+simd+crc+crypto
+Optflags: aarch64 %{__global_cflags} -march=armv8-a+fp+simd+crc+crypto -mtune=cortex-a57.cortex-a53

diff --git a/Tizen:Common/_meta b/Tizen:Common/_meta
index 3230a96..d970f13 100644 (file)
--- a/Tizen:Common/_meta
+++ b/Tizen:Common/_meta
@@ -24,21 +24,26 @@
     <enable/>
   </debuginfo>
   <repository name="x86_64-wayland">
+    <path project="Tizen:Base" repository="x86_64"/>
     <arch>x86_64</arch>
     <arch>i586</arch>
   </repository>
   <repository name="ia32-wayland">
+    <path project="Tizen:Base" repository="ia32"/>
     <arch>i586</arch>
   </repository>
   <repository name="emulator32-wayland">
+    <path project="Tizen:Base" repository="emulator32"/>
     <arch>i586</arch>
   </repository>
   <repository name="arm64-wayland">
+    <path project="Tizen:Base" repository="arm64"/>
     <arch>aarch64</arch>
     <arch>i586</arch>
     <arch>x86_64</arch>
   </repository>
   <repository name="arm-wayland">
+    <path project="Tizen:Base" repository="arm"/>
     <arch>armv7l</arch>
     <arch>i586</arch>
     <arch>x86_64</arch>

diff --git a/Tizen:Common/cross-aarch64-binutils/_link b/Tizen:Common/cross-aarch64-binutils/_link
deleted file mode 100644 (file)
index d7ad1a7..0000000
--- a/Tizen:Common/cross-aarch64-binutils/_link
+++ /dev/null
@@ -1,4 +0,0 @@
-<link package="binutils" cicount="copy">
-  <patches>
-  </patches>
-</link>

diff --git a/Tizen:Common/cross-aarch64-gcc49/_link b/Tizen:Common/cross-aarch64-gcc49/_link
deleted file mode 100644 (file)
index a246210..0000000
--- a/Tizen:Common/cross-aarch64-gcc49/_link
+++ /dev/null
@@ -1,9 +0,0 @@
-<link  package="gcc49" cicount="copy">
-<patches>
-  <!-- <branch /> for a full copy, default case  -->
-  <!-- <apply name="patch" /> apply a patch on the source directory  -->
-  <!-- <topadd>%define build_with_feature_x 1</topadd> add a line on the top (spec file only) -->
-  <!-- <add name="file.patch" /> add a patch to be applied after %setup (spec file only) -->
-  <!-- <delete name="filename" /> delete a file -->
-</patches>
-</link>

diff --git a/Tizen:Common/cross-arm-binutils/_link b/Tizen:Common/cross-arm-binutils/_link
deleted file mode 100644 (file)
index d7ad1a7..0000000
--- a/Tizen:Common/cross-arm-binutils/_link
+++ /dev/null
@@ -1,4 +0,0 @@
-<link package="binutils" cicount="copy">
-  <patches>
-  </patches>
-</link>

diff --git a/Tizen:Common/cross-armv7hl-gcc49/_link b/Tizen:Common/cross-armv7hl-gcc49/_link
deleted file mode 100644 (file)
index a246210..0000000
--- a/Tizen:Common/cross-armv7hl-gcc49/_link
+++ /dev/null
@@ -1,9 +0,0 @@
-<link  package="gcc49" cicount="copy">
-<patches>
-  <!-- <branch /> for a full copy, default case  -->
-  <!-- <apply name="patch" /> apply a patch on the source directory  -->
-  <!-- <topadd>%define build_with_feature_x 1</topadd> add a line on the top (spec file only) -->
-  <!-- <add name="file.patch" /> add a patch to be applied after %setup (spec file only) -->
-  <!-- <delete name="filename" /> delete a file -->
-</patches>
-</link>

diff --git a/Tizen:Common/cross-armv7l-gcc49/_link b/Tizen:Common/cross-armv7l-gcc49/_link
deleted file mode 100644 (file)
index a246210..0000000
--- a/Tizen:Common/cross-armv7l-gcc49/_link
+++ /dev/null
@@ -1,9 +0,0 @@
-<link  package="gcc49" cicount="copy">
-<patches>
-  <!-- <branch /> for a full copy, default case  -->
-  <!-- <apply name="patch" /> apply a patch on the source directory  -->
-  <!-- <topadd>%define build_with_feature_x 1</topadd> add a line on the top (spec file only) -->
-  <!-- <add name="file.patch" /> add a patch to be applied after %setup (spec file only) -->
-  <!-- <delete name="filename" /> delete a file -->
-</patches>
-</link>

diff --git a/Tizen:Common/glibc_aggregate/_aggregate b/Tizen:Common/glibc_aggregate/_aggregate
deleted file mode 100644 (file)
index 39cb8de..0000000
--- a/Tizen:Common/glibc_aggregate/_aggregate
+++ /dev/null
@@ -1,8 +0,0 @@
-<aggregatelist>
-  <aggregate project="Tizen:Common">
-    <package>glibc</package>
-    <binary>glibc-32bit</binary>
-    <binary>glibc-devel-32bit</binary>
-    <repository source="ia32-wayland" target="x86_64-wayland"/>
-  </aggregate>
-</aggregatelist>

diff --git a/Tizen:Common/glibc_aggregate/_meta b/Tizen:Common/glibc_aggregate/_meta
deleted file mode 100644 (file)
index 04b6073..0000000
--- a/Tizen:Common/glibc_aggregate/_meta
+++ /dev/null
@@ -1,8 +0,0 @@
-<package name="glibc_aggregate" project="Tizen:Common">
-  <title/>
-  <description/>
-  <build>
-    <disable/>
-    <enable arch="i586" repository="x86_64-wayland"/>
-  </build>
-</package>

diff --git a/Tizen:Common/python-libxml2/_link b/Tizen:Common/python-libxml2/_link
deleted file mode 100644 (file)
index 8e73c95..0000000
--- a/Tizen:Common/python-libxml2/_link
+++ /dev/null
@@ -1,9 +0,0 @@
-<link  package="libxml2" cicount="copy">
-<patches>
-  <!-- <branch /> for a full copy, default case  -->
-  <!-- <apply name="patch" /> apply a patch on the source directory  -->
-  <!-- <topadd>%define build_with_feature_x 1</topadd> add a line on the top (spec file only) -->
-  <!-- <add>file.patch</add> add a patch to be applied after %setup (spec file only) -->
-  <!-- <delete>filename</delete> delete a file -->
-</patches>
-</link>

diff --git a/Tizen:Common/python-magic/_link b/Tizen:Common/python-magic/_link
deleted file mode 100644 (file)
index 4faa9ff..0000000
--- a/Tizen:Common/python-magic/_link
+++ /dev/null
@@ -1,9 +0,0 @@
-<link  package="file" cicount="copy">
-<patches>
-  <!-- <branch /> for a full copy, default case  -->
-  <!-- <apply name="patch" /> apply a patch on the source directory  -->
-  <!-- <topadd>%define build_with_feature_x 1</topadd> add a line on the top (spec file only) -->
-  <!-- <add>file.patch</add> add a patch to be applied after %setup (spec file only) -->
-  <!-- <delete>filename</delete> delete a file -->
-</patches>
-</link>

diff --git a/Tizen:Common/qemu-accel-aarch64/_link b/Tizen:Common/qemu-accel-aarch64/_link
deleted file mode 100644 (file)
index 573ab9f..0000000
--- a/Tizen:Common/qemu-accel-aarch64/_link
+++ /dev/null
@@ -1,4 +0,0 @@
-<link package="qemu-accel" cicount="copy">
-  <patches>
-  </patches>
-</link>

diff --git a/Tizen:Common/qemu-accel-armv7l/_link b/Tizen:Common/qemu-accel-armv7l/_link
deleted file mode 100644 (file)
index 573ab9f..0000000
--- a/Tizen:Common/qemu-accel-armv7l/_link
+++ /dev/null
@@ -1,4 +0,0 @@
-<link package="qemu-accel" cicount="copy">
-  <patches>
-  </patches>
-</link>

diff --git a/Tizen:Common/qemu_aggregate/_aggregate b/Tizen:Common/qemu_aggregate/_aggregate
deleted file mode 100644 (file)
index 5f985c3..0000000
--- a/Tizen:Common/qemu_aggregate/_aggregate
+++ /dev/null
@@ -1,22 +0,0 @@
-<aggregatelist>
-  <aggregate project="Tizen:Common">
-    <package>qemu</package>
-    <binary>qemu-linux-user-cross-arm</binary>
-    <repository source="ia32-wayland" target="arm-wayland"/>
-    <repository source="x86_64-wayland" target="arm64-wayland"/>
-  </aggregate>
-  <aggregate project="Tizen:Common" >
-    <package>qemu-accel-armv7l</package>
-    <binary>qemu-accel-armv7l</binary>
-    <binary>qemu-accel-armv7l-cross-arm</binary>
-    <binary>python-accel-armv7l-cross-arm</binary>
-    <repository source="ia32-wayland" target="arm-wayland"/>
-  </aggregate>
-  <aggregate project="Tizen:Common" >
-    <package>qemu-accel-aarch64</package>
-    <binary>qemu-accel-aarch64</binary>
-    <binary>qemu-accel-aarch64-cross-aarch64</binary>
-    <binary>python-accel-aarch64-cross-aarch64</binary>
-    <repository source="x86_64-wayland" target="arm64-wayland"/>
-    </aggregate>
-</aggregatelist>

diff --git a/Tizen:Common/qemu_aggregate/_meta b/Tizen:Common/qemu_aggregate/_meta
deleted file mode 100644 (file)
index 6b43f66..0000000
--- a/Tizen:Common/qemu_aggregate/_meta
+++ /dev/null
@@ -1,9 +0,0 @@
-<package name="qemu_aggregate" project="Tizen:Common">
-  <title/>
-  <description/>
-  <build>
-    <disable/>
-    <enable arch="x86_64" repository="arm64-wayland"/>
-    <enable arch="i586" repository="arm-wayland"/>
-  </build>
-</package>