Update build-conf for common branch from OBS

Change-Id: Ida1d036ff8e8a1aeda83a8de2d2ff291416f0221
Signed-off-by: Rui Lv <ruix.lv@intel.com>

diff --git a/build-arm.conf b/build-arm.conf
index 8d9abfc3f196d40a53321d6c46c41563f0abb66d..ecac57caf3ad5d997013116d45feb40f10b10838 100644 (file)
--- a/build-arm.conf
+++ b/build-arm.conf
@@ -65,6 +65,7 @@ Macros:
 
 %endif
 
+%define _with_qt5 1
 %define _with_pulseaudio_samsung_policy 1
 %define _with_tizen 1
 %define _with_mesa 1
@@ -191,6 +192,13 @@ Macros:
 %_repository arm
 
 %profile ivi
+%release_name Tizen IVI 3.0
+%tizen_version_major 3
+%tizen_version_minor 0
+%tizen_version_patch 0
+%tizen_version %{tizen_version_major}.%{tizen_version_minor}
+%tizen_full_version %{tizen_version}.%{tizen_version_patch}
+%tizen %tizen_version
 %_with_ivi 1
 %_with_wayland 1
 %_with_tizen 1
@@ -200,23 +208,44 @@ Macros:
 %run_check_section 0
 %opensuse_bs 1
 %_default_patch_fuzz   2
-%_with_wrt_option_bluetooth 1
-%_with_wrt_option_msg_port 1
-%_with_wrt_option_call_history 1
+
+# Macro used to enable qt5 in Tizen project
+# Set qt5 to 1 also activate build of some sub-package
+# eg: automotive-message-broker
+# Tizen (Common, IVI, ...) can be delivered with or without qt5.
+%_with_qt5 1
+
+# Macro used to handle bluetooth popups without syspopup/bt-syspopup which
+# needs OSP . In IVI, this macro permits to address bluetooth notifications
+# (using C API) to notification-service daemon. Then homescreen is supposed
+# to deal with those notifications and display relevant popups.
+# Affects: bluetooth-frwk
 %_with_bluetooth_frwk_libnotification 1
-%_with_audio_session_manager 1
+
+# Macro used to control how the policy interfaces (using either the Samsung
+# solution (%_with_audio_session_manager) or Murphy with Samsung ASM
+# frontend (%_with_audio_session_manager_with_murphy)
+# Affects: libmm-sound
 %_with_audio_session_manager_with_murphy 1
-%_with_dlog_to_systemd_journal 1
-%_with_wrt_option_eds 1
-%_with_wrt_option_nfc 1
+
+# This build macro controls whether the OS uses legacy nfc-manager or
+# neard enabled nfc-manager-neard. If enabled, nfc-manager-neard is used.
+# Affects: nfc CAPI, emulator-plugin-nfc
 %_with_neard_nfc 1
+
+# Enable certain packages (for example, libgee and glib) to be compiled
+# with introspection enabled, which was required in IVI to compile Vala
+# source.
 %_with_introspection 1
-%_with_icosyscon 0
-%_with_pulseaudio_samsung_policy 1
 
-%tizen_version 3.0
-%tizen 3.0
+# This selects whether or not to use ICO system controller or Murphy
+# replacement.
+# Affects: murphy
+%_with_icosyscon 1
+
+# Uses mobile-specific Samsung patches for PulseAudio.
+# Affects: pulseaudio, libmm-sound
+%_with_pulseaudio_samsung_policy 1
 
 %vendor tizen
 %_vendor tizen
-

diff --git a/build-atom.conf b/build-atom.conf
index 35615afceee4f1fe7aea5ee541e7fbbb2ff4a08a..87916c1f5507cb150720dbbd770661893081436e 100644 (file)
--- a/build-atom.conf
+++ b/build-atom.conf
@@ -65,6 +65,7 @@ Macros:
 
 %endif
 
+%define _with_qt5 1
 %define _with_pulseaudio_samsung_policy 1
 %define _with_tizen 1
 %define _with_mesa 1
@@ -191,6 +192,13 @@ Macros:
 %_repository atom
 
 %profile ivi
+%release_name Tizen IVI 3.0
+%tizen_version_major 3
+%tizen_version_minor 0
+%tizen_version_patch 0
+%tizen_version %{tizen_version_major}.%{tizen_version_minor}
+%tizen_full_version %{tizen_version}.%{tizen_version_patch}
+%tizen %tizen_version
 %_with_ivi 1
 %_with_wayland 1
 %_with_tizen 1
@@ -200,23 +208,44 @@ Macros:
 %run_check_section 0
 %opensuse_bs 1
 %_default_patch_fuzz   2
-%_with_wrt_option_bluetooth 1
-%_with_wrt_option_msg_port 1
-%_with_wrt_option_call_history 1
+
+# Macro used to enable qt5 in Tizen project
+# Set qt5 to 1 also activate build of some sub-package
+# eg: automotive-message-broker
+# Tizen (Common, IVI, ...) can be delivered with or without qt5.
+%_with_qt5 1
+
+# Macro used to handle bluetooth popups without syspopup/bt-syspopup which
+# needs OSP . In IVI, this macro permits to address bluetooth notifications
+# (using C API) to notification-service daemon. Then homescreen is supposed
+# to deal with those notifications and display relevant popups.
+# Affects: bluetooth-frwk
 %_with_bluetooth_frwk_libnotification 1
-%_with_audio_session_manager 1
+
+# Macro used to control how the policy interfaces (using either the Samsung
+# solution (%_with_audio_session_manager) or Murphy with Samsung ASM
+# frontend (%_with_audio_session_manager_with_murphy)
+# Affects: libmm-sound
 %_with_audio_session_manager_with_murphy 1
-%_with_dlog_to_systemd_journal 1
-%_with_wrt_option_eds 1
-%_with_wrt_option_nfc 1
+
+# This build macro controls whether the OS uses legacy nfc-manager or
+# neard enabled nfc-manager-neard. If enabled, nfc-manager-neard is used.
+# Affects: nfc CAPI, emulator-plugin-nfc
 %_with_neard_nfc 1
+
+# Enable certain packages (for example, libgee and glib) to be compiled
+# with introspection enabled, which was required in IVI to compile Vala
+# source.
 %_with_introspection 1
-%_with_icosyscon 0
-%_with_pulseaudio_samsung_policy 1
 
-%tizen_version 3.0
-%tizen 3.0
+# This selects whether or not to use ICO system controller or Murphy
+# replacement.
+# Affects: murphy
+%_with_icosyscon 1
+
+# Uses mobile-specific Samsung patches for PulseAudio.
+# Affects: pulseaudio, libmm-sound
+%_with_pulseaudio_samsung_policy 1
 
 %vendor tizen
 %_vendor tizen
-

diff --git a/build-emulator.conf b/build-emulator.conf
index 014136c92991dd30d53086097c3fd1ce3cde4f38..6577bb20bdb96ecacbc240788529a2b39e635772 100644 (file)
--- a/build-emulator.conf
+++ b/build-emulator.conf
@@ -65,6 +65,7 @@ Macros:
 
 %endif
 
+%define _with_qt5 1
 %define _with_pulseaudio_samsung_policy 1
 %define _with_tizen 1
 %define _with_mesa 1
@@ -191,6 +192,13 @@ Macros:
 %_repository emulator
 
 %profile ivi
+%release_name Tizen IVI 3.0
+%tizen_version_major 3
+%tizen_version_minor 0
+%tizen_version_patch 0
+%tizen_version %{tizen_version_major}.%{tizen_version_minor}
+%tizen_full_version %{tizen_version}.%{tizen_version_patch}
+%tizen %tizen_version
 %_with_ivi 1
 %_with_wayland 1
 %_with_tizen 1
@@ -200,23 +208,44 @@ Macros:
 %run_check_section 0
 %opensuse_bs 1
 %_default_patch_fuzz   2
-%_with_wrt_option_bluetooth 1
-%_with_wrt_option_msg_port 1
-%_with_wrt_option_call_history 1
+
+# Macro used to enable qt5 in Tizen project
+# Set qt5 to 1 also activate build of some sub-package
+# eg: automotive-message-broker
+# Tizen (Common, IVI, ...) can be delivered with or without qt5.
+%_with_qt5 1
+
+# Macro used to handle bluetooth popups without syspopup/bt-syspopup which
+# needs OSP . In IVI, this macro permits to address bluetooth notifications
+# (using C API) to notification-service daemon. Then homescreen is supposed
+# to deal with those notifications and display relevant popups.
+# Affects: bluetooth-frwk
 %_with_bluetooth_frwk_libnotification 1
-%_with_audio_session_manager 1
+
+# Macro used to control how the policy interfaces (using either the Samsung
+# solution (%_with_audio_session_manager) or Murphy with Samsung ASM
+# frontend (%_with_audio_session_manager_with_murphy)
+# Affects: libmm-sound
 %_with_audio_session_manager_with_murphy 1
-%_with_dlog_to_systemd_journal 1
-%_with_wrt_option_eds 1
-%_with_wrt_option_nfc 1
+
+# This build macro controls whether the OS uses legacy nfc-manager or
+# neard enabled nfc-manager-neard. If enabled, nfc-manager-neard is used.
+# Affects: nfc CAPI, emulator-plugin-nfc
 %_with_neard_nfc 1
+
+# Enable certain packages (for example, libgee and glib) to be compiled
+# with introspection enabled, which was required in IVI to compile Vala
+# source.
 %_with_introspection 1
-%_with_icosyscon 0
-%_with_pulseaudio_samsung_policy 1
 
-%tizen_version 3.0
-%tizen 3.0
+# This selects whether or not to use ICO system controller or Murphy
+# replacement.
+# Affects: murphy
+%_with_icosyscon 1
+
+# Uses mobile-specific Samsung patches for PulseAudio.
+# Affects: pulseaudio, libmm-sound
+%_with_pulseaudio_samsung_policy 1
 
 %vendor tizen
 %_vendor tizen
-

diff --git a/meta.xml b/meta.xml
index b57b9b2620cd0eaa7dba5f04965c0858c18bc699..02c1aed55c2c522964c0b63287e332f440e72cba 100644 (file)
--- a/meta.xml
+++ b/meta.xml
@@ -8,6 +8,9 @@
   <person userid="sdx" role="maintainer"/>
   <build>
     <disable arch="i586" repository="arm"/>
+    <disable arch="x86_64" repository="arm"/>
+    <disable arch="i586" repository="atom64"/>
+    <disable arch="armv7l" repository="atom64"/>
   </build>
   <debuginfo>
     <enable/>
@@ -15,6 +18,10 @@
   <repository name="emulator">
     <arch>i586</arch>
   </repository>
+  <repository name="atom64">
+    <arch>x86_64</arch>
+    <arch>i586</arch>
+  </repository>
   <repository name="atom">
     <arch>i586</arch>
   </repository>