python3-warlock: fix build error

Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

2 files changed, 16 insertions, 19 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-warlock.inc b/meta-openstack/recipes-devtools/python/python-warlock.inc
deleted file mode 100644
index d8a16b1..0000000
--- a/meta-openstack/recipes-devtools/python/python-warlock.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Build self-validating python objects using JSON schemas"
-HOMEPAGE = "http://github.com/bcwaldon/warlock"
-SECTION = "devel/python"
-LICENSE = "Apache-2"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-DEPENDS += "python-jsonschema python-jsonpatch"
-
-SRC_URI[md5sum] = "746aba989d97762948e5fca6601f283f"
-SRC_URI[sha256sum] = "a093c4d04b42b7907f69086e476a766b7639dca50d95edc83aef6aeab9db2090"
-
-inherit pypi
-
-RDEPENDS_${PN} += "${PYTHON_PN}-jsonschema \
-                   ${PYTHON_PN}-jsonpatch  \
-                  "
-
diff --git a/meta-openstack/recipes-devtools/python/python3-warlock_1.3.3.bb b/meta-openstack/recipes-devtools/python/python3-warlock_1.3.3.bb
index 7f4d350..b4f4874 100644
--- a/meta-openstack/recipes-devtools/python/python3-warlock_1.3.3.bb
+++ b/meta-openstack/recipes-devtools/python/python3-warlock_1.3.3.bb
@@ -1,3 +1,17 @@
-inherit setuptools3
-require python-warlock.inc
+DESCRIPTION = "Build self-validating python objects using JSON schemas"
+HOMEPAGE = "http://github.com/bcwaldon/warlock"
+SECTION = "devel/python"
+LICENSE = "Apache-2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+DEPENDS += "python3-jsonschema python3-jsonpatch"
+
+SRC_URI[md5sum] = "746aba989d97762948e5fca6601f283f"
+SRC_URI[sha256sum] = "a093c4d04b42b7907f69086e476a766b7639dca50d95edc83aef6aeab9db2090"
+
+inherit pypi setuptools3
+
+RDEPENDS_${PN} += "${PYTHON_PN}-jsonschema \
+                   ${PYTHON_PN}-jsonpatch  \
+                  "