From: biao716.wang Date: Thu, 6 Jun 2019 13:16:36 +0000 (+0800) Subject: change gbs case with public repos X-Git-Tag: submit/devel/20190730.074552^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ff7f35d3ef8d694341d22786263a343837088ef9;p=tools%2Fitest-cases-gbs.git change gbs case with public repos Change-Id: I651e9c2f08907a81ed8f167d1d2eddbc9f4107d5 --- diff --git a/cases/build/test_build_as_root.case b/cases/build/test_build_as_root.case index 56175a2..da22113 100644 --- a/cases/build/test_build_as_root.case +++ b/cases/build/test_build_as_root.case @@ -20,20 +20,16 @@ sudo /bin/rm -rf /root/GBS-ROOT/local/repos cp base.cfg /var/tmp/ -#ssh root@localhost gbs -c /var/tmp/base.cfg build -A i586 --skip-conf-repos -R http://10.113.136.109/repo/download.tizen.org/releases/daily/tizen/ivi/latest/repos/atom/packages/ --clean /var/tmp/fake -sudo su -l root -c "gbs -c /var/tmp/base.cfg build -A i586 --skip-conf-repos -R http://download.tizen.org/releases/2.2/latest/repos/tizen-base/ia32/packages/ --clean /var/tmp/fake" +sudo su -l root -c "gbs -c /var/tmp/base.cfg build -A i586 --skip-conf-repos -R http://download.tizen.org/releases/milestone/tizen/base/latest/repos/standard/packages/ --clean /var/tmp/fake" -#sudo su -l root -c "gbs -c /var/tmp/base.cfg build -A i586 --skip-conf-repos -R http://download.tizen.org/releases/daily/tizen/ivi/latest/repos/atom/packages/ --clean /var/tmp/fake" - test -n "`sudo find /root/GBS-ROOT/local/repos -name '*fake*.rpm'`" rm -rf ~/GBS-ROOT/local/repos -gbs -c /var/tmp/base.cfg build -A i586 --skip-conf-repos -R http://download.tizen.org/releases/2.2/latest/repos/tizen-base/ia32/packages/ --clean /var/tmp/fake +gbs -c /var/tmp/base.cfg build -A i586 --skip-conf-repos -R http://download.tizen.org/releases/milestone/tizen/base/latest/repos/standard/packages/ --clean /var/tmp/fake -#gbs -c /var/tmp/base.cfg build -A i586 --skip-conf-repos -R http://download.tizen.org/releases/daily/tizen/ivi/latest/repos/atom/packages/ --clean /var/tmp/fake test -n "`find ~/GBS-ROOT/local/repos -name '*fake*.rpm'`" ]]> diff --git a/cases/build/test_build_binary_from_file_arm.case b/cases/build/test_build_binary_from_file_arm.case index 3efcdcb..d644fa7 100644 --- a/cases/build/test_build_binary_from_file_arm.case +++ b/cases/build/test_build_binary_from_file_arm.case @@ -7,6 +7,7 @@ + /proc/sys/fs/binfmt_misc/status" -gbs -c base.cfg build --binary-from-file=bin-list -A armv7l 2>&1 | tee log +gbs -c base.cfg build --binary-from-file=bin-list -A armv7l -D tizen.conf 2>&1 | tee log AssertCleanWith fake power xorg-x11-filesystem diff --git a/cases/build/test_build_binary_list_mix_file.case b/cases/build/test_build_binary_list_mix_file.case index add348a..ac6a476 100644 --- a/cases/build/test_build_binary_list_mix_file.case +++ b/cases/build/test_build_binary_list_mix_file.case @@ -13,6 +13,7 @@ + bin-list -gbs -c base.cfg build --binary-from-file=bin-list --binary-list=fake-dev,xorg-x11-filesystem -A armv7l 2>&1 | tee log +gbs -c base.cfg build --binary-from-file=bin-list --binary-list=fake-dev,xorg-x11-filesystem -A armv7l -D tizen.conf 2>&1 | tee log AssertCleanWith fake fake-dev power xorg-x11-filesystem diff --git a/cases/build/test_build_change_arch_skip.case b/cases/build/test_build_change_arch_skip.case index a32cedf..3922329 100644 --- a/cases/build/test_build_change_arch_skip.case +++ b/cases/build/test_build_change_arch_skip.case @@ -8,6 +8,7 @@ + /proc/sys/fs/binfmt_misc/status" -gbs -c base.cfg build sw-tools -A armv7l 2>&1 | tee log +gbs -c base.cfg build sw-tools -A armv7l -D tizen.conf 2>&1 | tee log #check arch changed, no skip any more test -z "`grep "skip.*sw-tools" log`" diff --git a/cases/build/test_build_clean-once_arm.case b/cases/build/test_build_clean-once_arm.case index 3c4bbc4..b8c7cca 100644 --- a/cases/build/test_build_clean-once_arm.case +++ b/cases/build/test_build_clean-once_arm.case @@ -4,6 +4,7 @@ + &1 | tee log +gbs -c base.cfg build --clean-once -A armv7l -D tizen.conf --overwrite 2>&1 | tee log test -z "`grep "mount:.*scratch" log`" diff --git a/cases/build/test_build_exclude_arm.case b/cases/build/test_build_exclude_arm.case index 54224e6..d64d336 100644 --- a/cases/build/test_build_exclude_arm.case +++ b/cases/build/test_build_exclude_arm.case @@ -6,6 +6,7 @@ + /proc/sys/fs/binfmt_misc/status" -gbs -c base.cfg build --exclude=power,fake -A armv7l 2>&1 | tee log +gbs -c base.cfg build --exclude=power,fake -A armv7l -D tizen.conf 2>&1 | tee log test -z "`grep "mount:.*scratch" log`" diff --git a/cases/build/test_build_export_filter.case b/cases/build/test_build_export_filter.case index 2d182f5..c10263b 100644 --- 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 '29 a\ExportFilter: ^fake.*\\.i586\\.rpm$ armv7l' tizen.conf +sed -i '125 a\ExportFilter: ^fake.*\\.i686\\.rpm$ armv7l' tizen.conf -sed -i '46 a\Preinstall: fake' tizen.conf +sed -i '136 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_global_uer_passwd.case b/cases/build/test_build_global_uer_passwd.case index 90aac0f..d479cb0 100644 --- a/cases/build/test_build_global_uer_passwd.case +++ b/cases/build/test_build_global_uer_passwd.case @@ -25,11 +25,8 @@ gbs -c general_profile_user_passwd.cfg build fake -A i586 --overwrite #Define user/passwd in general,using in repo section gbs -c general_repo_user_passwd.cfg build fake -A i586 --overwrite -#Define user/passwd in general,using in obs section -gbs -c general_obs_user_passwd.cfg build fake -A i586 --overwrite - #Define user/passwd in general,other parts can inherit -gbs -c general_inherit_user_passwd.cfg build fake -A i586 --overwrite +gbs -c general_inherit_user_passwd.cfg build fake -A i586 --clean --overwrite ]]> diff --git a/cases/build/test_build_incremental_arm.case b/cases/build/test_build_incremental_arm.case index a6bd36e..42a138b 100644 --- a/cases/build/test_build_incremental_arm.case +++ b/cases/build/test_build_incremental_arm.case @@ -4,6 +4,7 @@ + /proc/sys/fs/binfmt_misc/status" -gbs -c base.cfg build --clean -A armv7l sw-tools +gbs -c base.cfg build --clean -A armv7l -D tizen.conf sw-tools -gbs -c base.cfg build --incremental -A armv7l sw-tools 2>&1 | tee log +gbs -c base.cfg build --incremental -A armv7l -D tizen.conf sw-tools 2>&1 | tee log #check build log key word test -z "`grep "mount:.*scratch" log`" diff --git a/cases/build/test_build_incremental_dir_arm.case b/cases/build/test_build_incremental_dir_arm.case index a74622d..100cf58 100644 --- a/cases/build/test_build_incremental_dir_arm.case +++ b/cases/build/test_build_incremental_dir_arm.case @@ -4,6 +4,7 @@ + /proc/sys/fs/binfmt_misc/status" -gbs -c base.cfg build --clean -A armv7l +gbs -c base.cfg build --clean -A armv7l -D tizen.conf -gbs -c base.cfg build --incremental -A armv7l 2>&1 | tee log +gbs -c base.cfg build --incremental -A armv7l -D tizen.conf 2>&1 | tee log #check build log key word test -z "`grep "mount:.*scratch" log`" diff --git a/cases/build/test_build_incremental_dir_arm_illegal_pkg.case b/cases/build/test_build_incremental_dir_arm_illegal_pkg.case index d8bbac2..0fae974 100644 --- a/cases/build/test_build_incremental_dir_arm_illegal_pkg.case +++ b/cases/build/test_build_incremental_dir_arm_illegal_pkg.case @@ -4,6 +4,7 @@ + /proc/sys/fs/binfmt_misc/status" -gbs -c base.cfg build --clean -A armv7l +gbs -c base.cfg build --clean -A armv7l -D tizen.conf #broken register sudo sh -c "echo -1 >/proc/sys/fs/binfmt_misc/status" -gbs -c base.cfg build --incremental -A armv7l 2>&1 | tee log +gbs -c base.cfg build --incremental -A armv7l -D tizen.conf 2>&1 | tee log test -z "`grep "mount:.*scratch" log`" diff --git a/cases/build/test_build_incremental_spec_arm.case b/cases/build/test_build_incremental_spec_arm.case index 8bc61b1..0430cf1 100644 --- a/cases/build/test_build_incremental_spec_arm.case +++ b/cases/build/test_build_incremental_spec_arm.case @@ -8,6 +8,7 @@ + /proc/sys/fs/binfmt_misc/status" -gbs -c base.cfg build --clean --spec=fake-dev.spec fake -A armv7l 2>&1 | tee log +gbs -c base.cfg build --clean --spec=fake-dev.spec fake -A armv7l -D tizen.conf 2>&1 | tee log #check build log key word test -z "`grep "init_buildsystem.*fake.spec" log`" test -n "`grep "init_buildsystem.*fake-dev.spec" log`" -gbs -c base.cfg build --incremental --spec=fake-dev.spec fake -A armv7l 2>&1 | tee log2 +gbs -c base.cfg build --incremental --spec=fake-dev.spec fake -A armv7l -D tizen.conf 2>&1 | tee log2 test -z "`grep "mount:.*scratch" log2`" diff --git a/cases/build/test_build_install_package_priority.case b/cases/build/test_build_install_package_priority.case index 109fb81..b577394 100644 --- a/cases/build/test_build_install_package_priority.case +++ b/cases/build/test_build_install_package_priority.case @@ -31,7 +31,7 @@ sed -i "/^Summary/a Version: 1.1" fake/packaging/fake.spec cd fake && git commit -am 'Modify version 1.1' && cd .. gbs -c base.cfg build -A i586 fake mkdir ./rpms/ -cp `find $GBS_LOCAL_REPOS -name "fake-1.1-1.i586.rpm"` ./rpms/ +cp `find $GBS_LOCAL_REPOS -name "fake-1.1-1.i686.rpm"` ./rpms/ sed -i "/Version/d" fake/packaging/fake.spec sed -i "/^Summary/a Version: 1.0" fake/packaging/fake.spec @@ -40,10 +40,10 @@ gbs -c base.cfg build -A i586 fake #should use local deps by default gbs -c base.cfg build -A i586 fake-dev -R ./rpms/ -test "`sudo chroot $GBS_ROOT_I686_0 rpm -q fake`" = "fake-1.0-1.i586" +test "`sudo chroot $GBS_ROOT_I686_0 rpm -q fake`" = "fake-1.0-1.i686" #should use higher version deps in remote gbs -c base.cfg build -A i586 fake-dev --overwrite --use-higher-deps -R ./rpms/ -test "`sudo chroot $GBS_ROOT_I686_0 rpm -q fake`" = "fake-1.1-1.i586" +test "`sudo chroot $GBS_ROOT_I686_0 rpm -q fake`" = "fake-1.1-1.i686" ]]> diff --git a/cases/build/test_build_keep-packs_arm.case b/cases/build/test_build_keep-packs_arm.case index 2fac9bd..1313ccd 100644 --- a/cases/build/test_build_keep-packs_arm.case +++ b/cases/build/test_build_keep-packs_arm.case @@ -5,6 +5,7 @@ + &1 | tee log +gbs -c base.cfg build sw-tools -A armv7l -D tizen.conf 2>&1 | tee log count1="`sudo chroot ~/GBS-ROOT/local/BUILD-ROOTS/scratch.armv7l.0 rpm -qa | wc -l`" -gbs -c base.cfg build xorg-x11-filesystem --keep-packs -A armv7l 2>&1 | tee log +gbs -c base.cfg build xorg-x11-filesystem --keep-packs -A armv7l -D tizen.conf 2>&1 | tee log count2="`sudo chroot ~/GBS-ROOT/local/BUILD-ROOTS/scratch.armv7l.0 rpm -qa | wc -l`" @@ -33,7 +34,7 @@ cd xorg-x11-filesystem && test -n "`git status | grep -E "working tree|directory test -n "`find ~/GBS-ROOT/local/repos -name "*xorg-x11-filesystem*.rpm"`" -gbs -c base.cfg build xorg-x11-filesystem -A armv7l --overwrite 2>&1 | tee log +gbs -c base.cfg build xorg-x11-filesystem -A armv7l -D tizen.conf --overwrite 2>&1 | tee log count3="`sudo chroot ~/GBS-ROOT/local/BUILD-ROOTS/scratch.armv7l.0 rpm -qa | wc -l`" diff --git a/cases/build/test_build_multi_specs_patch.case b/cases/build/test_build_multi_specs_patch.case index a581a67..8c1c9a0 100644 --- a/cases/build/test_build_multi_specs_patch.case +++ b/cases/build/test_build_multi_specs_patch.case @@ -32,7 +32,7 @@ cd .. gbs -c base.cfg build --clean -A i586 fake 2>&1|tee log -TIMES=$(grep '/home/abuild/rpmbuild/SOURCES/0001-hello.patch' log|wc -l) +TIMES=$(grep '/SOURCES/0001-hello.patch' log|wc -l) #apply patch both in build fake and fake-lib [ "$TIMES" -eq "2" ] diff --git a/cases/build/test_build_multispecs_patch_include.case b/cases/build/test_build_multispecs_patch_include.case index a2f0054..98d6bab 100644 --- a/cases/build/test_build_multispecs_patch_include.case +++ b/cases/build/test_build_multispecs_patch_include.case @@ -34,7 +34,8 @@ cd .. gbs -c base.cfg build -A i586 fake --include-all 2>&1|tee log -TIMES=$(grep '/home/abuild/rpmbuild/SOURCES/0001-hello.patch' log|wc -l) +#TIMES=$(grep '/home/abuild/rpmbuild/SOURCES/0001-hello.patch' log|wc -l) +TIMES=$(grep '/SOURCES/0001-hello.patch' log|wc -l) #apply patch both in build fake and fake-lib [ "$TIMES" -eq "2" ] diff --git a/cases/build/test_build_no-configure_arm.case b/cases/build/test_build_no-configure_arm.case index 8313e7d..26c8a52 100644 --- a/cases/build/test_build_no-configure_arm.case +++ b/cases/build/test_build_no-configure_arm.case @@ -5,6 +5,7 @@ + &1| tee log +gbs -c base.cfg build --incremental -A armv7l -D tizen.conf fake 2>&1| tee log #configure has been executed grep "command in configure" log -gbs -c base.cfg build --no-configure --incremental -A armv7l fake 2>&1| tee log2 +gbs -c base.cfg build --no-configure --incremental -A armv7l -D tizen.conf fake 2>&1| tee log2 #configure has not been executed if --no-configure ( ! grep "command in configure" log2 ) diff --git a/cases/build/test_build_noinit_arm.case b/cases/build/test_build_noinit_arm.case index 442d602..51ebf16 100644 --- a/cases/build/test_build_noinit_arm.case +++ b/cases/build/test_build_noinit_arm.case @@ -4,6 +4,7 @@ + /proc/sys/fs/binfmt_misc/status" -gbs -c base.cfg build --clean -A armv7l 2>&1 | tee log +gbs -c base.cfg build --clean -A armv7l -D tizen.conf 2>&1 | tee log -gbs -c base.cfg build --noinit -A armv7l 2>&1 | tee log +gbs -c base.cfg build --noinit -A armv7l -D tizen.conf 2>&1 | tee log test -z "`grep "generate repositories" log`" diff --git a/cases/build/test_build_overwrite_arm.case b/cases/build/test_build_overwrite_arm.case index 91ce2ea..1b9b6d6 100644 --- a/cases/build/test_build_overwrite_arm.case +++ b/cases/build/test_build_overwrite_arm.case @@ -4,6 +4,7 @@ + /proc/sys/fs/binfmt_misc/status" -gbs -c base.cfg build -A armv7l 2>&1 | tee log +gbs -c base.cfg build -A armv7l -D tizen.conf 2>&1 | tee log test -z "`grep "mount:.*scratch" log`" @@ -25,7 +26,7 @@ test -n "`find ~/GBS-ROOT/local/repos -name "*fake*.rpm"`" time1=`ls -l --full-time ~/GBS-ROOT/local/repos/tizen/armv7l/RPMS | grep fake | awk '{ print $7 }'` -gbs -c base.cfg build --overwrite -A armv7l 2>&1 | tee log +gbs -c base.cfg build --overwrite -A armv7l -D tizen.conf 2>&1 | tee log time2=`ls -l --full-time ~/GBS-ROOT/local/repos/tizen/armv7l/RPMS | grep fake | awk '{ print $7 }'` diff --git a/cases/build/test_build_profile.case b/cases/build/test_build_profile.case index 52e05ca..f7325c3 100644 --- a/cases/build/test_build_profile.case +++ b/cases/build/test_build_profile.case @@ -22,6 +22,6 @@ sudo /bin/rm -rf $GBS_ROOT_I686_0 gbs -c base.cfg build -A i586 -P tizen_base fake |tee log #grep -e "tizen/releases/daily/tizen/ivi/latest/repos/atom/packages/" log -grep -e "latest/repos/tizen-base/ia32/packages" log +grep -e "tizen/base/latest/repos/standard/packages" log ]]> diff --git a/cases/build/test_build_skip-conf-repos_ia32.case b/cases/build/test_build_skip-conf-repos_ia32.case index c25c25d..b8e871e 100644 --- a/cases/build/test_build_skip-conf-repos_ia32.case +++ b/cases/build/test_build_skip-conf-repos_ia32.case @@ -18,11 +18,10 @@ sudo /bin/rm -rf $GBS_ROOT_I686_0 ./create_proj fake.spec -gbs -c base.cfg build --skip-conf-repos -R http://download.tizen.org/releases/2.2/latest/repos/tizen-base/ia32/packages/ -A i586 2>&1 |tee log +gbs -c base.cfg build --skip-conf-repos -R http://download.tizen.org/releases/milestone/tizen/4.0-base/latest/repos/ia32/packages/ -A i586 2>&1 |tee log -#test -n "`grep "ivi/latest/repos/atom/packages" log`" -test -n "`grep "repos/tizen-base/ia32/packages" log`" +test -n "`grep "repos/ia32/packages" log`" -test -z "`grep "releases/2.2/tizen-2.2" log`" +test -z "`grep "tizen/base/latest" log`" ]]> diff --git a/cases/build/test_build_skip-conf-repos_nagetive.case b/cases/build/test_build_skip-conf-repos_nagetive.case index 834027b..a501894 100644 --- a/cases/build/test_build_skip-conf-repos_nagetive.case +++ b/cases/build/test_build_skip-conf-repos_nagetive.case @@ -18,11 +18,10 @@ sudo /bin/rm -rf $GBS_ROOT_I686_0 ./create_proj fake.spec -gbs -c base.cfg build -R http://download.tizen.org/releases/2.2.1/latest -A i586 2>&1 |tee log +gbs -c base.cfg build -R http://localhost:8881/forGBS/download.tizen.org/releases/2.2.1/latest/ -A i586 2>&1 |tee log -test -n "`grep "releases/2.2/latest" log`" +test -n "`grep "tizen/base/latest" log`" -#test -n "`grep "releases/2.2/tizen-2.2" log`" ]]> &1| tee log #The target arch can be specified by depanneur --target i586. -AssertRPMsIWith fake| grep i586 +AssertRPMsIWith fake| grep i686 sudo /bin/rm -rf $GBS_LOCAL_REPOS diff --git a/cases/build/test_build_threads_arm.case b/cases/build/test_build_threads_arm.case index c7b93e4..dfc0938 100644 --- a/cases/build/test_build_threads_arm.case +++ b/cases/build/test_build_threads_arm.case @@ -9,6 +9,7 @@ + /proc/sys/fs/binfmt_misc/status" -gbs -c base.cfg build --threads=4 -A armv7l --debug 2>&1 | tee log +gbs -c base.cfg build --threads=4 -A armv7l -D tizen.conf --debug 2>&1 | tee log test -z "`grep "mount:.*scratch" log`" diff --git a/cases/build/test_build_with_negative_arch.case b/cases/build/test_build_with_negative_arch.case index a9bf39b..0c820e8 100644 --- a/cases/build/test_build_with_negative_arch.case +++ b/cases/build/test_build_with_negative_arch.case @@ -25,59 +25,37 @@ touch ~/.gbs.conf grep "arch ERROR not supported, supported archs are:" log1 -## test 2: no arch specified, host arch will be used -(! gbs -c base.cfg build fake 2>&1|tee log2) - -# check warning message when no arch specified -#grep "No --arch specified in command line, using host arch" log2 -grep "No arch specified, using system arch:" log2 - -# check build message: which profile and arch will be used -#grep "For the following building: active profile.*with arch.*" log2 - - -## test 3: arch and profile mismatch -# specified arch and available arch for specified profile mismatch -sed -i '5a arch = i586' base.cfg - -(! gbs -c base.cfg build -A x86_64 -P tizen fake 2>&1|tee log3) - -# check error message -#grep "Both --profile and --arch are specified but the specified arches mismatch according active gbs.conf" log3 -grep "no available repositories found for arch x86_64" log3 - - -## test 4: specified arch with available profile but no default profile +## test 2: specified arch with available profile but no default profile # when no default profile, gbs shows what profiles in gbsconf could support the specified arch sed -i '2d' base.cfg -(! gbs -c base.cfg build -A i586 fake 2>&1|tee log4) +(! gbs -c base.cfg build -A i586 fake 2>&1|tee log2) # check warning message about no default profile -#grep "No default profile defined in active gbs.conf" log4 -grep "No section: 'build'" log4 +#grep "No default profile defined in active gbs.conf" log2 +grep "No section: 'build'" log2 # check building message about available profiles -#grep "Available profiles with the specified arch:" log4 +#grep "Available profiles with the specified arch:" log2 # check error message with no profile -#grep "Specified building target in command line is invalid" log4 +#grep "Specified building target in command line is invalid" log2 -## test 5: no default profile and no profiles available for the specified arch. +## test 3: no default profile and no profiles available for the specified arch. sed -i '5d' base.cfg -(! gbs -c base.cfg build -A i586 fake 2>&1|tee log5) +(! gbs -c base.cfg build -A i586 fake 2>&1|tee log3) # check warning message about no default profile -#grep "No default profile defined in active gbs.conf" log5 -grep "No section: 'build'" log5 +#grep "No default profile defined in active gbs.conf" log3 +grep "No section: 'build'" log3 # check building message about no available profiles -#grep "Cannot find a valid profile in active gbs.conf to support building target arch:" log5 +#grep "Cannot find a valid profile in active gbs.conf to support building target arch:" log3 # check error message with no profile -#grep "Specified building target in command line is invalid" log5 +#grep "Specified building target in command line is invalid" log3 ]]> diff --git a/cases/conf/test_find_gbs_conf_in_repo_dir.case b/cases/conf/test_find_gbs_conf_in_repo_dir.case index 07548e6..08b3d93 100644 --- a/cases/conf/test_find_gbs_conf_in_repo_dir.case +++ b/cases/conf/test_find_gbs_conf_in_repo_dir.case @@ -20,13 +20,18 @@ work_dir=$(pwd)/tmp profile = profile.tizen [profile.tizen] -repos = repo.fake +repos = repo.fake, repo.fake1 buildconf = \${work_dir}/project-conf/tizen.conf [repo.fake] url = $GBS_REPOURL user = test passwdx = QlpoOTFBWSZTWScPk3AAAAAIAD8AIAAhgAwDJy7i7kinChIE4fJuAA== + +[repo.fake1] +url = $GBS_REPOURL_UNIFIED +user = test +passwdx = QlpoOTFBWSZTWScPk3AAAAAIAD8AIAAhgAwDJy7i7kinChIE4fJuAA== EOF # make a fake .repo dir in curdir, gbs will find .gbs.conf in curdir diff --git a/cases/conf/test_plaintext_password_issue.case b/cases/conf/test_plaintext_password_issue.case index d705de4..7db39ea 100644 --- a/cases/conf/test_plaintext_password_issue.case +++ b/cases/conf/test_plaintext_password_issue.case @@ -11,6 +11,8 @@ &1 |tee log grep -v "http://test:123456" log diff --git a/debian/postinst b/debian/postinst new file mode 100755 index 0000000..faadd49 --- /dev/null +++ b/debian/postinst @@ -0,0 +1,4 @@ +#!/bin/sh +#Get local host IP +hostIP=`grep "LOCAL_HOST_IP" /home/build/tools-tester.d/servers-local.conf | cut -d":" -f 2` +sed -i "s/http:\/\/localhost:8881/http:\/\/$hostIP:8881/g" `grep "http:\/\/localhost:8881" -rl /srv/itest/cases/gbs/` diff --git a/fixtures/conf/base.cfg b/fixtures/conf/base.cfg index edc1883..c3a5cef 100644 --- a/fixtures/conf/base.cfg +++ b/fixtures/conf/base.cfg @@ -9,8 +9,8 @@ tmpdir = /var/tmp #passwd = obs = obs.tizen ; comma separated list of repositories -repos = repo.tizen_latest - +#repos = repo.tizen_base, repo.tizen_main +repos = repo.tizen_base, repo.tizen_main [obs.tizen] url = https://api.tizen.org ; optinal user/passwd, set if differ from proflie's user/passwd @@ -18,50 +18,53 @@ user = obs_viewer passwd = obs_viewer [repo.tizen_latest] -url = http://download.tizen.org/releases/2.2/latest/ +#url = http://download.tizen.org/releases/2.2/latest/ ; optinal user/passwd, set if differ from proflie's user/passwd #user = #passwdx = [repo.tizen_main] -url = http://download.tizen.org/releases/2.2/latest/repos/tizen-main/ia32/packages/ +#url = http://download.tizen.org/releases/2.2/latest/repos/tizen-main/ia32/packages/ +url = http://download.tizen.org/releases/milestone/tizen/unified/latest/repos/standard/packages/ [profile.tizen_base] repos = repo.tizen_base [repo.tizen_base] -url = http://download.tizen.org/releases/2.2/latest/repos/tizen-base/ia32/packages/ +#url = http://download.tizen.org/releases/2.2/latest/repos/tizen-base/ia32/packages/ +url = http://download.tizen.org/releases/milestone/tizen/base/latest/repos/standard/packages/ [profile.tizen_ivi] repos = repo.tizen_ivi [repo.tizen_ivi] -url = http://download.tizen.org/releases/daily/tizen/ivi/latest/repos/atom/packages/ +#url = http://download.tizen.org/releases/daily/tizen/ivi/latest/repos/atom/packages/ +url = http://download.tizen.org/releases/milestone/tizen/ivi/latest/repos/atom/packages/ [profile.tizen_negative1] repos = repo.tizen_negative1 [repo.tizen_negative1] #there is no in repomd.xml -url = http://10.113.136.109/negativ_1_gbs/packages/ +url = http://localhost:8881/negativ_1_gbs/packages/ [profile.tizen_negative2] repos = repo.tizen_negative2 [repo.tizen_negative2] #there is no f113ca67a6b9f572cdbd1bacf3e7364b685dbb7f9f79bf43ca2a55df3c84ff9e-build.conf.gz defined by repomd.xml in repodata -url = http://10.113.136.109/negativ_2_gbs/repos/atom/i586/packages/ +url = http://localhost:8881/negativ_2_gbs/repos/atom/i586/packages/ [profile.tizen_negative3] repos = repo.tizen_negative3 [repo.tizen_negative3] #new structure repo -url = http://10.113.136.109/negativ_3_gbs/ +url = http://localhost:8881/negativ_3_gbs/ [profile.tizen_without_conf] repos = repo.tizen_without_conf [repo.tizen_without_conf] #there is no builddata under latest directory -url = http://10.113.136.109/without_conf_gbs/ +url = http://localhost:8881/without_conf_gbs/ diff --git a/fixtures/conf/general_inherit_user_passwd.cfg b/fixtures/conf/general_inherit_user_passwd.cfg index 409853e..2b68e0c 100644 --- a/fixtures/conf/general_inherit_user_passwd.cfg +++ b/fixtures/conf/general_inherit_user_passwd.cfg @@ -4,8 +4,13 @@ user=test passwd=123456 [profile.current] -repos = repo.repo1 +repos = repo.repo1, repo.repo2 [repo.repo1] -url=http://10.113.136.109/repo-protected/tizen/releases/2.2/latest +#url=http://localhost:8881/repo-protected/tizen/releases/2.2/latest +url = http://download.tizen.org/releases/milestone/tizen/unified/latest/repos/standard/packages/ + +[repo.repo2] +#url = http://download.tizen.org/releases/2.2/latest/repos/tizen-base/ia32/packages/ +url = http://download.tizen.org/releases/milestone/tizen/base/latest/repos/standard/packages/ diff --git a/fixtures/conf/general_obs_user_passwd.cfg b/fixtures/conf/general_obs_user_passwd.cfg index 53971c7..97e5a08 100644 --- a/fixtures/conf/general_obs_user_passwd.cfg +++ b/fixtures/conf/general_obs_user_passwd.cfg @@ -15,4 +15,4 @@ passwd=${passwd} repos = repo.repo1 [repo.repo1] -url = http://download.tizen.org/releases/2.2/latest/ +url = http://download.tizen.org/releases/milestone/tizen/base/latest/repos/standard/packages/ diff --git a/fixtures/conf/general_profile_user_passwd.cfg b/fixtures/conf/general_profile_user_passwd.cfg index ce56e15..e0d49c5 100644 --- a/fixtures/conf/general_profile_user_passwd.cfg +++ b/fixtures/conf/general_profile_user_passwd.cfg @@ -9,5 +9,5 @@ user=${user} passwd=${passwd} [repo.repo1] -url=http://10.113.136.109/repo-protected/tizen/releases/2.2/latest +url=http://localhost:8881/repo-protected/tizen/releases/2.2/latest diff --git a/fixtures/conf/general_repo_user_passwd.cfg b/fixtures/conf/general_repo_user_passwd.cfg index b812d2e..860c720 100644 --- a/fixtures/conf/general_repo_user_passwd.cfg +++ b/fixtures/conf/general_repo_user_passwd.cfg @@ -7,7 +7,7 @@ passwd=123456 repos = repo.repo1 [repo.repo1] -url=http://10.113.136.109/repo-protected/tizen/releases/2.2/latest +url=http://localhost:8881/repo-protected/tizen/releases/2.2/latest user=${user} passwd=${passwd} diff --git a/fixtures/conf/inherit_only_passwdx.cfg b/fixtures/conf/inherit_only_passwdx.cfg index d935a56..2f5f66a 100644 --- a/fixtures/conf/inherit_only_passwdx.cfg +++ b/fixtures/conf/inherit_only_passwdx.cfg @@ -7,7 +7,7 @@ repos = repo.tizen passwdx = QlpoOTFBWSZTWScPk3AAAAAIAD8AIAAhgAwDJy7i7kinChIE4fJuAA== [repo.tizen] -url = http://10.113.136.109/repo-protected/tizen/releases/2.2/latest +url = http://localhost:8881/repo-protected/tizen/releases/2.2/latest user = test [obs.tizen] diff --git a/fixtures/conf/inherit_only_user.cfg b/fixtures/conf/inherit_only_user.cfg index 5e6e4e6..4cba56d 100644 --- a/fixtures/conf/inherit_only_user.cfg +++ b/fixtures/conf/inherit_only_user.cfg @@ -7,5 +7,5 @@ repos = repo.tizen user = test [repo.tizen] -url = http://10.113.136.109/repo-protected/tizen/releases/2.2/latest +url = http://localhost:8881/repo-protected/tizen/releases/2.2/latest passwdx = QlpoOTFBWSZTWScPk3AAAAAIAD8AIAAhgAwDJy7i7kinChIE4fJuAA== diff --git a/fixtures/conf/invalid_user.cfg b/fixtures/conf/invalid_user.cfg index 694c92b..125250c 100644 --- a/fixtures/conf/invalid_user.cfg +++ b/fixtures/conf/invalid_user.cfg @@ -2,7 +2,7 @@ profile = profile.current [repo.repo1] -url=http://10.113.136.109/repo-protected/tizen/releases/2.2/latest +url=http://localhost:8881/repo-protected/tizen/releases/2.2/latest user = invaliduser passwdx = QlpoOTFBWSZTWbwQMfEAAACZgAABOkAggQAgIAAiAaHqEAMFtNawA8XckU4UJC8EDHxA diff --git a/fixtures/conf/only_passwdx_no_user.cfg b/fixtures/conf/only_passwdx_no_user.cfg index ff110d9..ed538a7 100644 --- a/fixtures/conf/only_passwdx_no_user.cfg +++ b/fixtures/conf/only_passwdx_no_user.cfg @@ -7,4 +7,4 @@ repos = repo.tizen passwdx = QlpoOTFBWSZTWdgiTvYAAASZAAAEcAASEiAAMQwIIDaI2JGSHi7kinChIbBEnew= [repo.tizen] -url = http://10.113.136.109/repo-protected/tizen/releases/2.2/latest +url = http://localhost:8881/repo-protected/tizen/releases/2.2/latest diff --git a/fixtures/conf/plaintext_password_issue.cfg b/fixtures/conf/plaintext_password_issue.cfg index 298bf57..642966f 100644 --- a/fixtures/conf/plaintext_password_issue.cfg +++ b/fixtures/conf/plaintext_password_issue.cfg @@ -6,7 +6,7 @@ tmpdir = /var/tmp repos = repo.tizen [repo.tizen] -url = http://10.113.136.109/repo-protected/tizen/releases/2.2/latest +url = http://localhost:8881/repo-protected/tizen/releases/2.2/latest user = test passwdx = QlpoOTFBWSZTWScPk3AAAAAIAD8AIAAhgAwDJy7i7kinChIE4fJuAA== diff --git a/fixtures/conf/recommends.cfg b/fixtures/conf/recommends.cfg index 9b16080..84da0e1 100644 --- a/fixtures/conf/recommends.cfg +++ b/fixtures/conf/recommends.cfg @@ -4,6 +4,6 @@ fallback_to_native = true [profile.tizen_mobile] repos = repo.1, repo.2 [repo.1] -url = http://10.113.136.109/Tizen:/TestPrograms/emulator32/ +url = http://localhost:8881/Tizen:/TestPrograms/emulator32/ [repo.2] url = http://download.tizen.org/releases/milestone/tizen/3.0-base/latest/repos/emulator32/packages/ diff --git a/fixtures/conf/tizen.conf b/fixtures/conf/tizen.conf index 67d29cd..5b7e5d9 100644 --- a/fixtures/conf/tizen.conf +++ b/fixtures/conf/tizen.conf @@ -1,373 +1,211 @@ -%define _repository standard +################################################################################ +# OBS Project config for Tizen:Base +# +# RE contacts: +# +# +# vim: set syntax=spec: +################################################################################ -Patterntype: rpm-md comps +Patterntype: rpm-md comps Release: . -Support: build build-compare +Support: build +Support: build-compare build-mkbaselibs +# Support: rpmlint-mini rpmlint-tizen -##################################### -Substitute: gettext gettext-tools -Ignore: pkg-config -##################################### - -%ifarch armv7l armv7el -Substitute: libncurses ncurses-libs -Substitute: libncurses-devel ncurses-devel -Preinstall: nss -Ignore: bash:libncurses -%endif +############################# conflicts resolution ############################# -Support: util-linux -VMinstall: util-linux libblkid libuuid +Prefer: util-linux +Prefer: mono-wcf +Prefer: monodoc +Prefer: mono-extras +Prefer: mono-web +Prefer: mono-data +Prefer: mono-mvc +Prefer: mono-winforms +Prefer: mono-data-sqlite -ExportFilter: \.armv7hl\.rpm$ armv8el -ExportFilter: \.armv7thl*\.rpm$ armv8el -ExportFilter: \.armv7tnh*\.rpm$ armv8el -ExportFilter: \.armv7h*\.rpm$ armv8el -ExportFilter: \.armv7nh*\.rpm$ armv8el -ExportFilter: \.x86_64\.rpm$ x86_64 -ExportFilter: \.i586\.rpm$ i586 -ExportFilter: \.armv5el\.rpm$ armv5el -ExportFilter: \.armv5tel\.rpm$ armv5el -ExportFilter: \.armv6el\.rpm$ armv6el -ExportFilter: \.armv6l\.rpm$ armv6el -ExportFilter: \.armv6vl\.rpm$ armv6el -ExportFilter: \.armv7el\.rpm$ armv7el -ExportFilter: \.armv7l\.rpm$ armv7el -ExportFilter: \.armv7vl\.rpm$ armv7el -# filter out packages of cross setup on ia32 -ExportFilter: .*vanish\.rpm -PublishFilter: .*vanish\.rpm -ExportFilter: .*dontuse\.rpm -PublishFilter: .*dontuse\.rpm - -Prefer: coreutils +# Set a preference for ambiguous libs to use *-64bit libs +# *-64bit libs on 32bit build environment are required for .Net build (e.g., coreclr, corefx) +# 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 -# -# ARM Start -# -%ifarch %arm -# arm land -Hostarch: i586 -Preinstall: qemu.x86_64 - -%define cross_5 1 -%define cross_7 1 -%define native 1 - -%define cross_7h 1 - -%ifarch armv8el -Changetarget: armv7hl-tizen-linux -%define _gnu gnueabi -%if %{cross_7h} -Prefer: cross-armv7hl-binutils-accel-armv7hl -Prefer: cross-armv7hl-gcc-accel-armv7hl -%define speedcommon 1 -%define speedbash 1 -%define speedbinutils 1 -%define speedgcc 1 -%define native 0 -%define speedtools 1 -Support: cross-armv7tnhl-platformfile -%endif -%endif +############################# base definition ############################### +# %release_name and %tizen_full_version are used in platform/upstream/tizen-release -######################## -# preselect rpm targets -# more ifs for _repository possible as needed -######################### -%ifarch armv5el -Changetarget: armv5tel-tizen-linux -%define _gnu gnueabi -%if %{cross_5} -%define speedcommon 1 -%define speedbash 1 -%define speedbinutils 1 -%define speedgcc 1 -%define native 0 -%endif -%endif +Macros: +%release_name Tizen5/Unified -%ifarch armv6el -Changetarget: armv6l-tizen-linux -%define _gnu gnueabi -%endif +%tizen_version_major 5 +%tizen_version_minor 5 +%tizen_version_patch 0 -%ifarch armv7l armv7el -Changetarget: armv7l-tizen-linux -%define _gnu gnueabi -%if %{cross_7} -#Support: cross-armv7tnhl-platformfile -#Support: cross-armv7l-platformfile -Prefer: cross-armv7l-binutils-accel-armv7l -Prefer: cross-armv7l-gcc-accel-armv7l -%define speedcommon 1 -%define speedbash 1 -%define speedbinutils 1 -%define speedgcc 1 -%define native 0 -%define speedtools 1 -%endif +%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 + +%_binary_payload w5T.xzdio +:Macros -%endif -%if %speedtools -Support: patch-x86-arm findutils-x86-arm gawk-x86-arm fdupes-x86-arm -Preinstall: libfile-x86-arm -Preinstall: elfutils-libelf-x86-arm -Preinstall: nss-softokn-freebl-x86-arm -Preinstall: nss-x86-arm -Preinstall: nspr-x86-arm -Preinstall: libgcc-x86-arm -Preinstall: libacl-x86-arm -Preinstall: libattr-x86-arm -Preinstall: libcap-x86-arm -Preinstall: liblua-x86-arm -Preinstall: popt-x86-arm -Preinstall: xz-libs-x86-arm -Preinstall: zlib-x86-arm -Preinstall: file -Preinstall: sqlite-x86-arm -Preinstall: mpfr-x86-arm -Preinstall: gmp-x86-arm -Preinstall: mpc-x86-arm -Preinstall: bzip2-libs-x86-arm -Preinstall: rpm-x86-arm -Preinstall: rpm-libs-x86-arm - -Required: tar-x86-arm -Required: sed-x86-arm -Required: elfutils-x86-arm -Required: elfutils-libs-x86-arm -Required: elfutils-libelf-x86-arm -Required: diffutils-x86-arm -Required: gzip-x86-arm -Required: libgcc-x86-arm -Required: libacl-x86-arm -Required: libattr-x86-arm -Required: coreutils -Required: coreutils-x86-arm -Required: libcap-x86-arm -Required: liblua-x86-arm -Required: popt-x86-arm -Required: xz-libs-x86-arm -Required: zlib-x86-arm -Required: file -Required: file-x86-arm -Required: make -Required: make-x86-arm -Required: libfile-x86-arm -Required: sqlite-x86-arm -Required: rpm-x86-arm -Required: rpm-libs-x86-arm -Required: rpm-build-x86-arm - -Runscripts: rpm-x86-arm -Runscripts: rpm-libs-x86-arm -Runscripts: rpm-build-x86-arm - -Support: !rpmlint-mini -Support: !rpmlint-mini-x86-arm -Prefer: python-libs +############################# build config ##################################### + +%define gcc_version 62 +Macros: +%gcc_version 62 +:Macros + +########## targets ########## + +%ifarch i586 +Target: i686-tizen-linux %endif +%ifarch armv7hl +Target: armv7hl-tizen-linux +%endif -%if %speedcommon -# cross-compilation/speedup -Preinstall: tizen-accelerator eglibc-x86-arm -Runscripts: tizen-accelerator -Required: tizen-accelerator +%ifarch armv7l +Target: armv7l-tizen-linux %endif -%if %speedbash -# bash -Preinstall: ncurses-libs-x86-arm -Preinstall: bash-x86-arm -Runscripts: bash-x86-arm +%ifarch aarch64 +Target: aarch64-tizen-linux %endif -%if %speedbinutils -Required: cross-arm-binutils-accel +########## cross build ########## + +%define build_hostarch x86_64 +Macros: +%build_hostarch x86_64 +: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 +Macros: +%qemu_user_space_build 1 +:Macros %endif -%if %speedgcc -Required: cross-arm-gcc-accel +%ifarch armv7l +Preinstall: qemu-accel-%{build_hostarch}-armv7l +Runscripts: qemu-accel-%{build_hostarch}-armv7l +Preinstall: libmount libblkid libuuid %endif -Preinstall: rpm -Preinstall: rpm-libs -Required: rpm -Prefer: rpm-libs -Prefer: rpm +%ifarch aarch64 +Preinstall: qemu-accel-%{build_hostarch}-aarch64 +Runscripts: qemu-accel-%{build_hostarch}-aarch64 +Preinstall: libmount libblkid libuuid +%endif # aarch64 -# now i586 land -%else +Substitute: python-accel-armv7l-cross-arm python-accel-%{build_hostarch}-armv7l +Substitute: python-accel-aarch64-cross-aarch64 python-accel-%{build_hostarch}-aarch64 +Substitute: clang-accel-armv7l-cross-arm clang-accel-%{build_hostarch}-armv7l +Substitute: clang-accel-aarch64-cross-aarch64 clang-accel-%{build_hostarch}-aarch64 +########## exports for different architectures ########## -Ignore: ncurses-libs-x86 libncurses-x86 -Preinstall: rpm rpm-libs -Required: rpm -%endif +ExportFilter: \.armv7l\.rpm$ armv7l +ExportFilter: \.aarch64\.rpm$ aarch64 +ExportFilter: \.i586\.rpm$ i586 +ExportFilter: \.x86_64\.rpm$ x86_64 -# -# ARM End -# +########## buildroot config ########## Preinstall: setup filesystem - -Preinstall: bash bzip2 coreutils diffutils liblua -Preinstall: eglibc eglibc-common libacl libattr -Preinstall: libgcc libcap -Preinstall: popt readline sed tar zlib sqlite - -Preinstall: ncurses-libs -Preinstall: elfutils-libelf bzip2-libs libstdc++ setup libfile -Preinstall: xz-libs -Preinstall: nss nspr -Preinstall: nss-softokn-freebl - -Runscripts: setup -VMinstall: perl libblkid e2fsprogs-libs libuuid perl-libs grep libpcre -Preinstall: -Required: binutils gcc eglibc rpm-build libtool lzo-devel -Support: cpio gcc-c++ perl-libs perl findutils - -Support: perl-HTML-Tagset -Support: perl-IO-Compress-Base -Support: perl-Module-Pluggable -Support: perl-Pod-Escapes -Support: perl-TimeDate -Support: perl-Compress-Raw-Zlib -Support: perl-ExtUtils-ParseXS -Support: perl-Pod-Simple -Support: perl-Test-Simple -Support: perl-IO-Compress-Zlib -Support: perl-Test-Harness -Support: perl-ExtUtils-MakeMaker -Support: perl-CPAN - -Support: file findutils zlib bzip2 -Support: gzip -Support: ncurses-libs -Support: net-tools -Support: make patch sed gawk tar grep coreutils pkgconfig autoconf automake -Support: m4 libfile tzdata tizen-release -Support: kernel-headers eglibc-headers -Support: xz-lzma-compat - -Keep: binutils cpp file findutils gawk gcc gcc-c++ -Keep: gdbm gzip libada libunwind eglibc-devel libpcre xz-lzma-compat +RunScripts: setup + +Preinstall: bash bzip2 coreutils diffutils grep rpm +Preinstall: glibc libacl libattr +Preinstall: libcap +Preinstall: libgcc +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 util-linux-su + +VMinstall: perl libmount libblkid libext2fs libuuid grep libpcre util-linux libsmartcols procps-ng + +Required: binutils gcc glibc rpm-build libtool +Required: gcc-c++ + +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 +Support: libstdc++-devel +Support: cpp +Support: libatomic +Support: libgomp +Support: libitm + +Keep: libstdc++-devel +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: eglibc-headers perl-libs +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: xz-lzma-compat -Keep: mpc mpfr tar sed -Keep: cloog cloog-ppl ppl -Keep: nss-softokn-freebl +Keep: libmpc libmpfr libppl libgmp libppl_c +Keep: libcloog libppl libgmpxx +Keep: nss-softokn-freebl libmagic libmagic-data Keep: setup +Keep: update-alternatives +Keep: cpp +Keep: gcc-c++ +Keep: libatomic +Keep: libgomp +Keep: libitm -# SLP -Ignore: iso-codes:xml-common +Substitute: gettext gettext-tools -%if "%_repository" == "emulator" - Prefer: simulator-opengl-devel - Support: emulator-macros - Optflags: i586 %{__global_cflags} -m32 -march=core2 -msse3 -mno-ssse3 -mfpmath=sse -mtune=generic -fasynchronous-unwind-tables -fno-omit-frame-pointer +%ifarch x86_64 +Substitute: glibc-devel-32bit glibc-devel-32bit glibc-32bit +Substitute: libgcc_s1-32bit libgcc-32bit %else - %ifarch armv7el - Substitute: pvr-bin-mdfld simulator-opengl - Substitute: pvr-bin-mdfld-devel simulator-opengl-devel - %else - Prefer: libdrm - Substitute: simulator-opengl-devel pvr-bin-mdfld-devel - Substitute: simulator-opengl pvr-bin-mdfld - Prefer: pvr-bin-mdfld-devel pvr-bin-mdfld - Prefer: mesa-libEGL - Prefer: kernel-mfld-blackbay - %endif +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 -Macros: -%tizen_version 201 -%tizen 2.1 -%vendor tizen -%_vendor tizen -%_default_patch_fuzz 2 - - +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: 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 -# python main version -%py_ver %(echo `python -c "import sys; print sys.version[:3]"`) - -# directories -%py_prefix %(echo `python -c "import sys; print sys.prefix"`) -%py_libdir %{py_prefix}/lib/python%{py_ver} -%py_incdir /usr/include/python%{py_ver} -%py_sitedir %{py_libdir}/site-packages -%py_dyndir %{py_libdir}/lib-dynload - -# pure python modules compilation -%py_comp python -c "import compileall; import sys; compileall.compile_dir(sys.argv[1], ddir=sys.argv[1][len('$RPM_BUILD_ROOT'):])" -%py_ocomp python -O -c "import compileall; import sys; compileall.compile_dir(sys.argv[1], ddir=sys.argv[1][len('$RPM_BUILD_ROOT'):])" - -%ext_info .gz -%ext_man .gz - -%info_add(:-:) test -x /sbin/install-info -a -f %{?2}%{?!2:%{_infodir}}/%{1}%ext_info && /sbin/install-info --info-dir=%{?2}%{?!2:%{_infodir}} %{?2}%{?!2:%{_infodir}}/%{1}%ext_info \ -%{nil} - -%info_del(:-:) test -x /sbin/install-info -a ! -f %{?2}%{?!2:%{_infodir}}/%{1}%ext_info && /sbin/install-info --quiet --delete --info-dir=%{?2}%{?!2:%{_infodir}} %{?2}%{?!2:%{_infodir}}/%{1}%ext_info \ -%{nil} - -%lang_package \ -%package locale \ -Summary: Translations and Locale for package %{name}\ -Group: Translations\ -AutoReqProv: 0\ -%description locale\ -This package provides translations for package %{name}.\ -%files locale -f %{name}.lang\ -%defattr(-,root,root,-)\ -%{nil} - - -%docs_package \ -%package docs \ -Summary: Documentation for package %{name}\ -Group: Documentation\ -AutoReqProv: 0\ -%description docs\ -This package provides documentation for package %{name}.\ -%files docs -f documentation.list\ -%defattr(-,root,root,-)\ -%{nil} - -%devel_package \ -%package devel \ -Summary: Development files for package %{name}\ -Group: Development\ -%description devel\ -This package provides header files and other developer releated files for package %{name}.\ -%files devel \ -%{_includedir}/*\ -%{_libdir}/pkgconfig/*.pc\ -%{_libdir}/*.so\ -%{nil} - - -%_smp_mflags -j4 - - -%remove_docs \ - rm -rf %{?buildroot:%{buildroot}}%{_infodir} \ - rm -rf %{?buildroot:%{buildroot}}%{_defaultdocdir} \ - rm -rf %{?buildroot:%{buildroot}}%{_datadir}/doc/%{name} \ - rm -rf %{?buildroot:%{buildroot}}%{_datadir}/gtk-doc \ - rm -rf %{?buildroot:%{buildroot}}%{_datadir}/man \ - find %{?buildroot:%{buildroot}} -regex ".*/man/man./.*\.[0-9]" | xargs rm -f -- \ - find %{?buildroot:%{buildroot}} -regex ".*/man/../man./.*\.[0-9]" | xargs rm -f -- \ - find %{?buildroot:%{buildroot}} -regex ".*/man/man./.*\.[0-9]pm" | xargs rm -f -- diff --git a/fixtures/conf/tizen30.cfg b/fixtures/conf/tizen30.cfg index 93edaa7..3d85b34 100644 --- a/fixtures/conf/tizen30.cfg +++ b/fixtures/conf/tizen30.cfg @@ -4,6 +4,6 @@ fallback_to_native = true [profile.tizen_mobile] repos = repo.1, repo.2 [repo.1] -url = http://download.tizen.org/snapshots/tizen/3.0-base/latest/repos/emulator32/packages/ +url = http://download.tizen.org/releases/milestone/tizen/3.0-base/latest/repos/emulator32/packages/ [repo.2] -url = http://download.tizen.org/snapshots/tizen/3.0-mobile/latest/repos/emulator32-wayland/packages/ +url = http://download.tizen.org/releases/milestone/tizen/3.0-mobile/latest/repos/emulator32-wayland/packages/ diff --git a/fixtures/specs/fail_fast-lib.spec b/fixtures/specs/fail_fast-lib.spec index d47f68e..e9e3ab4 100644 --- a/fixtures/specs/fail_fast-lib.spec +++ b/fixtures/specs/fail_fast-lib.spec @@ -8,7 +8,6 @@ License: TO BE FILLED IN Source0: %{name}-%{version}.tar.gz BuildRequires: cmake BuildRequires: pkgconfig(dlog) -BuildRequires: pkgconfig(pmapi) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(capi-base-common) BuildRequires: pkgconfig(vconf) diff --git a/fixtures/tools/assert b/fixtures/tools/assert index 8fa1a13..054e3de 100644 --- a/fixtures/tools/assert +++ b/fixtures/tools/assert @@ -8,8 +8,10 @@ GBS_RPMS_ARMV7L=~/GBS-ROOT/local/repos/tizen/armv7l/RPMS GBS_SRPMS_ARMV7L=~/GBS-ROOT/local/repos/tizen/armv7l/SRPMS GBS_LOCAL_REPOS=~/GBS-ROOT/local/repos # define default value for GBS_REPOURL if it is null or not defined -: ${GBS_REPOURL:='http://download.tizen.org/releases/2.2/latest'} +: ${GBS_REPOURL:='http://download.tizen.org/releases/milestone/tizen/base/latest/repos/standard/packages/'} +: ${GBS_REPOURL_UNIFIED:='http://download.tizen.org/releases/milestone/tizen/unified/latest/repos/standard/packages/'} +#: ${GBS_REPOURL:='http://download.tizen.org/releases/2.2/latest'} #assert git packages under current dir are clean function AssertClean() diff --git a/packaging/itest-cases-gbs.spec b/packaging/itest-cases-gbs.spec index f06a36f..ba5b190 100644 --- a/packaging/itest-cases-gbs.spec +++ b/packaging/itest-cases-gbs.spec @@ -28,6 +28,15 @@ make build %install make PREFIX=%{buildroot} install +%post +# get hostIP, then change the localhost:8881 to hostIP +hostconf="/home/build/tools-tester.d/servers-local.conf" +if [ -f "$hostconf" ] +then + hostIP=`grep "LOCAL_HOST_IP" /home/build/tools-tester.d/servers-local.conf | cut -d":" -f 2` + sed -i "s/http:\/\/localhost:8881/http:\/\/$hostIP:8881/g" `grep "http:\/\/localhost:8881" -rl /srv/itest/cases/gbs/` +fi + %files %defattr(-,root,root,-) /srv/itest/ diff --git a/settings.pyc b/settings.pyc index 9007ea5..4067267 100644 Binary files a/settings.pyc and b/settings.pyc differ