From 275ae9dabd945ef16bebc24e884504ade82f89e0 Mon Sep 17 00:00:00 2001
From: "build.automotivelinux.org" <jenkins@automotivelinux.org>
Date: Tue, 21 May 2019 14:49:43 +0200
Subject: Update repo manifests to use only https sources

This allows proxy setups to work better.

Bug-AGL: SPEC-2408

Change-Id: I8c93181c8e5a306f3b62765b419849ad0bfd7e09
Signed-off-by: build.automotivelinux.org <jenkins@automotivelinux.org>
---
 default-floating.xml | 70 ++++++++++++++++++++++++++++++----------------------
 default.xml          | 67 ++++++++++++++++++++++++++-----------------------
 2 files changed, 76 insertions(+), 61 deletions(-)

diff --git a/default-floating.xml b/default-floating.xml
index 8e9ebdae..f12d9f2e 100644
--- a/default-floating.xml
+++ b/default-floating.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
 
+  <!-- remote servers to query -->
   <remote name="agl"
          fetch="https://gerrit.automotivelinux.org/gerrit/"
          review="https://gerrit.automotivelinux.org/gerrit/"
          pushurl="ssh://gerrit.automotivelinux.org:29418"
   />
+  <remote name="yocto" fetch="https://git.yoctoproject.org/git/" />
+  <remote name="github" fetch="https://github.com/" />
 
-  <remote name="yocto" fetch="git://git.yoctoproject.org/" />
-  <remote name="openembedded" fetch="git://git.openembedded.org/" />
+  <!-- defaults -->
+  <default remote="agl" sync-j="4" revision="master"/>
 
-  <!-- meta-updater --> <!-- freescale bsp --> <!-- 01.org -->
-  <remote name="github" fetch="https://github.com/" />
 
-  <!-- meta-qt5  -->
-  <remote name="qt.io" fetch="git://code.qt.io/" />
+  <!-- CORE -->
 
-  <default remote="agl" sync-j="4" revision="master"/>
+  <!-- use agl revisions/branches here -->
 
   <!-- AGL things. -->
   <project name="AGL/meta-agl" path="meta-agl" />
@@ -24,39 +24,55 @@
   <project name="AGL/meta-agl-demo" path="meta-agl-demo" />
   <project name="AGL/meta-agl-devel" path="meta-agl-devel" />
   <project name="AGL/meta-agl-extra" path="meta-agl-extra" />
+  <project name="AGL/meta-agl-telematics-demo" path="meta-agl-telematics-demo" />
 
-  <!-- Renesas Gen3 specific things -->
-  <project name="AGL/meta-renesas-rcar-gen3" path="meta-renesas-rcar-gen3" />
-  <project name="CogentEmbedded/meta-rcar" path="meta-rcar" remote="github" revision="thud-v3.15.0"/>
 
-  <!-- Updater layers. -->
-  <project name="advancedtelematic/meta-updater" path="meta-updater" remote="github" revision="thud"/>
-  <project name="advancedtelematic/meta-updater-qemux86-64" path="meta-updater-qemux86-64" remote="github" revision="thud"/>
+  <!-- FLOATING has no fixed revision for external repos ! -->
+
+  <!-- YOCTO & OE -->
 
   <!-- Yocto/OpenEmbedded things. -->
   <project name="poky" path="poky" remote="yocto" revision="thud" />
   <project name="meta-gplv2" path="meta-gplv2" remote="yocto" revision="thud" />
-  <project name="meta-openembedded" path="meta-openembedded" remote="openembedded" revision="thud" />
+  <project name="openembedded/meta-openembedded" path="meta-openembedded" remote="github" revision="thud" />
+
+
+  <!-- UPSTREAM COMPONENTS -->
+
+  <!-- meta-virtualization -->
   <project name="meta-virtualization" path="meta-virtualization" remote="yocto" revision="thud"/>
 
   <!-- Qt things -->
-  <!-- Qt 5.8 -->
   <project name="meta-qt5/meta-qt5" path="meta-qt5" remote="github" revision="thud"/>
 
+  <!-- Updater layers. -->
+  <project name="advancedtelematic/meta-updater" path="meta-updater" remote="github" revision="thud"/>
+  <project name="advancedtelematic/meta-updater-qemux86-64" path="meta-updater-qemux86-64" remote="github" revision="thud"/>
+
+  <!-- Security layer -->
+  <project name="meta-security" path="meta-security" remote="yocto" revision="thud"/>
+
+  <!-- SmartDeviceLink layer -->
+  <project name="phongt/meta-sdl" path="meta-sdl" remote="github" revision="thud"/>
+
+  <!-- meta-spdxscanner - support for fossology -->
+  <project name="dl9pf/meta-spdxscanner" path="meta-spdxscanner" remote="github" revision="master"/>
+
+
+  <!-- BSPs -->
+
+  <!-- Renesas Gen3 specific things -->
+  <project name="AGL/meta-renesas-rcar-gen3" path="meta-renesas-rcar-gen3" />
+  <project name="CogentEmbedded/meta-rcar" path="meta-rcar" remote="github" revision="thud-v3.15.0"/>
+
   <!-- MinnowBoard MAX specific things -->
   <project name="meta-intel" path="meta-intel" remote="yocto" revision="thud"/>
 
-  <!-- i.MX6 / e.g. wandboard specific things -->
-  <!--
-  <project name="Freescale/meta-freescale" path="meta-freescale" remote="github" revision="06178400afbd641a6709473fd21d893dcd3cfbfa" revision="pyro"/>
-  <project name="Freescale/meta-freescale-3rdparty" path="meta-freescale-3rdparty" remote="github" revision="35badbde05d4f10d4faeefc30bc126b5bd228e2e" revision="pyro"/>
-  <project name="Freescale/meta-freescale-distro" path="meta-freescale-distro" remote="github" revision="cd5c7a2539f40004f74126e9fdf08254fd9a6390" revision="pyro"/>
-  -->
   <!-- consolidate on meta-freescale from git.yoctoproject.org -->
   <project name="meta-freescale" path="meta-freescale" remote="yocto" revision="thud"/>
 
   <!-- Boundary devices bsp layer -->
-  <!-- <project name="boundarydevices/meta-boundary" path="meta-boundary" remote="github" revision="master"/> -->
+  <project name="boundarydevices/meta-boundary" path="meta-boundary" remote="github" revision="master"/>
 
   <!-- ti vayu / jacinto 6 / DRA7 -->
   <project name="meta-ti" path="meta-ti" remote="yocto" revision="thud"/>
@@ -75,13 +91,7 @@
   <project name="SanCloudLtd/meta-sancloud" path="meta-sancloud" remote="github" revision="thud"/>
   <project name="EmbeddedAndroid/meta-rtlwifi" path="meta-rtlwifi" remote="github" revision="master"/>
 
-  <!-- Security layer -->
-  <project name="meta-security" path="meta-security" remote="yocto" revision="thud"/>
-
-  <!-- SmartDeviceLink layer -->
-  <project name="phongt/meta-sdl" path="meta-sdl" remote="github" revision="thud"/>
-
-  <!-- meta-spdxscanner - support for fossology -->
-  <project name="dl9pf/meta-spdxscanner" path="meta-spdxscanner" remote="github" revision="master"/>
+  <!-- meta-synopsys - support for ARC HSDK board -->
+  <project name="foss-for-synopsys-dwc-arc-processors/meta-synopsys" path="meta-synopsys" remote="github" revision="thud-agl"/>
 
 </manifest>
diff --git a/default.xml b/default.xml
index aa1107aa..17f56d27 100644
--- a/default.xml
+++ b/default.xml
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
 
+  <!-- remote servers to query -->
   <remote name="agl"
          fetch="https://gerrit.automotivelinux.org/gerrit/"
          review="https://gerrit.automotivelinux.org/gerrit/"
          pushurl="ssh://gerrit.automotivelinux.org:29418"
   />
-
-  <remote name="yocto" fetch="git://git.yoctoproject.org/" />
-  <remote name="openembedded" fetch="git://git.openembedded.org/" />
-
-  <!-- meta-updater --> <!-- freescale bsp --> <!-- 01.org -->
+  <remote name="yocto" fetch="https://git.yoctoproject.org/git/" />
   <remote name="github" fetch="https://github.com/" />
 
-  <!-- meta-qt5  -->
-  <remote name="qt.io" fetch="git://code.qt.io/" />
-
+  <!-- defaults -->
   <default remote="agl" sync-j="4" revision="master"/>
 
+
+  <!-- CORE -->
+  <!-- use agl revisions/branches here -->
+
   <!-- AGL things. -->
   <project name="AGL/meta-agl" path="meta-agl" />
   <project name="AGL/meta-agl-cluster-demo" path="meta-agl-cluster-demo" />
@@ -26,33 +25,48 @@
   <project name="AGL/meta-agl-extra" path="meta-agl-extra" />
   <project name="AGL/meta-agl-telematics-demo" path="meta-agl-telematics-demo" />
 
-  <!-- Renesas Gen3 specific things -->
-  <project name="AGL/meta-renesas-rcar-gen3" path="meta-renesas-rcar-gen3" />
-  <project name="CogentEmbedded/meta-rcar" path="meta-rcar" remote="github" revision="5aecbd92ce06c179efa9dca9127c09219018bc4b" upstream="thud-v3.15.0"/>
 
-  <!-- Updater layers. -->
-  <project name="advancedtelematic/meta-updater" path="meta-updater" remote="github" revision="2d2e46834af68b1c22ad0a022001c117caa4929c" upstream="thud"/>
-  <project name="advancedtelematic/meta-updater-qemux86-64" path="meta-updater-qemux86-64" remote="github" revision="214e14c4c45625842e542eebd696f903060d488f" upstream="thud"/>
+  <!-- ALL EXTERNAL REPOS BELOW USE A FIXED REVISION ! -->
+
+  <!-- YOCTO & OE -->
 
   <!-- Yocto/OpenEmbedded things. -->
   <project name="poky" path="poky" remote="yocto" revision="faeb366bc3eb322f5f203cfe08dc4cf529a822e9" upstream="thud" />
   <project name="meta-gplv2" path="meta-gplv2" remote="yocto" revision="aabc30f3bd03f97326fb8596910b94639fea7575" upstream="thud" />
-  <project name="meta-openembedded" path="meta-openembedded" remote="openembedded" revision="4cd3a39f22a2712bfa8fc657d09fe2c7765a4005" upstream="thud" />
+  <project name="openembedded/meta-openembedded" path="meta-openembedded" remote="github" revision="4cd3a39f22a2712bfa8fc657d09fe2c7765a4005" upstream="thud" />
+
+
+  <!-- UPSTREAM COMPONENTS -->
+
+  <!-- meta-virtualization -->
   <project name="meta-virtualization" path="meta-virtualization" remote="yocto" revision="9e8c0c96b443828a255e7d6ca6291598347672ac" upstream="thud"/>
 
   <!-- Qt things -->
-  <!-- Qt 5.8 -->
   <project name="meta-qt5/meta-qt5" path="meta-qt5" remote="github" revision="81937713f774d7dea854b22987b3ef1ab1f1cdbe" upstream="thud"/>
 
+  <!-- Updater layers. -->
+  <project name="advancedtelematic/meta-updater" path="meta-updater" remote="github" revision="2d2e46834af68b1c22ad0a022001c117caa4929c" upstream="thud"/>
+  <project name="advancedtelematic/meta-updater-qemux86-64" path="meta-updater-qemux86-64" remote="github" revision="214e14c4c45625842e542eebd696f903060d488f" upstream="thud"/>
+
+  <!-- Security layer -->
+  <project name="meta-security" path="meta-security" remote="yocto" revision="31dc4e7532fa7a82060e0b50e5eb8d0414aa7e93" upstream="thud"/>
+
+  <!-- SmartDeviceLink layer -->
+  <project name="phongt/meta-sdl" path="meta-sdl" remote="github" revision="ab1e345171e799216b8fcb432943a2de5ff66f5f" upstream="thud"/>
+
+  <!-- meta-spdxscanner - support for fossology -->
+  <project name="dl9pf/meta-spdxscanner" path="meta-spdxscanner" remote="github" revision="2dd8b88071268a5922696db36a9ba8be96a9e0ef" upstream="master"/>
+
+
+  <!-- BSPs -->
+
+  <!-- Renesas Gen3 specific things -->
+  <project name="AGL/meta-renesas-rcar-gen3" path="meta-renesas-rcar-gen3" />
+  <project name="CogentEmbedded/meta-rcar" path="meta-rcar" remote="github" revision="5aecbd92ce06c179efa9dca9127c09219018bc4b" upstream="thud-v3.15.0"/>
+
   <!-- MinnowBoard MAX specific things -->
   <project name="meta-intel" path="meta-intel" remote="yocto" revision="27dadcfc7bc0de70328b02fecb841608389d22fc" upstream="thud"/>
 
-  <!-- i.MX6 / e.g. wandboard specific things -->
-  <!--
-  <project name="Freescale/meta-freescale" path="meta-freescale" remote="github" revision="06178400afbd641a6709473fd21d893dcd3cfbfa" upstream="pyro"/>
-  <project name="Freescale/meta-freescale-3rdparty" path="meta-freescale-3rdparty" remote="github" revision="35badbde05d4f10d4faeefc30bc126b5bd228e2e" upstream="pyro"/>
-  <project name="Freescale/meta-freescale-distro" path="meta-freescale-distro" remote="github" revision="cd5c7a2539f40004f74126e9fdf08254fd9a6390" upstream="pyro"/>
-  -->
   <!-- consolidate on meta-freescale from git.yoctoproject.org -->
   <project name="meta-freescale" path="meta-freescale" remote="yocto" revision="f5c932229c31b612cba38c2ed6f3c3ec6b800e92" upstream="thud"/>
 
@@ -76,15 +90,6 @@
   <project name="SanCloudLtd/meta-sancloud" path="meta-sancloud" remote="github" revision="430d3da4ee36580e5950d94a76edf88eea753ebb" upstream="thud"/>
   <project name="EmbeddedAndroid/meta-rtlwifi" path="meta-rtlwifi" remote="github" revision="fd7ca0ca47c7095ced62a5a7cdef040dff87fb76" upstream="master"/>
 
-  <!-- Security layer -->
-  <project name="meta-security" path="meta-security" remote="yocto" revision="31dc4e7532fa7a82060e0b50e5eb8d0414aa7e93" upstream="thud"/>
-
-  <!-- SmartDeviceLink layer -->
-  <project name="phongt/meta-sdl" path="meta-sdl" remote="github" revision="ab1e345171e799216b8fcb432943a2de5ff66f5f" upstream="thud"/>
-
-  <!-- meta-spdxscanner - support for fossology -->
-  <project name="dl9pf/meta-spdxscanner" path="meta-spdxscanner" remote="github" revision="2dd8b88071268a5922696db36a9ba8be96a9e0ef" upstream="master"/>
-
   <!-- meta-synopsys - support for ARC HSDK board -->
   <project name="foss-for-synopsys-dwc-arc-processors/meta-synopsys" path="meta-synopsys" remote="github" revision="702a0e826e87796aefa97abc1de0217d3775fd13" upstream="thud-agl"/>
 
-- 
cgit 1.2.3-korg