From 910be9ac07e6a536e8f53bb8ccef60eab7c3b4d2 Mon Sep 17 00:00:00 2001
From: Hyunggi Lee <hyunggi.lee@samsung.com>
Date: Thu, 13 Jul 2023 16:25:54 +0900
Subject: [PATCH] change 7.0 base to NGBS

Change-Id: I3b83025ee35e2013b4d5ffb9c8d8511fc70927f1
Signed-off-by: Hyunggi Lee <hyunggi.lee@samsung.com>
---
 .../Tizen-7.0/Tizen-7.0-Base-Hotfix/aggregate_list |  5 ----
 .../Tizen-7.0-Base-Hotfix/candidate_snapshot       |  6 +----
 .../Tizen-7.0/Tizen-7.0-Base-Hotfix/project_config | 31 +++++++++++++++++++---
 TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/project_env  |  2 ++
 TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/project_meta |  2 ++
 .../Tizen-7.0/Tizen-7.0-Base-Hotfix/snapshot_info  |  2 +-
 TIZEN/Tizen-7.0/Tizen-7.0-Base/aggregate_list      |  5 ----
 TIZEN/Tizen-7.0/Tizen-7.0-Base/candidate_snapshot  | 14 +---------
 TIZEN/Tizen-7.0/Tizen-7.0-Base/project_config      | 30 ++++++++++++++++++---
 TIZEN/Tizen-7.0/Tizen-7.0-Base/project_env         |  2 ++
 TIZEN/Tizen-7.0/Tizen-7.0-Base/project_meta        |  4 ++-
 TIZEN/Tizen-7.0/Tizen-7.0-Base/snapshot_info       |  2 +-
 12 files changed, 68 insertions(+), 37 deletions(-)
 delete mode 100644 TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/aggregate_list
 delete mode 100644 TIZEN/Tizen-7.0/Tizen-7.0-Base/aggregate_list

diff --git a/TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/aggregate_list b/TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/aggregate_list
deleted file mode 100644
index 0a7bd43..0000000
--- a/TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/aggregate_list
+++ /dev/null
@@ -1,5 +0,0 @@
-<aggregatelist>
-  <aggregate project_url="base" include_debug="yes" include_src="yes">
-    <repository source="standard" target="standard"/>
-  </aggregate>
-</aggregatelist>
diff --git a/TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/candidate_snapshot b/TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/candidate_snapshot
index b82bf3a..239100c 100644
--- a/TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/candidate_snapshot
+++ b/TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/candidate_snapshot
@@ -2,9 +2,5 @@
 <snapshotinfo>
   <candidate target="reference" url="http://download.tizen.org/snapshots/TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/" />
   <candidate target="tizen-7.0-base-hotfix_20221116.050829" url="http://download.tizen.org/snapshots/TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/" />
-  <base_candidate target="tizen-7.0-base-tool-hotfix_20221116.1" url="http://download.tizen.org/snapshots/tizen/7.0-base-tool-hotfix/" />
-  <base_candidate target="tizen-7.0-base-tool-hotfix_20221116.2" url="http://download.tizen.org/snapshots/tizen/7.0-base-tool-hotfix/" />
-  <base_candidate target="tizen-7.0-base-tool-hotfix_20221208.1" url="http://download.tizen.org/snapshots/tizen/7.0-base-tool-hotfix/" />
-  <base_candidate target="tizen-7.0-base-tool-hotfix_20221212.1" url="http://download.tizen.org/snapshots/tizen/7.0-base-tool-hotfix/" />
-  <base_candidate target="tizen-7.0-base-tool-hotfix_20230302.1" url="http://download.tizen.org/snapshots/tizen/7.0-base-tool-hotfix/" />
+  <base_candidate target="tizen-7.0-base-hotfix_20221116.050829" url="http://download.tizen.org/snapshots/TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/" />
 </snapshotinfo>
\ No newline at end of file
diff --git a/TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/project_config b/TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/project_config
index 06a4f85..e1c0490 100644
--- a/TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/project_config
+++ b/TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/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
@@ -52,9 +55,6 @@ Macros:
 %_vendor tizen
 %_with_tizen 1
 
-#### %__spec_check_pre exit 0
-#### %run_check_section 0
-
 %opensuse_bs 1
 %_default_patch_fuzz   2
 
@@ -62,6 +62,31 @@ Macros:
 :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 #####################################
 
 ########## targets ##########
diff --git a/TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/project_env b/TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/project_env
index 4524919..af4c670 100644
--- a/TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/project_env
+++ b/TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/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-7.0/Tizen-7.0-Base-Hotfix/project_meta b/TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/project_meta
index a05cf2a..6d45650 100644
--- a/TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/project_meta
+++ b/TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/project_meta
@@ -3,6 +3,7 @@
     <enable/>
   </debuginfo>
   <repository name="standard">
+  <path project="DOD:Tizen-7.0-Base-Hotfix" repository="standard" />
     <arch name="armv7l"/>
     <arch name="armv7hl"/>
     <arch name="i586"/>
@@ -13,6 +14,7 @@
     <default/>
     <org name="">
       <branch name="tizen_7.0_base"/>
+      <branch name="tizen_7.0_binary"/>
       <branch name="tizen_7.0_base_hotfix"/>
     </org>
   </branch_candidate>
diff --git a/TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/snapshot_info b/TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/snapshot_info
index 303140a..df6175e 100644
--- a/TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/snapshot_info
+++ b/TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/snapshot_info
@@ -2,7 +2,7 @@
 <snapshotinfo>
   <latest target="tizen-7.0-base-hotfix_20221116.050829" url="http://download.tizen.org/snapshots/TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/"/>
   <reference target="tizen-7.0-base-hotfix_20221116.050829" url="http://download.tizen.org/snapshots/TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/"/>
-  <base target="tizen-7.0-base-tool-hotfix_20221116.1" url="http://download.tizen.org/snapshots/tizen/7.0-base-tool-hotfix/">
+  <base target="tizen-7.0-base-hotfix_20221116.050829" url="http://download.tizen.org/snapshots/TIZEN/Tizen-7.0/Tizen-7.0-Base-Hotfix/">
     <repository name="standard">
       <type name="standard"/>
     </repository>
diff --git a/TIZEN/Tizen-7.0/Tizen-7.0-Base/aggregate_list b/TIZEN/Tizen-7.0/Tizen-7.0-Base/aggregate_list
deleted file mode 100644
index 0a7bd43..0000000
--- a/TIZEN/Tizen-7.0/Tizen-7.0-Base/aggregate_list
+++ /dev/null
@@ -1,5 +0,0 @@
-<aggregatelist>
-  <aggregate project_url="base" include_debug="yes" include_src="yes">
-    <repository source="standard" target="standard"/>
-  </aggregate>
-</aggregatelist>
diff --git a/TIZEN/Tizen-7.0/Tizen-7.0-Base/candidate_snapshot b/TIZEN/Tizen-7.0/Tizen-7.0-Base/candidate_snapshot
index 2fb9994..de59d46 100644
--- a/TIZEN/Tizen-7.0/Tizen-7.0-Base/candidate_snapshot
+++ b/TIZEN/Tizen-7.0/Tizen-7.0-Base/candidate_snapshot
@@ -2,17 +2,5 @@
 <snapshotinfo>
   <candidate target="reference" url="http://download.tizen.org/snapshots/TIZEN/Tizen-7.0/Tizen-7.0-Base/" />
   <candidate target="tizen-7.0-base_20230601.051542" url="http://download.tizen.org/snapshots/TIZEN/Tizen-7.0/Tizen-7.0-Base/" />
-  <base_candidate target="tizen-7.0-base-tool_20221028.2" url="http://download.tizen.org/snapshots/tizen/7.0-base-tool/" />
-  <base_candidate target="tizen-7.0-base-tool_20221028.3" url="http://download.tizen.org/snapshots/tizen/7.0-base-tool/" />
-  <base_candidate target="tizen-7.0-base-tool_20221028.4" url="http://download.tizen.org/snapshots/tizen/7.0-base-tool/" />
-  <base_candidate target="tizen-7.0-base-tool_20221029.1" url="http://download.tizen.org/snapshots/tizen/7.0-base-tool/" />
-  <base_candidate target="tizen-7.0-base-tool_20221029.2" url="http://download.tizen.org/snapshots/tizen/7.0-base-tool/" />
-  <base_candidate target="tizen-7.0-base-tool_20221208.1" url="http://download.tizen.org/snapshots/tizen/7.0-base-tool/" />
-  <base_candidate target="tizen-7.0-base-tool_20221212.1" url="http://download.tizen.org/snapshots/tizen/7.0-base-tool/" />
-  <base_candidate target="tizen-7.0-base-tool_20221223.1" url="http://download.tizen.org/snapshots/tizen/7.0-base-tool/" />
-  <base_candidate target="tizen-7.0-base-tool_20230214.1" url="http://download.tizen.org/snapshots/tizen/7.0-base-tool/" />
-  <base_candidate target="tizen-7.0-base-tool_20230227.1" url="http://download.tizen.org/snapshots/tizen/7.0-base-tool/" />
-  <base_candidate target="tizen-7.0-base-tool_20230302.1" url="http://download.tizen.org/snapshots/tizen/7.0-base-tool/" />
-  <base_candidate target="tizen-7.0-base-tool_20230420.1" url="http://download.tizen.org/snapshots/tizen/7.0-base-tool/" />
-  <base_candidate target="tizen-7.0-base-tool_20230531.1" url="http://download.tizen.org/snapshots/tizen/7.0-base-tool/" />
+  <base_candidate target="tizen-7.0-base_20230601.051542" url="http://download.tizen.org/snapshots/TIZEN/Tizen-7.0/Tizen-7.0-Base/" />
 </snapshotinfo>
\ No newline at end of file
diff --git a/TIZEN/Tizen-7.0/Tizen-7.0-Base/project_config b/TIZEN/Tizen-7.0/Tizen-7.0-Base/project_config
index 06a4f85..8758022 100644
--- a/TIZEN/Tizen-7.0/Tizen-7.0-Base/project_config
+++ b/TIZEN/Tizen-7.0/Tizen-7.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
@@ -52,15 +55,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-7.0/Tizen-7.0-Base/project_env b/TIZEN/Tizen-7.0/Tizen-7.0-Base/project_env
index 4524919..af4c670 100644
--- a/TIZEN/Tizen-7.0/Tizen-7.0-Base/project_env
+++ b/TIZEN/Tizen-7.0/Tizen-7.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-7.0/Tizen-7.0-Base/project_meta b/TIZEN/Tizen-7.0/Tizen-7.0-Base/project_meta
index 333f727..f9c14fe 100644
--- a/TIZEN/Tizen-7.0/Tizen-7.0-Base/project_meta
+++ b/TIZEN/Tizen-7.0/Tizen-7.0-Base/project_meta
@@ -3,6 +3,7 @@
     <enable/>
   </debuginfo>
   <repository name="standard">
+    <path project="DOD:Tizen-7.0-Base" repository="standard" />
     <arch name="armv7l"/>
     <arch name="armv7hl"/>
     <arch name="i586"/>
@@ -13,12 +14,13 @@
     <default/>
     <org name="">
       <branch name="tizen_7.0_base"/>
+      <branch name="tizen_7.0_binary"/>
     </org>
   </branch_candidate>
   <use_img_addrm>
     <disable/>
   </use_img_addrm>
   <maintainers>
-    <project_leader>yooduck.seo</project_leader>
+    <project_leader></project_leader>
   </maintainers>
 </project>
diff --git a/TIZEN/Tizen-7.0/Tizen-7.0-Base/snapshot_info b/TIZEN/Tizen-7.0/Tizen-7.0-Base/snapshot_info
index ead79f0..7f855e5 100644
--- a/TIZEN/Tizen-7.0/Tizen-7.0-Base/snapshot_info
+++ b/TIZEN/Tizen-7.0/Tizen-7.0-Base/snapshot_info
@@ -2,7 +2,7 @@
 <snapshotinfo>
   <latest target="tizen-7.0-base_20230601.051542" url="http://download.tizen.org/snapshots/TIZEN/Tizen-7.0/Tizen-7.0-Base/"/>
   <reference target="tizen-7.0-base_20230601.051542" url="http://download.tizen.org/snapshots/TIZEN/Tizen-7.0/Tizen-7.0-Base/"/>
-  <base target="tizen-7.0-base-tool_20230531.1" url="http://download.tizen.org/snapshots/tizen/7.0-base-tool/">
+  <base target="tizen-7.0-base_20230601.051542" url="http://download.tizen.org/snapshots/TIZEN/Tizen-7.0/Tizen-7.0-Base/">
     <repository name="standard">
       <type name="standard"/>
     </repository>
-- 
2.7.4