diff options
author | Scott Murray <scott.murray@konsulko.com> | 2020-04-02 18:34:27 -0400 |
---|---|---|
committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2020-04-27 17:22:54 +0200 |
commit | 08ce0ac84e8b38d3491f188942ed7d21a97861d1 (patch) | |
tree | fb9bcd1010bb84ecae0c7e55b0f643e0b6485628 | |
parent | 3341d32707bdf02e7ddc743feca74dee45433aff (diff) |
Update default manifests to use master/dunfell branches
To facilitate migrating to the upcoming Yocto Project 3.1 aka dunfell
release, update the default.xml and default-floating.xml manifest
files to use the "next" branches of the meta-agl* repositories, and
the current latest master or dunfell branches of third-party
repositories. Third-party repositories that do not yet have dunfell
support declared in their LAYERSERIES_COMPAT variables are commented
out in the manifests. Further iteration will be required as more
third-party repositories add dunfell branches in the run up to its
release at the end of April 2020.
Bug-AGL: SPEC-3302
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I2851cac80d61ace9bafb3062964f2d687d5d7e5c
-rw-r--r-- | default-floating.xml | 51 | ||||
-rw-r--r-- | default.xml | 44 |
2 files changed, 49 insertions, 46 deletions
diff --git a/default-floating.xml b/default-floating.xml index 8aa053ec..39864726 100644 --- a/default-floating.xml +++ b/default-floating.xml @@ -11,7 +11,7 @@ <remote name="github" fetch="https://github.com/" /> <!-- defaults --> - <default remote="agl" sync-j="4" revision="master"/> + <default remote="agl" sync-j="4" revision="next"/> <!-- CORE --> @@ -32,29 +32,29 @@ <!-- YOCTO & OE --> <!-- Yocto/OpenEmbedded things. --> - <project name="poky" path="external/poky" remote="yocto" revision="zeus" /> - <project name="meta-gplv2" path="external/meta-gplv2" remote="yocto" revision="zeus" /> - <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="zeus" /> + <project name="poky" path="external/poky" remote="yocto" revision="master" /> + <project name="meta-gplv2" path="external/meta-gplv2" remote="yocto" revision="master" /> + <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="master" /> <!-- UPSTREAM COMPONENTS --> <!-- meta-virtualization --> - <project name="meta-virtualization" path="external/meta-virtualization" remote="yocto" revision="zeus"/> + <project name="meta-virtualization" path="external/meta-virtualization" remote="yocto" revision="master"/> <!-- Qt things --> - <project name="meta-qt5/meta-qt5" path="external/meta-qt5" remote="github" revision="zeus"/> + <project name="meta-qt5/meta-qt5" path="external/meta-qt5" remote="github" revision="dunfell"/> <!-- Updater layers. --> - <project name="advancedtelematic/meta-updater" path="external/meta-updater" remote="github" revision="zeus"/> - <project name="advancedtelematic/meta-updater-qemux86-64" path="external/meta-updater-qemux86-64" remote="github" revision="zeus"/> - <project name="advancedtelematic/meta-updater-raspberrypi" path="external/meta-updater-raspberrypi" remote="github" revision="zeus"/> + <project name="advancedtelematic/meta-updater" path="external/meta-updater" remote="github" revision="master"/> + <project name="advancedtelematic/meta-updater-qemux86-64" path="external/meta-updater-qemux86-64" remote="github" revision="master"/> + <project name="advancedtelematic/meta-updater-raspberrypi" path="external/meta-updater-raspberrypi" remote="github" revision="master"/> <!-- Security layer --> - <project name="meta-security" path="external/meta-security" remote="yocto" revision="zeus"/> + <project name="meta-security" path="external/meta-security" remote="yocto" revision="master"/> <!-- SmartDeviceLink layer --> -<!-- no zeus branch. FIXME +<!-- FIXME no zeus or newer support <project name="phongt/meta-sdl" path="external/meta-sdl" remote="github" revision="thud"/> --> @@ -65,46 +65,45 @@ <project name="alexa/alexa-auto-sdk" path="external/alexa-auto-sdk" remote="github" revision="2.0"/> <!-- clang support --> - <project name="kraj/meta-clang" path="external/meta-clang" remote="github" revision="zeus"/> + <project name="kraj/meta-clang" path="external/meta-clang" remote="github" revision="master"/> <!-- BSPs --> <!-- Renesas Gen3 specific things --> - <project name="AGL/meta-renesas-rcar-gen3" path="external/meta-renesas-rcar-gen3" /> - <project name="CogentEmbedded/meta-rcar" path="external/meta-rcar" remote="github" revision="zeus-Yocto-v3.21.0"/> + <project name="AGL/meta-renesas-rcar-gen3" path="bsp/meta-renesas-rcar-gen3" /> + <project name="CogentEmbedded/meta-rcar" path="bsp/meta-rcar" remote="github" revision="zeus-Yocto-v3.21.0"/> <!-- MinnowBoard MAX / Upsquared specific things --> <!-- FIXME: To be merged with qemux86-64 target! --> - <project name="meta-intel" path="bsp/meta-intel" remote="yocto" revision="zeus"/> + <project name="meta-intel" path="bsp/meta-intel" remote="yocto" revision="master"/> <!-- consolidate on meta-freescale from git.yoctoproject.org --> - <project name="meta-freescale" path="bsp/meta-freescale" remote="yocto" revision="zeus"/> - <project name="Freescale/meta-freescale-3rdparty" path="bsp/meta-freescale-3rdparty" remote="github" revision="zeus"/> - - <!-- Boundary devices BSP layer --> -<!-- FIXME zeus - <project name="boundarydevices/meta-boundary" path="bsp/meta-boundary" remote="github" revision="master"/> ---> + <project name="meta-freescale" path="bsp/meta-freescale" remote="yocto" revision="master"/> + <project name="Freescale/meta-freescale-3rdparty" path="bsp/meta-freescale-3rdparty" remote="github" revision="master"/> <!-- TI Vayu / Jacinto 6 / DRA7 --> - <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="zeus"/> + <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="master"/> <!-- Raspberry Pi 3, 3B+, and 4 --> - <project name="meta-raspberrypi" path="bsp/meta-raspberrypi" remote="yocto" revision="zeus"/> + <project name="meta-raspberrypi" path="bsp/meta-raspberrypi" remote="yocto" revision="master"/> <!-- DragonBoard 410c specific things --> - <project name="meta-qcom" path="bsp/meta-qcom" remote="yocto" revision="zeus"/> + <project name="meta-qcom" path="bsp/meta-qcom" remote="yocto" revision="master"/> <!-- Altera SOCFPGA platform --> <!-- https://github.com/kraj/meta-altera --> <project name="kraj/meta-altera" path="bsp/meta-altera" remote="github" revision="master"/> <!-- Sancloud BSP layers --> +<!-- FIXME: no dunfell support <project name="SanCloudLtd/meta-sancloud" path="bsp/meta-sancloud" remote="github" revision="zeus"/> +--> <project name="EmbeddedAndroid/meta-rtlwifi" path="bsp/meta-rtlwifi" remote="github" revision="master"/> <!-- meta-synopsys - support for ARC HSDK board --> - <project name="foss-for-synopsys-dwc-arc-processors/meta-synopsys" path="bsp/meta-synopsys" remote="github" revision="d25035baa95f71c7f087c215dff846dc1d8c0d91" upstream="zeus-agl"/> +<!-- FIXME: no dunfell support + <project name="foss-for-synopsys-dwc-arc-processors/meta-synopsys" path="bsp/meta-synopsys" remote="github" revision="zeus-agl"/> +--> </manifest> diff --git a/default.xml b/default.xml index ea959904..a8018bfb 100644 --- a/default.xml +++ b/default.xml @@ -11,7 +11,7 @@ <remote name="github" fetch="https://github.com/" /> <!-- defaults --> - <default remote="agl" sync-j="4" revision="master"/> + <default remote="agl" sync-j="4" revision="next"/> <!-- CORE --> @@ -31,29 +31,29 @@ <!-- YOCTO & OE --> <!-- Yocto/OpenEmbedded things. --> - <project name="poky" path="external/poky" remote="yocto" revision="5e1f52edb7a9f790fb6cb5d96502f3690267c1b1" upstream="zeus" /> - <project name="meta-gplv2" path="external/meta-gplv2" remote="yocto" revision="0f4eecc000f66d114ad258fa31aed66afa292166" upstream="zeus" /> - <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="bb65c27a772723dfe2c15b5e1b27bcc1a1ed884c" upstream="zeus" /> + <project name="poky" path="external/poky" remote="yocto" revision="02eacce4109e50f31fecb653de808f0c31ac68bb" upstream="master" /> + <project name="meta-gplv2" path="external/meta-gplv2" remote="yocto" revision="60b251c25ba87e946a0ca4cdc8d17b1cb09292ac" upstream="master" /> + <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="a6e846dadc5dcb5e4248d37c5f971c8a1f55df4a" upstream="master" /> <!-- UPSTREAM COMPONENTS --> <!-- meta-virtualization --> - <project name="meta-virtualization" path="external/meta-virtualization" remote="yocto" revision="f4262ab75d36a06c528cc1630b48b817fb0acf8f" upstream="zeus"/> + <project name="meta-virtualization" path="external/meta-virtualization" remote="yocto" revision="f1e768dfdfb148b9b4c6aaaf065ccea79dd5484d" upstream="master"/> <!-- Qt things --> - <project name="meta-qt5/meta-qt5" path="external/meta-qt5" remote="github" revision="a582fd4c810529e9af0c81700407b1955d1391d2" upstream="zeus"/> + <project name="meta-qt5/meta-qt5" path="external/meta-qt5" remote="github" revision="5e18973196e3ba71ed55cff96b323e2ea10c1523" upstream="dunfell"/> <!-- Updater layers. --> - <project name="advancedtelematic/meta-updater" path="external/meta-updater" remote="github" revision="a6ef1ed2784fde198baef0e6b12e4b0d86e8bb66" upstream="zeus"/> - <project name="advancedtelematic/meta-updater-qemux86-64" path="external/meta-updater-qemux86-64" remote="github" revision="c3ec073527518f9f90e42286cf3b41cb837c881c" upstream="zeus"/> - <project name="advancedtelematic/meta-updater-raspberrypi" path="external/meta-updater-raspberrypi" remote="github" revision="bc36a8f6cc578a97cb4b1e42f1d24bc97c5be8e0" upstream="zeus"/> + <project name="advancedtelematic/meta-updater" path="external/meta-updater" remote="github" revision="4a62d331a2170a20e76f4984d31de38b25c76463" upstream="master"/> + <project name="advancedtelematic/meta-updater-qemux86-64" path="external/meta-updater-qemux86-64" remote="github" revision="370a43d0b2046e9eea278496a39060b95b6b440f" upstream="master"/> + <project name="advancedtelematic/meta-updater-raspberrypi" path="external/meta-updater-raspberrypi" remote="github" revision="215913c37eb280554ddf3bd44cd5a8057f9e712c" upstream="master"/> <!-- Security layer --> - <project name="meta-security" path="external/meta-security" remote="yocto" revision="27ddb455543b670097e252ba0d0ad5b7e4101748" upstream="zeus"/> + <project name="meta-security" path="external/meta-security" remote="yocto" revision="98a6664408f17560549b94f575e058ed84dd6a0d" upstream="master"/> <!-- SmartDeviceLink layer --> -<!-- no zeus branch. FIXME +<!-- FIXME: no zeus or newer support <project name="phongt/meta-sdl" path="external/meta-sdl" remote="github" revision="ab1e345171e799216b8fcb432943a2de5ff66f5f" upstream="thud"/> --> @@ -64,7 +64,7 @@ <project name="alexa/alexa-auto-sdk" path="external/alexa-auto-sdk" remote="github" revision="86916d2d8c1702a8be3c88a9012ca56583bcc0c8" upstream="2.0"/> <!-- clang support --> - <project name="kraj/meta-clang" path="external/meta-clang" remote="github" revision="9cab6bc46cf44d13f8fea3b827e298a4f6e16b17" upstream="zeus"/> + <project name="kraj/meta-clang" path="external/meta-clang" remote="github" revision="7cdc7ff4cdfbd75083ec37ed2e8a380f48fb692c" upstream="master"/> <!-- BSPs --> @@ -74,30 +74,34 @@ <!-- MinnowBoard MAX / Upsquared specific things --> <!-- FIXME: To be merged with qemux86-64 target! --> - <project name="meta-intel" path="bsp/meta-intel" remote="yocto" revision="b04e1edb9300a57e200a187a3255f67b50519202" upstream="zeus"/> + <project name="meta-intel" path="bsp/meta-intel" remote="yocto" revision="9756afd47aa87593e382b8843337889ec7c31408" upstream="master"/> <!-- consolidate on meta-freescale from git.yoctoproject.org --> - <project name="meta-freescale" path="bsp/meta-freescale" remote="yocto" revision="db6cdd204764228a2f45f45c346dc026a70c6423" upstream="zeus"/> - <project name="Freescale/meta-freescale-3rdparty" path="bsp/meta-freescale-3rdparty" remote="github" revision="aea3771baa77e74762358ceb673d407e36637e5f" upstream="zeus"/> + <project name="meta-freescale" path="bsp/meta-freescale" remote="yocto" revision="5c33f703510963f5739174dc83afed7dd372750f" upstream="master"/> + <project name="Freescale/meta-freescale-3rdparty" path="bsp/meta-freescale-3rdparty" remote="github" revision="c4cb26701b639cce5b043ef2e255208e22fd2936" upstream="master"/> <!-- TI Vayu / Jacinto 6 / DRA7 --> - <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="eeb453a3c219204f5d422045766ceb7a90f725fe" upstream="zeus"/> + <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="9df06d26f15098722d7a0215eb61fc70696d4add" upstream="master"/> <!-- Raspberry Pi 3, 3B+, and 4 --> - <project name="meta-raspberrypi" path="bsp/meta-raspberrypi" remote="yocto" revision="85b75588fdedf72242870628f7c22f034d308740" upstream="zeus"/> + <project name="meta-raspberrypi" path="bsp/meta-raspberrypi" remote="yocto" revision="12641489df3728da24ffce7b306081b8488c5246" upstream="master"/> <!-- DragonBoard 410c specific things --> - <project name="meta-qcom" path="bsp/meta-qcom" remote="yocto" revision="01df13dfce2753465c8eff6d2bccfb0eb412cd34" upstream="zeus"/> + <project name="meta-qcom" path="bsp/meta-qcom" remote="yocto" revision="23a4efb05b1c17720ebfbac6807337d08c7bf51e" upstream="master"/> <!-- Altera SOCFPGA platform --> <!-- https://github.com/kraj/meta-altera --> - <project name="kraj/meta-altera" path="bsp/meta-altera" remote="github" revision="acc930857608eb4750015257084e3ee0ef2af74b" upstream="master"/> + <project name="kraj/meta-altera" path="bsp/meta-altera" remote="github" revision="2c721dd084d0c3955396f5e8fff294389b6e6db1" upstream="master"/> <!-- Sancloud BSP layers --> +<!-- FIXME: no dunfell support <project name="SanCloudLtd/meta-sancloud" path="bsp/meta-sancloud" remote="github" revision="f2e6ca70f3fda6f953423be958cc6fdc2b11e9dd" upstream="zeus"/> - <project name="EmbeddedAndroid/meta-rtlwifi" path="bsp/meta-rtlwifi" remote="github" revision="174c9bacc4af9873bfbecf618e331c6d464540bf" upstream="master"/> +--> + <project name="EmbeddedAndroid/meta-rtlwifi" path="bsp/meta-rtlwifi" remote="github" revision="09aa0aa4c25b97dfff0386ab3aba3835ae89bae7" upstream="master"/> <!-- meta-synopsys - support for ARC HSDK board --> +<!-- FIXME: no dunfell support <project name="foss-for-synopsys-dwc-arc-processors/meta-synopsys" path="bsp/meta-synopsys" remote="github" revision="d25035baa95f71c7f087c215dff846dc1d8c0d91" upstream="zeus-agl"/> +--> </manifest> |