Update build conf from obs

- fix update_from_obs script issue
- update from obs

Change-Id: I6bcf19df5e5042842b2f4136aff6d8ad0768e173

7 files changed, 17 insertions, 456 deletions

diff --git a/build-arm-wayland.conf b/build-arm.conf
index a0d7a8c..6b68c2c 100644
--- a/build-arm-wayland.conf
+++ b/build-arm.conf
@@ -1,18 +1,18 @@
 %define _project Tizen:IVI
 
 ### from Tizen:IVI
-%define _repository arm-wayland
+%define _repository arm
 
 Macros:
 %vendor obs://build.tizen.org/Tizen:IVI
 %_project Tizen:IVI
 
-%distribution Tizen:IVI / arm-wayland
+%distribution Tizen:IVI / arm
 %_project Tizen:IVI
 
 ### from Tizen:IVI
 
-%_repository arm-wayland
+%_repository arm
 :Macros
 
 Patterntype: rpm-md comps
@@ -109,6 +109,7 @@ Preinstall: util-linux libmount libblkid libuuid
 ExportFilter: ^qemu-linux-user-.*\.i686\.rpm$ . armv7l
 ExportFilter: ^qemu-accel-armv7l.*\.i686\.rpm$ .  armv7l
 ExportFilter: \.armv7l\.rpm$ armv7l
+ExportFilter: \.x86_64\.rpm$ x86_64
 
 Preinstall: setup filesystem
 RunScripts: setup
@@ -187,7 +188,7 @@ Optflags: armv7l -O2 -g2 -feliminate-unused-debug-types -pipe -Wall  -Wp,-D_FORT
 Macros:
 
 ### from Tizen:IVI
-%_repository arm-wayland
+%_repository arm
 
 %profile ivi
 %_with_ivi 1
diff --git a/build-arm64-wayland.conf b/build-atom.conf
index fab5501..ff4a80f 100644
--- a/build-arm64-wayland.conf
+++ b/build-atom.conf
@@ -1,18 +1,18 @@
 %define _project Tizen:IVI
 
 ### from Tizen:IVI
-%define _repository arm64-wayland
+%define _repository atom
 
 Macros:
 %vendor obs://build.tizen.org/Tizen:IVI
 %_project Tizen:IVI
 
-%distribution Tizen:IVI / arm64-wayland
+%distribution Tizen:IVI / atom
 %_project Tizen:IVI
 
 ### from Tizen:IVI
 
-%_repository arm64-wayland
+%_repository atom
 :Macros
 
 Patterntype: rpm-md comps
@@ -109,6 +109,7 @@ Preinstall: util-linux libmount libblkid libuuid
 ExportFilter: ^qemu-linux-user-.*\.i686\.rpm$ . armv7l
 ExportFilter: ^qemu-accel-armv7l.*\.i686\.rpm$ .  armv7l
 ExportFilter: \.armv7l\.rpm$ armv7l
+ExportFilter: \.x86_64\.rpm$ x86_64
 
 Preinstall: setup filesystem
 RunScripts: setup
@@ -187,7 +188,7 @@ Optflags: armv7l -O2 -g2 -feliminate-unused-debug-types -pipe -Wall  -Wp,-D_FORT
 Macros:
 
 ### from Tizen:IVI
-%_repository arm64-wayland
+%_repository atom
 
 %profile ivi
 %_with_ivi 1
diff --git a/build-x86_64-wayland.conf b/build-emulator.conf
index bfbd667..f069c0e 100644
--- a/build-x86_64-wayland.conf
+++ b/build-emulator.conf
@@ -1,18 +1,18 @@
 %define _project Tizen:IVI
 
 ### from Tizen:IVI
-%define _repository x86_64-wayland
+%define _repository emulator
 
 Macros:
 %vendor obs://build.tizen.org/Tizen:IVI
 %_project Tizen:IVI
 
-%distribution Tizen:IVI / x86_64-wayland
+%distribution Tizen:IVI / emulator
 %_project Tizen:IVI
 
 ### from Tizen:IVI
 
-%_repository x86_64-wayland
+%_repository emulator
 :Macros
 
 Patterntype: rpm-md comps
@@ -109,6 +109,7 @@ Preinstall: util-linux libmount libblkid libuuid
 ExportFilter: ^qemu-linux-user-.*\.i686\.rpm$ . armv7l
 ExportFilter: ^qemu-accel-armv7l.*\.i686\.rpm$ .  armv7l
 ExportFilter: \.armv7l\.rpm$ armv7l
+ExportFilter: \.x86_64\.rpm$ x86_64
 
 Preinstall: setup filesystem
 RunScripts: setup
@@ -187,7 +188,7 @@ Optflags: armv7l -O2 -g2 -feliminate-unused-debug-types -pipe -Wall  -Wp,-D_FORT
 Macros:
 
 ### from Tizen:IVI
-%_repository x86_64-wayland
+%_repository emulator
 
 %profile ivi
 %_with_ivi 1
diff --git a/build-emulator32-wayland.conf b/build-emulator32-wayland.conf
deleted file mode 100644
index 65e634b..0000000
--- a/build-emulator32-wayland.conf
+++ /dev/null
@@ -1,221 +0,0 @@
-%define _project Tizen:IVI
-
-### from Tizen:IVI
-%define _repository emulator32-wayland
-
-Macros:
-%vendor obs://build.tizen.org/Tizen:IVI
-%_project Tizen:IVI
-
-%distribution Tizen:IVI / emulator32-wayland
-%_project Tizen:IVI
-
-### from Tizen:IVI
-
-%_repository emulator32-wayland
-:Macros
-
-Patterntype: rpm-md comps
-Release: <CI_CNT>.<B_CNT>
-Support: build
-Support: build-compare build-mkbaselibs
-Support: rpmlint-mini rpmlint-tizen
-
-FileProvides: /usr/sbin/groupadd pwdutils
-Prefer: util-linux
-#Prefer: nfc-manager
-#Prefer: nfc-manager-devel
-#Prefer: nfc-common-lib-devel
-#Prefer: nfc-common-lib
-#Prefer: nfc-client-lib
-#Prefer: nfc-client-lib-devel
-Prefer: libtapi-devel
-
-#| wayland |  x  | meaning
-#|---------------------------
-#|   0     |  1  | pure X11 platform(no wayland)
-#|   1     |  0  | pure wayland platform (no X11)
-#|   1     |  1  | wayland but X compatibility
-#|   0     |  0  | no X and no wayland
-
-# mesa
-Substitute: pkgconfig(gles20)  pkgconfig(egl) pkgconfig(glesv2)
-Substitute: pkgconfig(gles11)  pkgconfig(egl) pkgconfig(glesv1) pkgconfig(gl)
-%define _with_wayland 1
-Macros:
-%_with_wayland 1
-:Macros
-
-############################# emulator repository ############################
-
-%if "%_repository" == "emulator"
-
-Prefer: mesa-libGLESv2
-Prefer: libwayland-egl
-Prefer: libgbm
-Prefer: mesa-libGL
-Prefer: mesa-libEGL
-Prefer: emulator-yagl
-
-%define _with_emulator 1
-
-Macros:
-%_with_emulator 1
-:Macros
-
-%endif
-
-%define _with_pulseaudio_samsung_policy 1
-%define _with_tizen 1
-%define _with_mesa 1
-%define gcc_version 48
-%define profile common
-
-%ifarch i586
-Target: i686-tizen-linux
-%endif
-
-%ifarch armv7hl
-Target: armv7hl-tizen-linux
-%endif
-
-%ifarch armv7l
-Target: armv7l-tizen-linux
-%endif
-
-%ifarch %arm armv7l
-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: util-linux libmount libblkid libuuid
-%endif
-%ifarch armv7l
-Preinstall: qemu-accel-armv7l-cross-arm
-Runscripts: qemu-accel-armv7l-cross-arm
-Preinstall: util-linux libmount libblkid libuuid
-%endif
-%ifarch armv7el
-Preinstall: qemu-accel-armv7el
-Runscripts: qemu-accel-armv7el
-Preinstall: util-linux libmount libblkid libuuid
-%endif
-
-ExportFilter: ^qemu-linux-user-.*\.i686\.rpm$ . armv7l
-ExportFilter: ^qemu-accel-armv7l.*\.i686\.rpm$ .  armv7l
-ExportFilter: \.armv7l\.rpm$ armv7l
-
-Preinstall: setup filesystem
-RunScripts: setup
-
-Preinstall: bash bzip2 coreutils diffutils grep rpm
-Preinstall: glibc libacl libattr
-Preinstall: libcap
-Preinstall: libgcc_s1
-Preinstall: libpopt sed tar zlib
-Preinstall: libncurses libreadline
-Preinstall: libelf libbz2
-Preinstall: liblzma
-Preinstall: nss nspr libfreebl3 libsoftokn3
-Preinstall: libmagic
-Preinstall: liblua
-Preinstall: smack libsmack libxml2 libmagic  libmagic-data
-Preinstall: libsqlite
-Preinstall: rpm-security-plugin
-Preinstall: util-linux
-
-VMinstall: perl libmount libblkid libext2fs libuuid  grep libpcre util-linux
-
-Required: binutils gcc glibc rpm-build libtool
-
-Support: glibc-locale
-Support: perl
-Support: hostname
-Support: cpio findutils
-Support: file findutils zlib bzip2
-Support: gzip hostname net-tools
-Support: make  patch sed  gawk tar grep coreutils pkg-config
-Support: m4  tzdata
-Support: util-linux
-Support: less
-Support: which  elfutils
-Support: update-alternatives
-
-# TO REMOVE
-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: 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: make  gmp libcap groff cpio
-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
-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
-
-Substitute: gettext gettext-tools
-
-
-%ifarch x86_64
-Substitute: glibc-devel-32bit glibc-devel-32bit glibc-32bit
-%else
-Substitute: glibc-devel-32bit
-%endif
-
-
-#%__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
-
-Optflags: armv7l -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 -march=armv7-a -mtune=cortex-a8 -mlittle-endian  -mfpu=vfpv3 -mfloat-abi=softfp -D__SOFTFP__
-
-
-Macros:
-
-### from Tizen:IVI
-%_repository emulator32-wayland
-
-%profile ivi
-%_with_ivi 1
-%_with_wayland 1
-%_with_tizen 1
-%_with_mesa 1
-%_with_desktop 1
-%check exit 0
-%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
-%_with_bluetooth_frwk_libnotification 1
-%_with_audio_session_manager 1
-%_with_audio_session_manager_with_murphy 1
-%_with_dlog_to_systemd_journal 1
-%_with_wrt_option_eds 1
-%_with_wrt_option_nfc 1
-%_with_neard_nfc 1
-%_with_introspection 1
-%_with_icosyscon 0
-%_with_pulseaudio_samsung_policy 1
-
-%tizen_version 3.0
-%tizen 3.0
-
-%vendor tizen
-%_vendor tizen
-
diff --git a/build-ia32-wayland.conf b/build-ia32-wayland.conf
deleted file mode 100644
index 0d73f02..0000000
--- a/build-ia32-wayland.conf
+++ /dev/null
@@ -1,221 +0,0 @@
-%define _project Tizen:IVI
-
-### from Tizen:IVI
-%define _repository ia32-wayland
-
-Macros:
-%vendor obs://build.tizen.org/Tizen:IVI
-%_project Tizen:IVI
-
-%distribution Tizen:IVI / ia32-wayland
-%_project Tizen:IVI
-
-### from Tizen:IVI
-
-%_repository ia32-wayland
-:Macros
-
-Patterntype: rpm-md comps
-Release: <CI_CNT>.<B_CNT>
-Support: build
-Support: build-compare build-mkbaselibs
-Support: rpmlint-mini rpmlint-tizen
-
-FileProvides: /usr/sbin/groupadd pwdutils
-Prefer: util-linux
-#Prefer: nfc-manager
-#Prefer: nfc-manager-devel
-#Prefer: nfc-common-lib-devel
-#Prefer: nfc-common-lib
-#Prefer: nfc-client-lib
-#Prefer: nfc-client-lib-devel
-Prefer: libtapi-devel
-
-#| wayland |  x  | meaning
-#|---------------------------
-#|   0     |  1  | pure X11 platform(no wayland)
-#|   1     |  0  | pure wayland platform (no X11)
-#|   1     |  1  | wayland but X compatibility
-#|   0     |  0  | no X and no wayland
-
-# mesa
-Substitute: pkgconfig(gles20)  pkgconfig(egl) pkgconfig(glesv2)
-Substitute: pkgconfig(gles11)  pkgconfig(egl) pkgconfig(glesv1) pkgconfig(gl)
-%define _with_wayland 1
-Macros:
-%_with_wayland 1
-:Macros
-
-############################# emulator repository ############################
-
-%if "%_repository" == "emulator"
-
-Prefer: mesa-libGLESv2
-Prefer: libwayland-egl
-Prefer: libgbm
-Prefer: mesa-libGL
-Prefer: mesa-libEGL
-Prefer: emulator-yagl
-
-%define _with_emulator 1
-
-Macros:
-%_with_emulator 1
-:Macros
-
-%endif
-
-%define _with_pulseaudio_samsung_policy 1
-%define _with_tizen 1
-%define _with_mesa 1
-%define gcc_version 48
-%define profile common
-
-%ifarch i586
-Target: i686-tizen-linux
-%endif
-
-%ifarch armv7hl
-Target: armv7hl-tizen-linux
-%endif
-
-%ifarch armv7l
-Target: armv7l-tizen-linux
-%endif
-
-%ifarch %arm armv7l
-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: util-linux libmount libblkid libuuid
-%endif
-%ifarch armv7l
-Preinstall: qemu-accel-armv7l-cross-arm
-Runscripts: qemu-accel-armv7l-cross-arm
-Preinstall: util-linux libmount libblkid libuuid
-%endif
-%ifarch armv7el
-Preinstall: qemu-accel-armv7el
-Runscripts: qemu-accel-armv7el
-Preinstall: util-linux libmount libblkid libuuid
-%endif
-
-ExportFilter: ^qemu-linux-user-.*\.i686\.rpm$ . armv7l
-ExportFilter: ^qemu-accel-armv7l.*\.i686\.rpm$ .  armv7l
-ExportFilter: \.armv7l\.rpm$ armv7l
-
-Preinstall: setup filesystem
-RunScripts: setup
-
-Preinstall: bash bzip2 coreutils diffutils grep rpm
-Preinstall: glibc libacl libattr
-Preinstall: libcap
-Preinstall: libgcc_s1
-Preinstall: libpopt sed tar zlib
-Preinstall: libncurses libreadline
-Preinstall: libelf libbz2
-Preinstall: liblzma
-Preinstall: nss nspr libfreebl3 libsoftokn3
-Preinstall: libmagic
-Preinstall: liblua
-Preinstall: smack libsmack libxml2 libmagic  libmagic-data
-Preinstall: libsqlite
-Preinstall: rpm-security-plugin
-Preinstall: util-linux
-
-VMinstall: perl libmount libblkid libext2fs libuuid  grep libpcre util-linux
-
-Required: binutils gcc glibc rpm-build libtool
-
-Support: glibc-locale
-Support: perl
-Support: hostname
-Support: cpio findutils
-Support: file findutils zlib bzip2
-Support: gzip hostname net-tools
-Support: make  patch sed  gawk tar grep coreutils pkg-config
-Support: m4  tzdata
-Support: util-linux
-Support: less
-Support: which  elfutils
-Support: update-alternatives
-
-# TO REMOVE
-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: 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: make  gmp libcap groff cpio
-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
-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
-
-Substitute: gettext gettext-tools
-
-
-%ifarch x86_64
-Substitute: glibc-devel-32bit glibc-devel-32bit glibc-32bit
-%else
-Substitute: glibc-devel-32bit
-%endif
-
-
-#%__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
-
-Optflags: armv7l -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 -march=armv7-a -mtune=cortex-a8 -mlittle-endian  -mfpu=vfpv3 -mfloat-abi=softfp -D__SOFTFP__
-
-
-Macros:
-
-### from Tizen:IVI
-%_repository ia32-wayland
-
-%profile ivi
-%_with_ivi 1
-%_with_wayland 1
-%_with_tizen 1
-%_with_mesa 1
-%_with_desktop 1
-%check exit 0
-%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
-%_with_bluetooth_frwk_libnotification 1
-%_with_audio_session_manager 1
-%_with_audio_session_manager_with_murphy 1
-%_with_dlog_to_systemd_journal 1
-%_with_wrt_option_eds 1
-%_with_wrt_option_nfc 1
-%_with_neard_nfc 1
-%_with_introspection 1
-%_with_icosyscon 0
-%_with_pulseaudio_samsung_policy 1
-
-%tizen_version 3.0
-%tizen 3.0
-
-%vendor tizen
-%_vendor tizen
-
diff --git a/build.conf b/build.conf
index c6fb3a8..1370e82 120000
--- a/build.conf
+++ b/build.conf
@@ -1 +1 @@
-build-ia32-wayland.conf
\ No newline at end of file
+build-atom.conf
\ No newline at end of file
diff --git a/update_from_obs b/update_from_obs
index f39f9ed..9537977 100755
--- a/update_from_obs
+++ b/update_from_obs
@@ -4,7 +4,7 @@ project="Tizen:IVI"
 default_target="atom"
 osc_cmd="osc -A https://api.tizen.org"
 
-targets=`$osc_cmd repos Tizen:Common|awk '{print $1}'|sort |uniq`
+targets=`$osc_cmd repos $project|awk '{print $1}'|sort |uniq`
 
 echo "downloading build configs ..."
 for target in $targets