use tizen 6.0 conf file

Because tizen conf file is changed, the related case should be changed also
Change-Id: Ifdf8992b31f9d37cc81344f6d8f1e336b05dac99
Signed-off-by: biao716.wang <biao716.wang@samsung.com>

diff --git a/cases/build/test_build_export_filter.case b/cases/build/test_build_export_filter.case
index c10263b..68ba3de 100644 (file)
--- a/cases/build/test_build_export_filter.case
+++ b/cases/build/test_build_export_filter.case
@@ -19,9 +19,9 @@ gbs -c base.cfg build --arch=i586 --clean --overwrite fake
 
 ./create_proj sw-tools.spec
 
-sed -i '125 a\ExportFilter: ^fake.*\\.i686\\.rpm$ armv7l' tizen.conf
+sed -i '135 a\ExportFilter: ^fake.*\\.i686\\.rpm$ armv7l' tizen.conf
 
-sed -i '136 a\Preinstall: fake' tizen.conf
+sed -i '145 a\Preinstall: fake' tizen.conf
 
 #broken register
 sudo sh -c "echo -1 >/proc/sys/fs/binfmt_misc/status"

diff --git a/cases/build/test_build_special_dir_ia32.case b/cases/build/test_build_special_dir_ia32.case
index 8fae2f5..85e3102 100644 (file)
--- a/cases/build/test_build_special_dir_ia32.case
+++ b/cases/build/test_build_special_dir_ia32.case
@@ -17,12 +17,12 @@ sudo /bin/rm -rf ~/buildroot/local/BUILD-ROOTS/scratch.i586.0
 
 ./create_proj fake.spec
 
-gbs -c base.cfg build --buildroot=~/sk\\test -A i586 2>&1 | tee log
+gbs -c base.cfg build --buildroot=~/sktest -A i586 2>&1 | tee log
 
 test -z "`grep "mount:.*scratch" log`"
 
 cd fake && test -n "`git status | grep "working directory clean"`" && cd ..
 
-test -n "`find ~/sk\\\\test/local/repos -name "*fake*.rpm"`"
+test -n "`find ~/sktest/local/repos -name "*fake*.rpm"`"
 ]]></steps>
 </testcase>

diff --git a/fixtures/conf/tizen.conf b/fixtures/conf/tizen.conf
index 5b7e5d9..8cfe5d8 100644 (file)
--- a/fixtures/conf/tizen.conf
+++ b/fixtures/conf/tizen.conf
@@ -1,3 +1,17 @@
+%define _project Tizen:Unified
+
+### from Tizen:Base
+%define _repository standard
+
+Macros:
+%vendor obs://private/Tizen:Unified
+%_project Tizen:Unified
+
+### from Tizen:Base
+
+%_repository standard
+:Macros
+
 ################################################################################
 # OBS Project config for Tizen:Base
 #
@@ -30,17 +44,18 @@ Prefer: mono-data-sqlite
 #     But when building 64bit target, they could make 'have choice' error with original libs in 64bit repository.
 #     e.g., libstdc++ and libstdc++-64bit provides same libs. It's ambiguous to choose appropriate one.
 #     Owner : Jiyoung Yun (jy910.yun@samsung.com)
-Prefer: libgcc libstdc++ libunwind libuuid zlib libopenssl
+#     libopenssl11 : Dongsun Lee (ds73.lee@samsung.com)
+Prefer: libgcc libstdc++ libunwind libuuid zlib libopenssl libopenssl11
 
 ############################# base definition ###############################
 
 # %release_name and %tizen_full_version are used in platform/upstream/tizen-release
 
 Macros:
-%release_name Tizen5/Unified
+%release_name Tizen6/Unified
 
-%tizen_version_major 5
-%tizen_version_minor 5
+%tizen_version_major 6
+%tizen_version_minor 0
 %tizen_version_patch 0
 
 %tizen_version %{tizen_version_major}.%{tizen_version_minor}
@@ -62,11 +77,6 @@ Macros:
 
 ############################# build config #####################################
 
-%define gcc_version 62
-Macros:
-%gcc_version 62
-:Macros
-
 ########## targets ##########
 
 %ifarch i586
@@ -95,9 +105,9 @@ Macros:
 %ifarch %arm armv7l aarch64
 Hostarch: x86_64
 # cross build support for the build hosts
-#Preinstall: qemu-linux-user-%{build_hostarch}-cross
-#Runscripts: qemu-linux-user-%{build_hostarch}-cross
-#Keep: qemu-linux-user-%{build_hostarch}-cross
+Preinstall: qemu-linux-user-%{build_hostarch}-cross
+Runscripts: qemu-linux-user-%{build_hostarch}-cross
+Keep: qemu-linux-user-%{build_hostarch}-cross
 Macros:
 %qemu_user_space_build 1
 :Macros
@@ -202,10 +212,176 @@ Substitute: glibc-devel-32bit
 %endif
 
 ########## compilation flags ##########
-%define __global_cflags -O2 -g2 -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector -Wformat-security -fmessage-length=0 -Wl,--as-needed
+%define __global_cflags -O2 -g2 -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong -Wformat-security -fmessage-length=0 -frecord-gcc-switches -Wl,-z,relro,--as-needed
 
 Optflags: armv7l %{__global_cflags} --param=ssp-buffer-size=4 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -mthumb -Wp,-D__SOFTFP__ -Wl,-O1 -Wl,--hash-style=gnu -Wa,-mimplicit-it=thumb
 Optflags: aarch64 %{__global_cflags} -feliminate-unused-debug-types -Wformat -march=armv8-a+fp+simd+crc+crypto -mtune=cortex-a57.cortex-a53
-Optflags: i686 %{__global_cflags} -feliminate-unused-debug-types --param=ssp-buffer-size=4 -fdiagnostics-color=never -m32 -march=i686 -mtune=i686 -msse4.2 -mfpmath=sse -fasynchronous-unwind-tables -fno-omit-frame-pointer
+Optflags: i686 %{__global_cflags} -feliminate-unused-debug-types --param=ssp-buffer-size=4 -fdiagnostics-color=never -m32 -march=i686 -mtune=i686 -msse4.2 -mfpmath=sse -fasynchronous-unwind-tables -fno-omit-frame-pointer -mstackrealign
 Optflags: x86_64 %{__global_cflags} -feliminate-unused-debug-types --param=ssp-buffer-size=4 -fdiagnostics-color=never -m64 -march=nehalem -msse4.2 -mfpmath=sse -fasynchronous-unwind-tables -fno-omit-frame-pointer
+### from Tizen:Unified
+%define _repository standard
+
+Macros:
+
+%distribution Tizen:Unified
+%_project Tizen:Unified
+
+### from Tizen:Unified
+
+%_repository standard
+:Macros
+
+################################################################################
+# OBS Project config for Tizen:Unified
+#
+# vim: set syntax=spec:
+################################################################################
+
+############################# conflicts resolution #############################
+
+FileProvides: /usr/sbin/groupadd shadow-utils
+Prefer: bluetooth-tools-no-firmware
+
+############################# profile definition ###############################
+
+%define _with_tizen 1
+
+# For classifying debug/release mode
+Macros:
+%tizen_build_devel_mode 1
+:Macros
+
+# %release_name and %tizen_full_version are used in platform/upstream/tizen-release
+
+Macros:
+%release_name Tizen5/Unified
+
+%tizen_version_major 5
+%tizen_version_minor 5
+%tizen_version_patch 0
+
+%tizen_version %{tizen_version_major}.%{tizen_version_minor}
+%tizen_full_version %{tizen_version}.%{tizen_version_patch}
+%tizen %tizen_version
+%vendor tizen
+%_vendor tizen
+%_with_tizen 1
+
+#### %__spec_check_pre exit 0
+#### %run_check_section 0
+%opensuse_bs 1
+%_default_patch_fuzz   2
+:Macros
+
+########## mesa activation / coregl ##########
+
+%define _with_mesa 1
+Macros:
+%_with_mesa 1
+:Macros
+
+Substitute: mesa-devel pkgconfig(glesv2)
+Substitute: pkgconfig(gles20)  pkgconfig(egl) pkgconfig(glesv2)
+Substitute: pkgconfig(gles11)  pkgconfig(egl) pkgconfig(glesv1) pkgconfig(gl)
+
+Prefer: coregl coregl-devel
+Prefer: libwayland-egl libwayland-egl-devel
+Prefer: vulkan-loader vulkan-loader-devel
+#libelementary.so (upstream, tizen-only ) so add below Prefer. Requested by EFL team. 
+Prefer: elementary
+
+########## WAYLAND #########
+
+%define _with_wayland 1
+Macros:
+%_with_wayland 1
+:Macros
+
+########## RDP flag ##########
+
+# enable/disable RDP (remote desktop protocol) for wayland
+# flag: _with_rdp, used in repositories
+# Affects: weston, freerdp
+# Owner: Manuel <manuel.bachmann@open.eurogiciel.org>
+
+############################# target repositories #############################
+
+%if "%_repository" == "standard"
+
+Prefer: mesa libgbm
+Substitute: mesa-libGLESv2 coregl
+Substitute: mesa-libEGL coregl
+
+%define _with_rdp 1
+Macros:
+%_with_rdp 1
+:Macros
+
+%endif
+
+############################# emulator repositories ############################
+
+%if "%_repository" == "emulator"
+
+Prefer: libgbm
+Prefer: emulator-yagl emulator-yagl-devel
+
+%define _with_emulator 1
+Macros:
+%_with_emulator 1
+:Macros
+
+%endif
+
+############################# misc config flags ################################
+########## USAGE ##########
+#
+# IMPORTANT: please follow the following rules when playing with flags
+# ********************************************************************
+#
+# In spec file, call %bcond_with macro at the beginning and test with %with:
+# -------------------------
+# | %bcond_with myfeature
+# | [...]
+# | %if %{with myfeature}
+# | [...]
+# | %endif
+# | [...]
+# -------------------------
+#
+# To activate an option, use:
+# -------------------------
+# | %define _with_myfeature 1
+# | Macros:
+# | %_with_myfeature 1
+# | :Macros
+# -------------------------
+#
+# To disable an option, DON'T set the values to 0, as the option would still be defined
+# but simply comment the lines: this will undefine the option.
+# -------------------------
+# | #%define _with_myfeature 1
+# | #Macros:
+# | #%_with_myfeature 1
+# | #:Macros
+# -------------------------
+#
+# More information here:
+# https://en.opensuse.org/openSUSE:Build_Service_prjconf#.25bcond
+#
+
+########## flags ##########
+
+# Activate introspection
+# This is needed on GuPNP to build Rygel correctly in IVI
+# Impacts potentially packages that use gobject-introspection
+# Owner: Mikko <mikko.ylinen@intel.com>
+
+Macros:
+%_with_introspection 1
+:Macros
+
+############################# other config #####################################
+# derived from Tizen:Base
+################################################################################
 

diff --git a/settings.pyc b/settings.pyc
deleted file mode 100644 (file)
index 4067267..0000000
Binary files a/settings.pyc and /dev/null differ