build.conf: cosmetic change; meta: removed linked repos for aarch64

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

diff --git a/build.conf b/build.conf
index d47f5b215624c93c6ac02daf70dd890ce7a18048..495805891f20e9fb987803d96b9c00020e9e8604 100644 (file)
--- a/build.conf
+++ b/build.conf
@@ -1,6 +1,6 @@
 ################################################################################
 # OBS Project config for Tizen:Common
-# 
+#
 # RE contacts:
 # Stephane Desneux <stephane.desneux@open.eurogiciel.org>
 # Ronan Le Martret <ronan.lemartret@open.eurogiciel.org>
@@ -13,7 +13,7 @@
 
 Patterntype: rpm-md comps
 Release: <CI_CNT>.<B_CNT>
-Support: build 
+Support: build
 Support: build-compare build-mkbaselibs
 Support: rpmlint-mini rpmlint-tizen
 
@@ -89,10 +89,10 @@ Macros:
 
 ############################# wayland repositories #############################
 
-%if "%_repository" == "ia32-wayland" || "%_repository" == "x86_64-wayland" || "%_repository" == "arm-wayland"|| "%_repository" == "arm"|| "%_repository" == "arm64" || "%_repository" == "arm64-wayland" || "%_repository" == "wayland" || "%_repository" == "standard" 
+%if "%_repository" == "ia32-wayland" || "%_repository" == "x86_64-wayland" || "%_repository" == "arm-wayland"|| "%_repository" == "arm"|| "%_repository" == "arm64" || "%_repository" == "arm64-wayland" || "%_repository" == "wayland" || "%_repository" == "standard"
 
-Substitute: pkgconfig(gles20)  pkgconfig(egl) pkgconfig(glesv2) 
-Substitute: pkgconfig(gles11)  pkgconfig(egl) pkgconfig(glesv1) pkgconfig(gl) 
+Substitute: pkgconfig(gles20)  pkgconfig(egl) pkgconfig(glesv2)
+Substitute: pkgconfig(gles11)  pkgconfig(egl) pkgconfig(glesv1) pkgconfig(gl)
 
 %define _with_wayland 1
 %define _with_rdp 1
@@ -109,7 +109,7 @@ Macros:
 %if "%_repository" == "ia32-x11" || "%_repository" == "x86_64-x11" || "%_repository" == "arm-x11" || "%_repository" == "arm64-x11" || "%_repository" == "x11"
 
 Substitute: pkgconfig(gles20) pkgconfig(egl) pkgconfig(glesv2) pkgconfig(gl)
-Substitute: pkgconfig(gles11) pkgconfig(egl) pkgconfig(glesv1_cm) pkgconfig(gl) 
+Substitute: pkgconfig(gles11) pkgconfig(egl) pkgconfig(glesv1_cm) pkgconfig(gl)
 
 %define _with_x 1
 
@@ -124,7 +124,7 @@ Macros:
 %if "%_repository" == "ia32-xwayland" || "%_repository" == "x86_64-xwayland" || "%_repository" == "arm-xwayland" || "%_repository" == "arm64-xwayland" || "%_repository" == "xwayland"
 
 Substitute: pkgconfig(gles20) pkgconfig(egl) pkgconfig(glesv2) pkgconfig(gl)
-Substitute: pkgconfig(gles11) pkgconfig(egl) pkgconfig(glesv1_cm) pkgconfig(gl) 
+Substitute: pkgconfig(gles11) pkgconfig(egl) pkgconfig(glesv1_cm) pkgconfig(gl)
 
 %define _with_wayland 1
 %define _with_x 1
@@ -138,7 +138,7 @@ Macros:
 
 ############################# emulator repositories ############################
 
-%if "%_repository" == "emulator32-wayland" 
+%if "%_repository" == "emulator32-wayland"
 
 Prefer: mesa-libGLESv2
 Prefer: libwayland-egl
@@ -147,8 +147,8 @@ Prefer: mesa-libGL
 Prefer: mesa-libEGL
 Prefer: emulator-yagl
 
-Substitute: pkgconfig(gles20)  pkgconfig(egl) pkgconfig(glesv2) 
-Substitute: pkgconfig(gles11)  pkgconfig(egl) pkgconfig(glesv1) pkgconfig(gl) 
+Substitute: pkgconfig(gles20)  pkgconfig(egl) pkgconfig(glesv2)
+Substitute: pkgconfig(gles11)  pkgconfig(egl) pkgconfig(glesv1) pkgconfig(gl)
 
 %define _with_wayland 1
 %define _with_emulator 1
@@ -176,7 +176,7 @@ Macros:
 # Affects: bluetooth-frwk
 # Owner: Corentin Lecouvey <corentin.lecouvey@open.eurogiciel.org>
 Macros:
-%_with_bluetooth_frwk_libnotification 1 
+%_with_bluetooth_frwk_libnotification 1
 :Macros
 
 # This build macro controls whether the OS uses
@@ -227,13 +227,13 @@ Preinstall: qemu-linux-user-cross-arm
 Keep: qemu-linux-user-cross-arm
 %endif
 
-%ifarch armv7hl 
+%ifarch armv7hl
 Preinstall: qemu-accel-armv7hl
 Runscripts: qemu-accel-armv7hl
 Preinstall: libmount libblkid libuuid
 %endif
 
-%ifarch armv7l 
+%ifarch armv7l
 Preinstall: qemu-accel-armv7l-cross-arm
 Runscripts: qemu-accel-armv7l-cross-arm
 Preinstall: libmount libblkid libuuid
@@ -304,7 +304,7 @@ Preinstall: bash
 #FileProvides: libxml2.so.2(LIBXML2_2.4.30) libxml2
 #FileProvides: libxml2.so.2(LIBXML2_2.5.0) libxml2
 #FileProvides: libxml2.so.2(LIBXML2_2.6.0) libxml2
-#FileProvides: librpm.so.3()(64bit) rpm 
+#FileProvides: librpm.so.3()(64bit) rpm
 #FileProvides: librpmio.so.3()(64bit) rpm
 %endif # aarch64
 
@@ -340,7 +340,7 @@ Preinstall: smack libsmack libxml2 libmagic  libmagic-data
 Preinstall: libsqlite
 Preinstall: rpm-security-plugin
 
-VMinstall: perl libmount libblkid libext2fs libuuid  grep libpcre util-linux  
+VMinstall: perl libmount libblkid libext2fs libuuid  grep libpcre util-linux
 
 %ifarch aarch64
 Support: cross-aarch64-binutils cross-aarch64-gcc48-icecream-backend
@@ -351,15 +351,15 @@ Support: glibc-locale
 Support: perl
 Support: hostname
 Support: cpio findutils
-Support: file findutils zlib bzip2 
+Support: file findutils zlib bzip2
 Support: gzip hostname net-tools
-Support: make  patch sed  gawk tar grep coreutils pkg-config  
-Support: m4  tzdata 
+Support: make  patch sed  gawk tar grep coreutils pkg-config
+Support: m4  tzdata
 Support: util-linux
 Support: less
 Support: which  elfutils
 Support: update-alternatives
- 
+
 # FIXME: TO REMOVE (? comes from IVI)
 Support: gcc-c++
 
@@ -368,9 +368,9 @@ Keep: libstdc++%{gcc_version}-devel gcc%{gcc_version}-c++
 Keep: cpp gcc libstdc++
 Keep: pam
 Keep: binutils cpp  libmagic-data file findutils gawk gcc  gcc-c++
-Keep: gdbm gzip libada libunwind  glibc-devel libpcre xz-lzma-compat 
+Keep: gdbm gzip libada libunwind  glibc-devel libpcre xz-lzma-compat
 Keep: make  gmp libcap groff cpio
-Keep: patch rpm-build  nss nspr elfutils python grep libgcc gcc-c++ 
+Keep: patch rpm-build  nss nspr elfutils python grep libgcc gcc-c++
 Keep: kernel-headers  perl-libs perl
 Keep: pkgconfig glib2 tizen-rpm-config
 Keep: libmpc libmpfr libppl libgmp libppl_c
@@ -383,7 +383,7 @@ Prefer: libstdc++%{gcc_version}-32bit libstdc++%{gcc_version}-64bit
 
 Substitute: gettext gettext-tools
 
-%ifarch x86_64 
+%ifarch x86_64
 Substitute: glibc-devel-32bit glibc-devel-32bit glibc-32bit
 %else
 Substitute: glibc-devel-32bit
@@ -391,7 +391,7 @@ Substitute: glibc-devel-32bit
 
 ########## compilation flags ##########
 
-#%__global_cflags -O2 -g2 -feliminate-unused-debug-types -pipe -Wall  -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector  --param=ssp-buffer-size=32 -Wformat -Wformat-security  
+#%__global_cflags -O2 -g2 -feliminate-unused-debug-types -pipe -Wall  -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector  --param=ssp-buffer-size=32 -Wformat -Wformat-security
 
 Optflags: x86_64 -O2 -g2 -feliminate-unused-debug-types -pipe -Wall  -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector  --param=ssp-buffer-size=32 -Wformat -Wformat-security -fmessage-length=0 -m64 -march=corei7 -msse4.2  -mtune=corei7-avx -mfpmath=sse -fasynchronous-unwind-tables -fno-omit-frame-pointer  -fipa-cp-clone
 

diff --git a/meta.xml b/meta.xml
index 0dca9eb061cbfe8f0bc7de15a8e577c2b86cdfca..a7932ff4c1984a428bedbbbe3841bdd385081d1e 100644 (file)
--- a/meta.xml
+++ b/meta.xml
@@ -32,9 +32,6 @@
     <arch>i586</arch>
   </repository>
   <repository name="arm64-wayland">
-    <path project="devel:arm_toolchain:Mobile:Main" repository="aarch"/>
-    <path project="devel:arm_toolchain:Mobile:Base" repository="aarch"/>
-    <path project="devel:arm64binary:Mobile" repository="arm"/>
     <arch>aarch64</arch>
   </repository>
   <repository name="arm-wayland">