diff options
| author |   Kai Kang <kai.kang@windriver.com> | 2018-10-19 16:59:19 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2018-10-19 11:03:18 -0700 |
| commit | fe774606426f6f3399774401d81f894534679f53 (patch) | |
| tree | f2c614c280edbe423a8933e0966fe4f58a6f0c7d | |
| parent | cdd3e9ab99d4ffda673b564ba802b6bd2d40eabf (diff) | |
| download | meta-openembedded-fe774606426f6f3399774401d81f894534679f53.tar.gz | |
openipmi: not install .pyc and .pyo files
openipmi load swig/python/.libs/_OpenIPMI.so to create .pyc and .pyo
files. It fails when multilib is enable:
| ImportError: .../lib32-openipmi/2.0.25-r0/OpenIPMI-2.0.25/swig/python/.libs/_OpenIPMI.so:
| wrong ELF class: ELFCLASS32
Don't compile and install .pyc and .pyo files to fix the failure.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-networking/recipes-support/openipmi/files/openipmigui-not-compile-pyc-pyo.patch | 26 | ||||
| -rw-r--r-- | meta-networking/recipes-support/openipmi/openipmi_2.0.25.bb | 1 |
2 files changed, 27 insertions, 0 deletions
diff --git a/meta-networking/recipes-support/openipmi/files/openipmigui-not-compile-pyc-pyo.patch b/meta-networking/recipes-support/openipmi/files/openipmigui-not-compile-pyc-pyo.patch new file mode 100644 index 0000000000..3894075906 --- /dev/null +++ b/meta-networking/recipes-support/openipmi/files/openipmigui-not-compile-pyc-pyo.patch @@ -0,0 +1,26 @@ +openipmi load swig/python/.libs/_OpenIPMI.so to create .pyc and .pyo files. +It fails when multilib is enable: + +| ImportError: .../lib32-openipmi/2.0.25-r0/OpenIPMI-2.0.25/swig/python/.libs/_OpenIPMI.so: wrong ELF class: ELFCLASS32 + +Don't compile and install .pyc and .pyo files to fix the failure. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +diff --git a/swig/python/openipmigui/Makefile.am b/swig/python/openipmigui/Makefile.am +index 570e7b9..88258bf 100644 +--- a/swig/python/openipmigui/Makefile.am ++++ b/swig/python/openipmigui/Makefile.am +@@ -34,9 +34,9 @@ localcopy: + fi \ + done + +-all-local: localcopy $(PYC_FILES) $(PYO_FILES) ++all-local: localcopy + +-install-exec-local: $(EXTRA_DIST) $(PYC_FILES) $(PYO_FILES) ++install-exec-local: $(EXTRA_DIST) + $(INSTALL) -d $(DESTDIR)$(PYTHON_INSTALL_DIR)/openipmigui + $(INSTALL_DATA) $^ $(DESTDIR)$(PYTHON_INSTALL_DIR)/openipmigui + diff --git a/meta-networking/recipes-support/openipmi/openipmi_2.0.25.bb b/meta-networking/recipes-support/openipmi/openipmi_2.0.25.bb index a1f26edb45..d28ebd4845 100644 --- a/meta-networking/recipes-support/openipmi/openipmi_2.0.25.bb +++ b/meta-networking/recipes-support/openipmi/openipmi_2.0.25.bb @@ -29,6 +29,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \ file://ipmi-init-fix-the-arguments.patch \ file://do-not-install-pyc-and-pyo.patch \ file://include_sys_types.patch \ + file://openipmigui-not-compile-pyc-pyo.patch \ file://openipmi-helper \ file://ipmi.service \ " |