From a2fcaf1777e96cd7933cddebb26f9a510d6e4eea Mon Sep 17 00:00:00 2001
From: Li Zhou <li.zhou@windriver.com>
Date: Thu, 21 Sep 2023 06:41:04 +0000
Subject: [PATCH] Remove linux-yocto git repo from manifest

The linux-yocto git repo clone is added for CENTOS based StarlingX.
Now the master branch is for DEBIAN based StarlingX support.
The build system uses source code tar archive snapshots downloaded
instead of the kernel git repo from "git.yoctoproject.org".
So we remove linux-yocto git repo from manifest and don't clone it
anymore when "repo sync" to avoid waste of bandwidth and disk resources.

Test Plan:
 PASS: Run "repo init" and "repo sync" following the DEBIAN based
       StarlingX build instructions, and the linux-yocto-std and
       linux-yocto-rt folders don't exist under this path:
       /localdisk/designer/$USER/stx/cgcs-root/stx/git
 PASS: Run "build-pkgs -p linux,linux-rt" and the build is OK.

Closes-bug: 2037028

Change-Id: I49ce817c48520c8a227e9fbf19473854b2eab9e9
Signed-off-by: Li Zhou <li.zhou@windriver.com>
---
 default.xml | 6 ------
 distro.xml  | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/default.xml b/default.xml
index c6f01a7..59b040a 100644
--- a/default.xml
+++ b/default.xml
@@ -5,7 +5,6 @@
   <remote name="starlingx" fetch="https://opendev.org/starlingx" />
   <remote name="hpe-storage" fetch="https://github.com/hpe-storage" />
   <remote name="gnocchi" fetch="https://github.com/gnocchixyz/" />
-  <remote name="linux-yocto" fetch="git://git.yoctoproject.org/" />
   <!-- note, you can also provide personal overrides for your own github -->
   <!-- for tests/experiments -->
 
@@ -96,11 +95,6 @@
   <!-- Last known good build of python-gnochiclient, 7.0.7 tag -->
   <project remote="gnocchi"    revision="refs/tags/7.0.7" name="python-gnocchiclient.git" path="cgcs-root/stx/git/python-gnocchiclient"/>
 
-  <!-- linux-yocto Upstream branch is v5.10/standard/base, commit 6cf7dea05bd756513cf58c5ced8c6bf1d1f23c15 is Merge tag 'v5.10.112' into v5.10/standard/base -->
-  <project remote="linux-yocto"    sync-c="true" sync-tags="false" upstream="v5.10/standard/base" revision="6cf7dea05bd756513cf58c5ced8c6bf1d1f23c15" name="linux-yocto" path="cgcs-root/stx/git/linux-yocto-std"/>
-  <!-- linux-yocto Upstream branch is v5.10/standard/preempt-rt/base, commit bd6e7290bc766ef13e42a1e37f75e6e708b4e317 that adds the preempt_rt patchset based on the same code of std kernel -->
-  <project remote="linux-yocto"    sync-c="true" sync-tags="false" clone-depth="100" upstream="v5.10/standard/preempt-rt/base" revision="bd6e7290bc766ef13e42a1e37f75e6e708b4e317" name="linux-yocto.git" path="cgcs-root/stx/git/linux-yocto-rt"/>
-
   <!-- Pure Upstream -->
   <!-- revisions point to branch stable/train as of 2023-05-04 -->
   <project remote="openstack" revision="ff702370a875f673d7d2d06ab7d29736540e9fda"  name="horizon.git" path="cgcs-root/stx/git/horizon"/>
diff --git a/distro.xml b/distro.xml
index e292dee..c1ced73 100644
--- a/distro.xml
+++ b/distro.xml
@@ -6,7 +6,6 @@
   <remote name="openstack" fetch="https://opendev.org/openstack" />
   <remote name="starlingx" fetch="https://opendev.org/starlingx" />
   <remote name="stx-staging" fetch="https://github.com/starlingx-staging"/>
-  <remote name="linux-yocto" fetch="git://git.yoctoproject.org/" />
   <!-- note, you can also provide personal overrides for your own github -->
   <!-- for tests/experiments -->
 
@@ -41,11 +40,6 @@
   <!-- Last known good build of python-gnochiclient, 7.0.7 tag -->
   <project remote="gnocchi"    revision="refs/tags/7.0.7" name="python-gnocchiclient.git" path="cgcs-root/stx/git/python-gnocchiclient"/>
 
-  <!-- linux-yocto Upstream branch is v5.10/standard/base, commit 6cf7dea05bd756513cf58c5ced8c6bf1d1f23c15 is Merge tag 'v5.10.112' into v5.10/standard/base -->
-  <project remote="linux-yocto"    sync-c="true" sync-tags="false" upstream="v5.10/standard/base" revision="6cf7dea05bd756513cf58c5ced8c6bf1d1f23c15" name="linux-yocto" path="cgcs-root/stx/git/linux-yocto-std"/>
-  <!-- linux-yocto Upstream branch is v5.10/standard/preempt-rt/base, commit bd6e7290bc766ef13e42a1e37f75e6e708b4e317 that adds the preempt_rt patchset based on the same code of std kernel -->
-  <project remote="linux-yocto"    sync-c="true" sync-tags="false" clone-depth="100" upstream="v5.10/standard/preempt-rt/base" revision="bd6e7290bc766ef13e42a1e37f75e6e708b4e317" name="linux-yocto.git" path="cgcs-root/stx/git/linux-yocto-rt"/>
-
   <!-- Pure Upstream -->
   <!-- revisions point to branch stable/train as of 2023-05-04 -->
   <project remote="openstack" revision="ff702370a875f673d7d2d06ab7d29736540e9fda"  name="horizon.git" path="cgcs-root/stx/git/horizon"/>