starlingx
/
manifest
Code Issues Proposed changes

linux-yocto drops intel-x86 branch 

https://lists.yoctoproject.org/g/linux-yocto/message/10071.
genericx86-64  = "v5.10/standard/base", so we change to
branch v5.10/standard/base for std kernel,
v5.10/standard/preempt-rt/base for rt kernel. also change
commit id to bced2cdbd646996800d920c1604bffbb050a62ab because
the branch is changed.

Closes-Bug: 1937989

Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
Change-Id: Iee90e4f3793bde94a0f93a82d7d8424669237cdc
This commit is contained in:
Jiping Ma 2021-07-26 02:01:58 -04:00
parent a1a4588756
commit d9c04bb5e8
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
default.xml
View File

@ -77,9 +77,9 @@
<project remote="gnocchi" revision="master" name="python-gnocchiclient.git" path="cgcs-root/stx/git/python-gnocchiclient"/>
<!-- linux-yocto Upstream -->
<project remote="linux-yocto" sync-c="true" sync-tags="false" upstream="v5.10/standard/x86" revision="refs/tags/v5.10.30" name="linux-yocto" path="cgcs-root/stx/git/linux-yocto-std"/>
<project remote="linux-yocto" sync-c="true" sync-tags="false" upstream="v5.10/standard/base" revision="refs/tags/v5.10.30" name="linux-yocto" path="cgcs-root/stx/git/linux-yocto-std"/>
<!-- this sha merges 5.10.37 into preempt-rt -->
<project remote="linux-yocto" sync-c="true" sync-tags="false" clone-depth="100" upstream="v5.10/standard/preempt-rt/x86" revision="2112f10d3d0b558c9ece3ab562c41b7f6d89cff4" name="linux-yocto.git" path="cgcs-root/stx/git/linux-yocto-rt"/>
<project remote="linux-yocto" sync-c="true" sync-tags="false" clone-depth="100" upstream="v5.10/standard/preempt-rt/base" revision="bced2cdbd646996800d920c1604bffbb050a62ab" name="linux-yocto.git" path="cgcs-root/stx/git/linux-yocto-rt"/>
<!-- Pure Upstream -->

5
distro.xml
View File

@ -39,9 +39,10 @@
<project remote="gnocchi" revision="master" name="python-gnocchiclient.git" path="cgcs-root/stx/git/python-gnocchiclient"/>
<!-- linux-yocto Upstream -->
<project remote="linux-yocto" sync-c="true" sync-tags="false" upstream="v5.10/standard/x86" revision="refs/tags/v5.10.30" name="linux-yocto" path="cgcs-root/stx/git/linux-yocto-std"/>
<project remote="linux-yocto" sync-c="true" sync-tags="false" upstream="v5.10/standard/base" revision="refs/tags/v5.10.30" name="linux-yocto" path="cgcs-root/stx/git/linux-yocto-std"/>
<!-- this sha merges 5.10.37 into preempt-rt -->
<project remote="linux-yocto" sync-c="true" sync-tags="false" clone-depth="100" upstream="v5.10/standard/preempt-rt/x86" revision="2112f10d3d0b558c9ece3ab562c41b7f6d89cff4" name="linux-yocto.git" path="cgcs-root/stx/git/linux-yocto-rt"/>
<project remote="linux-yocto" sync-c="true" sync-tags="false" clone-depth="100" upstream="v5.10/standard/preempt-rt/base" revision="bced2cdbd646996800d920c1604bffbb050a62ab" name="linux-yocto.git" path="cgcs-root/stx/git/linux-yocto-rt"/>
<!-- Pure Upstream -->
<project remote="openstack" revision="stable/train" name="horizon.git" path="cgcs-root/stx/git/horizon"/>