3 files changed, 24 insertions, 13 deletions

diff --git a/meta-python/recipes-devtools/python/python-cmd2.inc b/meta-python/recipes-devtools/python/python-cmd2.inc
new file mode 100644
index 0000000000..1a0be778b2
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python-cmd2.inc
@@ -0,0 +1,13 @@
+SUMMARY = "Extra features for standard library's cmd module"
+HOMEPAGE = "http://packages.python.org/cmd2/"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=01aeabea7ae1529a8e4b674b7107d6bc"
+
+SRC_URI[md5sum] = "df35bb2dca8f5e1f6090e1f0aa02960a"
+SRC_URI[sha256sum] = "4b78379d53aff811d1deac720bbe71661769822a5fb2d830cd730656d180fb3d"
+
+inherit pypi
+
+DEPENDS += "${PYTHON_PN}-setuptools-scm-native"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-python/recipes-devtools/python/python-cmd2_0.9.16.bb b/meta-python/recipes-devtools/python/python-cmd2_0.9.16.bb
index 94db37a2d3..17b6ae2858 100644
--- a/meta-python/recipes-devtools/python/python-cmd2_0.9.16.bb
+++ b/meta-python/recipes-devtools/python/python-cmd2_0.9.16.bb
@@ -1,14 +1,5 @@
-SUMMARY = "Extra features for standard library's cmd module"
-HOMEPAGE = "http://packages.python.org/cmd2/"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=01aeabea7ae1529a8e4b674b7107d6bc"
-
-SRC_URI[md5sum] = "df35bb2dca8f5e1f6090e1f0aa02960a"
-SRC_URI[sha256sum] = "4b78379d53aff811d1deac720bbe71661769822a5fb2d830cd730656d180fb3d"
-
-inherit pypi setuptools
-
-DEPENDS += "${PYTHON_PN}-setuptools-scm-native"
+inherit setuptools
+require python-cmd2.inc
 
 RDEPENDS_${PN} += "\
     ${PYTHON_PN}-doctest \
@@ -21,5 +12,3 @@ RDEPENDS_${PN} += "\
     ${PYTHON_PN}-threading \
     ${PYTHON_PN}-textutils \
     "
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-python/recipes-devtools/python/python3-cmd2_0.9.16.bb b/meta-python/recipes-devtools/python/python3-cmd2_0.9.16.bb
new file mode 100644
index 0000000000..f5c5c7e1a3
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-cmd2_0.9.16.bb
@@ -0,0 +1,9 @@
+inherit setuptools3
+require python-cmd2.inc
+
+RDEPENDS_${PN} += "\
+    ${PYTHON_PN}-pyperclip \
+    ${PYTHON_PN}-colorama \
+    ${PYTHON_PN}-attrs \
+    ${PYTHON_PN}-wcwidth \
+    "