From 6d3846629348aa628e4f1415da1f5b4d606ae151 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 7 Dec 2018 14:09:27 +0100
Subject: [PATCH] Use more consistent names for our instant-classes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 README                                                     | 7 ++++---
 appends/meta-qt5/qtbase-native_%.bbappend                  | 2 +-
 appends/oe-core/gcc-cross%.bbappend                        | 2 +-
 appends/oe-core/gdb-cross%.bbappend                        | 2 +-
 ...-remote-debug.bbclass => instant-sysroot-cross.bbclass} | 6 +++---
 ...tive-sysroot.bbclass => instant-sysroot-native.bbclass} | 0
 6 files changed, 10 insertions(+), 9 deletions(-)
 rename classes/{instant-remote-debug.bbclass => instant-sysroot-cross.bbclass} (97%)
 rename classes/{instant-native-sysroot.bbclass => instant-sysroot-native.bbclass} (100%)

diff --git a/README b/README
index c0aa824..a13afc0 100644
--- a/README
+++ b/README
@@ -57,9 +57,10 @@ appends:
   for the layer is ignored (see conf/layer.conf).
 
 classes:
-  * instant-remote-debug.bbclass: Create a sysroot for remote debugging -
-    Yocto's suggested workflows are cumbersome for ad-hoc remote debugging.
-  * instant-native-sysroot.bbclass: Native recipes inheriting this class
+  * instant-sysroot-cross.bbclass: Create a sysroot for remote
+    building/debugging - Yocto's suggested workflows are cumbersome for ad-hoc
+    usage.
+  * instant-sysroot-native.bbclass: Native recipes inheriting this class
     install everything necessary to run into a native sysroot. It's like a
     quick & minimal native SDK. Currently gcc-cross and gdb-cross inherit this
     class to enable instant remote debugging.
diff --git a/appends/meta-qt5/qtbase-native_%.bbappend b/appends/meta-qt5/qtbase-native_%.bbappend
index 713df52..ee46b16 100644
--- a/appends/meta-qt5/qtbase-native_%.bbappend
+++ b/appends/meta-qt5/qtbase-native_%.bbappend
@@ -1 +1 @@
-inherit instant-native-sysroot
+inherit instant-sysroot-native
diff --git a/appends/oe-core/gcc-cross%.bbappend b/appends/oe-core/gcc-cross%.bbappend
index 713df52..ee46b16 100644
--- a/appends/oe-core/gcc-cross%.bbappend
+++ b/appends/oe-core/gcc-cross%.bbappend
@@ -1 +1 @@
-inherit instant-native-sysroot
+inherit instant-sysroot-native
diff --git a/appends/oe-core/gdb-cross%.bbappend b/appends/oe-core/gdb-cross%.bbappend
index 713df52..ee46b16 100644
--- a/appends/oe-core/gdb-cross%.bbappend
+++ b/appends/oe-core/gdb-cross%.bbappend
@@ -1 +1 @@
-inherit instant-native-sysroot
+inherit instant-sysroot-native
diff --git a/classes/instant-remote-debug.bbclass b/classes/instant-sysroot-cross.bbclass
similarity index 97%
rename from classes/instant-remote-debug.bbclass
rename to classes/instant-sysroot-cross.bbclass
index 62acccf..3fd23d5 100644
--- a/classes/instant-remote-debug.bbclass
+++ b/classes/instant-sysroot-cross.bbclass
@@ -12,7 +12,7 @@
 # * Additional build time for task do_copy_to_cross_sysroot for most recipes is < 1s
 #
 # to enable debug sysroot build set:
-# 'INHERIT += "instant-remote-debug"'
+# 'INHERIT += "instant-sysroot-cross"'
 # in your local.conf
 #
 # to debug by remote do:
@@ -33,7 +33,7 @@
 #   1. Create a Kit by 'Add' -> further dialog opens
 #   2. Select an name for the Kit e.g 'OE'
 #   3. Set sysroot (see INSTANT_CROSS_PATH in instant-path.bbclass):
-#      ${TMPDIR}/sysroot-instant-remote-${MACHINE_ARCH}
+#      ${TMPDIR}/sysroot-instant-cross-${MACHINE_ARCH}
 #   4. Select compilers (it is not necessary for debug but without QTCreator won't enable Kit) for C and C++ e.g:
 #      C:   '<TMDIR>/sysroot-instant-native/usr/bin/arm-mortsgna-linux-gnueabi/arm-mortsgna-linux-gnueabi-gcc'
 #      C++: '<TMDIR>/sysroot-instant-native/usr/bin/arm-mortsgna-linux-gnueabi/arm-mortsgna-linux-gnueabi-g++'
@@ -41,7 +41,7 @@
 #      GDB: '<TMDIR>/sysroot-instant-native/usr/bin/arm-mortsgna-linux-gnueabi/arm-mortsgna-linux-gnueabi-gdb'
 #   6. Select 'OK' in Options dialog -> 'Start Debugger' should be back on top
 # * Make sure 'OE' Kit is selected
-# * Browse for executable e.g '<TMDIR>/sysroot-instant-remote/usr/bin/thunar'
+# * Browse for executable e.g '<TMDIR>/sysroot-instant-cross/usr/bin/thunar'
 # * Set IP:Port of target machine e.g '192.168.2.108:5000'
 # * Select 'OK'
 #
diff --git a/classes/instant-native-sysroot.bbclass b/classes/instant-sysroot-native.bbclass
similarity index 100%
rename from classes/instant-native-sysroot.bbclass
rename to classes/instant-sysroot-native.bbclass