From b705265bf44ea2af64c090613c73b5c904147f92 Mon Sep 17 00:00:00 2001
From: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Date: Tue, 14 Jun 2022 16:10:54 +0000
Subject: Feature cleanup for Nifty Needlefish

Remove features with upstream deprecated or unmaintained:
- meta-ros2
- meta-gplv2

Bug-AGL: SPEC-4407
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: Ic491a56d71792ef1e861e0421c55ebbe35d9c49a
---
 default-floating.xml | 4 ----
 default.xml          | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/default-floating.xml b/default-floating.xml
index 4be5a098..307019b5 100644
--- a/default-floating.xml
+++ b/default-floating.xml
@@ -31,7 +31,6 @@
 
   <!-- Yocto/OpenEmbedded things. -->
   <project name="poky" path="external/poky" remote="yocto" revision="kirkstone" />
-  <project name="meta-gplv2" path="external/meta-gplv2" remote="yocto" revision="kirkstone" />
   <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="kirkstone" />
 
 
@@ -58,9 +57,6 @@
   <!-- meta-python2 as stop-gap to allow chromium to build until upstream fixes the dependencies -->
   <project name="meta-python2" path="external/meta-python2" remote="openembedded" revision="kirkstone" />
 
-  <!-- meta-ros layer -->
-  <project name="ros/meta-ros" path="external/meta-ros" remote="github" revision="dunfell"/>
-
   <!-- meta-flutter -->
   <project name="meta-flutter/meta-flutter" path="external/meta-flutter" remote="github" revision="kirkstone"/>
 
diff --git a/default.xml b/default.xml
index 4cf41df9..176d8087 100644
--- a/default.xml
+++ b/default.xml
@@ -30,7 +30,6 @@
 
   <!-- Yocto/OpenEmbedded things. -->
   <project name="poky" path="external/poky" remote="yocto" revision="8c489602f218bcf21de0d3c9f8cf620ea5f06430" upstream="kirkstone" />
-  <project name="meta-gplv2" path="external/meta-gplv2" remote="yocto" revision="d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a" upstream="kirkstone" />
   <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="0b78362654262145415df8211052442823b9ec9b" upstream="kirkstone" />
 
 
@@ -57,9 +56,6 @@
   <!-- meta-python2 as stop-gap to allow chromium to build until upstream fixes the dependencies -->
   <project name="meta-python2" path="external/meta-python2" remote="openembedded" revision="f02882e2aa9279ca7becca8d0cedbffe88b5a253" upstream="kirkstone" />
 
-  <!-- meta-ros layer -->
-  <project name="ros/meta-ros" path="external/meta-ros" remote="github" revision="7ded597103e8e54ffa979d042cdbbedb76ff7cb5" upstream="dunfell"/>
-
   <!-- meta-flutter -->
   <project name="meta-flutter/meta-flutter" path="external/meta-flutter" remote="github" revision="3cd0ace6e85357fd41097a5878271097cb3eedaa" upstream="kirkstone"/>
 
-- 
cgit 1.2.3-korg