diff options
Diffstat (limited to 'meta-phosphor/common/recipes-devtools')
-rw-r--r-- | meta-phosphor/common/recipes-devtools/python/python/__init__.email_min.py | 7 | ||||
-rw-r--r-- | meta-phosphor/common/recipes-devtools/python/python_2.%.bbappend | 24 |
2 files changed, 2 insertions, 29 deletions
diff --git a/meta-phosphor/common/recipes-devtools/python/python/__init__.email_min.py b/meta-phosphor/common/recipes-devtools/python/python/__init__.email_min.py deleted file mode 100644 index 6c8aef147..000000000 --- a/meta-phosphor/common/recipes-devtools/python/python/__init__.email_min.py +++ /dev/null @@ -1,7 +0,0 @@ -try: - import email_full - -except ImportError: - import sys - import email.utils - sys.modules['email.Utils'] = sys.modules['email.utils'] diff --git a/meta-phosphor/common/recipes-devtools/python/python_2.%.bbappend b/meta-phosphor/common/recipes-devtools/python/python_2.%.bbappend index e591a9565..6d0ff6901 100644 --- a/meta-phosphor/common/recipes-devtools/python/python_2.%.bbappend +++ b/meta-phosphor/common/recipes-devtools/python/python_2.%.bbappend @@ -1,19 +1,10 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://__init__.email_min.py" SRC_URI += "file://0001-json-Use-int-long.__str__-to-convert-subclasses.patch" -do_install_append_class-target() { - dir=${libdir}/python${PYTHON_MAJMIN}/email - mv ${D}/$dir/__init__.py \ - ${D}/$dir/email_full.py - install -m644 ${WORKDIR}/__init__.email_min.py \ - ${D}/$dir/__init__.py -} - require wsgiref-${PYTHON_MAJMIN}-manifest.inc -PROVIDES_prepend = "${PN}-spwd ${PN}-email-utils " -PACKAGES_prepend = "${PN}-spwd ${PN}-email-utils " +PROVIDES_prepend = "${PN}-spwd " +PACKAGES_prepend = "${PN}-spwd " SUMMARY_${PN}-spwd = "Shadow database support" RDEPENDS_${PN}-spwd = "${PN}-core" @@ -21,14 +12,3 @@ FILES_${PN}-spwd= " \ ${libdir}/python${PYTHON_MAJMIN}/lib-dynload/spwd.so \ ${libdir}/python${PYTHON_MAJMIN}/lib-dynload/grp.so \ " - -SUMMARY_${PN}-email-utils = "Utils from the email package" -RDEPENDS_${PN}-email-utils = "${PN}-core" -FILES_${PN}-email-utils = " \ - ${libdir}/python${PYTHON_MAJMIN}/email/__init__.py* \ - ${libdir}/python${PYTHON_MAJMIN}/email/utils.py* \ - ${libdir}/python${PYTHON_MAJMIN}/email/_parseaddr.py* \ - ${libdir}/python${PYTHON_MAJMIN}/email/encoders.py* \ - " -RDEPENDS_${PN}-email += "${PN}-email-utils" -FILES_${PN}-email += "${libdir}/python${PYTHON_MAJMIN}/email/email_full.py" |