From: Jackie Huang <jackie.huang@windriver.com>
Date: Wed, 8 Jul 2020 12:15:33 +0000 (+0800)
Subject: iso-codes: fix the branch and protocol for src_uri
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=628bd03632f5c07b6526622f1e6f85060ef939a7;p=pti%2Frtp.git

iso-codes: fix the branch and protocol for src_uri

The upstream repo of iso-codes has renamed 'master' branch to 'main',
and the git protocol is not available any more, so fix the branch name
and add https and http as the src_uri mirrors to avoid fetch failures.

Issue-ID: INF-185
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: I5879dc5aa7a68c55dd23fac0e5f84944a075ab66
---

diff --git a/meta-stx/recipes-anaconda/iso-codes/iso-codes_%.bbappend b/meta-stx/recipes-anaconda/iso-codes/iso-codes_%.bbappend
new file mode 100644
index 0000000..a0730ec
--- /dev/null
+++ b/meta-stx/recipes-anaconda/iso-codes/iso-codes_%.bbappend
@@ -0,0 +1,19 @@
+#
+# Copyright (C) 2019 Wind River Systems, Inc.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+BRANCH = "main"
+PROTOCOL = "https"
+
+SRC_URI = "git://salsa.debian.org/iso-codes-team/iso-codes.git;protocol=${PROTOCOL};branch=${BRANCH}"
diff --git a/scripts/configs/local-mirrors.conf b/scripts/configs/local-mirrors.conf
index afcb11b..16202e7 100644
--- a/scripts/configs/local-mirrors.conf
+++ b/scripts/configs/local-mirrors.conf
@@ -4,4 +4,6 @@ MIRRORS += "\
     ${GNOME_MIRROR}  https://mirror.umd.edu/gnome/sources \n \
     ${GNOME_MIRROR}  http://ftp.rpmfind.net/linux/gnome.org/sources \n \
     ${GNOME_MIRROR}  http://ftp.cse.buffalo.edu/pub/Gnome/sources \n \
+    git://salsa.debian.org/.*     git://salsa.debian.org/PATH;protocol=https \n \
+    git://salsa.debian.org/.*     git://salsa.debian.org/PATH;protocol=http \n \
 "