From: Hyunggi Lee Date: Thu, 13 Jul 2023 06:14:44 +0000 (+0900) Subject: change Tizen-6.0-Base to NGBS X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F40%2F295740%2F1;p=scm%2Fmeta%2Fqb.git change Tizen-6.0-Base to NGBS Change-Id: Ib71b64c1151d9b48ba4abd29de333215fcd6827d Signed-off-by: Hyunggi Lee --- diff --git a/TIZEN/Tizen-6.0/Tizen-6.0-Base/aggregate_list b/TIZEN/Tizen-6.0/Tizen-6.0-Base/aggregate_list deleted file mode 100644 index 0a7bd43..0000000 --- a/TIZEN/Tizen-6.0/Tizen-6.0-Base/aggregate_list +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/TIZEN/Tizen-6.0/Tizen-6.0-Base/candidate_snapshot b/TIZEN/Tizen-6.0/Tizen-6.0-Base/candidate_snapshot index 9521bf7..3a19eb4 100644 --- a/TIZEN/Tizen-6.0/Tizen-6.0-Base/candidate_snapshot +++ b/TIZEN/Tizen-6.0/Tizen-6.0-Base/candidate_snapshot @@ -3,34 +3,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/TIZEN/Tizen-6.0/Tizen-6.0-Base/project_config b/TIZEN/Tizen-6.0/Tizen-6.0-Base/project_config index 50b1c9c..befb633 100644 --- a/TIZEN/Tizen-6.0/Tizen-6.0-Base/project_config +++ b/TIZEN/Tizen-6.0/Tizen-6.0-Base/project_config @@ -13,6 +13,9 @@ Support: build Support: build-compare build-mkbaselibs # Support: rpmlint-mini rpmlint-tizen +# new cycle handling (gbs version >= 0.25.29) +BuildFlags: genmetaalgo:1 + ############################# conflicts resolution ############################# Prefer: util-linux @@ -51,15 +54,36 @@ Macros: %_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 +#### %%__spec_check_pre exit 0 +#### %%run_check_section 0 + +# skip %%check section +Macros: +# skip package list +%_skip_check_packages autogen bison boost expat findutils flex fribidi glibc \\\ +gmp gn golang grep libgc libgcrypt libogg libsigc++ libvorbis libxml2 libzio \\\ +m4 nspr openssl openssl1.1 perl-Devel-Symdump perl-gettext perl-Pod-Coverage \\\ +perl-Test-Pod perl-Test-Pod-Coverage perl-TimeDate procps-ng python3-mako \\\ +python3-mock python3-ply python-funcsigs python-mako python-mock python-ply \\\ +setup zlib openssl3 autoconf + +%__spec_check_pre \ +for name in %_skip_check_packages \ +do \ + if [ "$name" = "%{name}" ]; then \ + exit 0 \ + fi \ +done \ +%{___build_pre} \ +%{nil} + +:Macros ############################# build config ##################################### diff --git a/TIZEN/Tizen-6.0/Tizen-6.0-Base/project_env b/TIZEN/Tizen-6.0/Tizen-6.0-Base/project_env index 4524919..af4c670 100644 --- a/TIZEN/Tizen-6.0/Tizen-6.0-Base/project_env +++ b/TIZEN/Tizen-6.0/Tizen-6.0-Base/project_env @@ -2,3 +2,5 @@ GERRIT_HOSTNAME_EXTERNAL='review.tizen.org' GERRIT_HOSTNAME='review.tizen.org' GERRIT_REVIEW_URL='https://review.tizen.org/gerrit' GERRIT_FETCH_URL='ssh://review.tizen.org:29418' +USE_NGBS=yes +USE_DOCKER_BUILD='yes' diff --git a/TIZEN/Tizen-6.0/Tizen-6.0-Base/project_meta b/TIZEN/Tizen-6.0/Tizen-6.0-Base/project_meta index 1c43237..260f62d 100644 --- a/TIZEN/Tizen-6.0/Tizen-6.0-Base/project_meta +++ b/TIZEN/Tizen-6.0/Tizen-6.0-Base/project_meta @@ -3,6 +3,7 @@ + @@ -12,6 +13,7 @@ + diff --git a/TIZEN/Tizen-6.0/Tizen-6.0-Base/snapshot_info b/TIZEN/Tizen-6.0/Tizen-6.0-Base/snapshot_info index 37ab307..f6dccc9 100644 --- a/TIZEN/Tizen-6.0/Tizen-6.0-Base/snapshot_info +++ b/TIZEN/Tizen-6.0/Tizen-6.0-Base/snapshot_info @@ -2,7 +2,7 @@ - +