Update build-conf for IVI branch from OBS

Change-Id: I08fdfd661f6c645e8108557b831784f3357a3c2f
Signed-off-by: Li Jinjing <jinjingx.li@intel.com>

diff --git a/build-arm.conf b/build-arm.conf
index e275aea1bf4a875dccda2619c5cd75d9761975cb..1a66f1cddd9d33770897c39861dc650a789ca7fa 100644 (file)
--- a/build-arm.conf
+++ b/build-arm.conf
@@ -47,15 +47,16 @@ Macros:
 %_with_wayland 1
 :Macros
 
-############################# emulator repository ############################
-
-%if "%_repository" == "emulator"
-
 Prefer: mesa-libGLESv2
 Prefer: libwayland-egl
 Prefer: libgbm
 Prefer: mesa-libGL
 Prefer: mesa-libEGL
+
+############################# emulator repository ############################
+
+%if "%_repository" == "emulator"
+
 Prefer: emulator-yagl
 
 %define _with_emulator 1

diff --git a/build-atom.conf b/build-atom.conf
index d846aa5aa6d56c8d9515c66f5cf324bb2c9d5c45..26d03a8e12f447d3a0d4f6d45f211907b743bf62 100644 (file)
--- a/build-atom.conf
+++ b/build-atom.conf
@@ -47,15 +47,16 @@ Macros:
 %_with_wayland 1
 :Macros
 
-############################# emulator repository ############################
-
-%if "%_repository" == "emulator"
-
 Prefer: mesa-libGLESv2
 Prefer: libwayland-egl
 Prefer: libgbm
 Prefer: mesa-libGL
 Prefer: mesa-libEGL
+
+############################# emulator repository ############################
+
+%if "%_repository" == "emulator"
+
 Prefer: emulator-yagl
 
 %define _with_emulator 1

diff --git a/build-atom64.conf b/build-atom64.conf
index fa257b51da0a26d2306d30abf99197ab862b2680..ad767ac630934eaa442e6c7d87130a42e321a01b 100644 (file)
--- a/build-atom64.conf
+++ b/build-atom64.conf
@@ -47,15 +47,16 @@ Macros:
 %_with_wayland 1
 :Macros
 
-############################# emulator repository ############################
-
-%if "%_repository" == "emulator"
-
 Prefer: mesa-libGLESv2
 Prefer: libwayland-egl
 Prefer: libgbm
 Prefer: mesa-libGL
 Prefer: mesa-libEGL
+
+############################# emulator repository ############################
+
+%if "%_repository" == "emulator"
+
 Prefer: emulator-yagl
 
 %define _with_emulator 1

diff --git a/build-emulator.conf b/build-emulator.conf
index 259f0e8b1264082de085a118bfc3aeef4cfcc9ea..fbd72753b0d4d5697a788482bf73c6774dd85a88 100644 (file)
--- a/build-emulator.conf
+++ b/build-emulator.conf
@@ -47,15 +47,16 @@ Macros:
 %_with_wayland 1
 :Macros
 
-############################# emulator repository ############################
-
-%if "%_repository" == "emulator"
-
 Prefer: mesa-libGLESv2
 Prefer: libwayland-egl
 Prefer: libgbm
 Prefer: mesa-libGL
 Prefer: mesa-libEGL
+
+############################# emulator repository ############################
+
+%if "%_repository" == "emulator"
+
 Prefer: emulator-yagl
 
 %define _with_emulator 1