summaryrefslogtreecommitdiffstats
path: root/meta-networking
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2018-10-19 16:59:19 +0800
committerKhem Raj <raj.khem@gmail.com>2018-10-19 11:03:18 -0700
commitfe774606426f6f3399774401d81f894534679f53 (patch)
treef2c614c280edbe423a8933e0966fe4f58a6f0c7d /meta-networking
parentcdd3e9ab99d4ffda673b564ba802b6bd2d40eabf (diff)
downloadmeta-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>
Diffstat (limited to 'meta-networking')
-rw-r--r--meta-networking/recipes-support/openipmi/files/openipmigui-not-compile-pyc-pyo.patch26
-rw-r--r--meta-networking/recipes-support/openipmi/openipmi_2.0.25.bb1
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 000000000..389407590
--- /dev/null
+++ b/meta-networking/recipes-support/openipmi/files/openipmigui-not-compile-pyc-pyo.patch
@@ -0,0 +1,26 @@
1openipmi load swig/python/.libs/_OpenIPMI.so to create .pyc and .pyo files.
2It fails when multilib is enable:
3
4| ImportError: .../lib32-openipmi/2.0.25-r0/OpenIPMI-2.0.25/swig/python/.libs/_OpenIPMI.so: wrong ELF class: ELFCLASS32
5
6Don't compile and install .pyc and .pyo files to fix the failure.
7
8Upstream-Status: Inappropriate [OE specific]
9
10Signed-off-by: Kai Kang <kai.kang@windriver.com>
11diff --git a/swig/python/openipmigui/Makefile.am b/swig/python/openipmigui/Makefile.am
12index 570e7b9..88258bf 100644
13--- a/swig/python/openipmigui/Makefile.am
14+++ b/swig/python/openipmigui/Makefile.am
15@@ -34,9 +34,9 @@ localcopy:
16 fi \
17 done
18
19-all-local: localcopy $(PYC_FILES) $(PYO_FILES)
20+all-local: localcopy
21
22-install-exec-local: $(EXTRA_DIST) $(PYC_FILES) $(PYO_FILES)
23+install-exec-local: $(EXTRA_DIST)
24 $(INSTALL) -d $(DESTDIR)$(PYTHON_INSTALL_DIR)/openipmigui
25 $(INSTALL_DATA) $^ $(DESTDIR)$(PYTHON_INSTALL_DIR)/openipmigui
26
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 a1f26edb4..d28ebd484 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 \
29 file://ipmi-init-fix-the-arguments.patch \ 29 file://ipmi-init-fix-the-arguments.patch \
30 file://do-not-install-pyc-and-pyo.patch \ 30 file://do-not-install-pyc-and-pyo.patch \
31 file://include_sys_types.patch \ 31 file://include_sys_types.patch \
32 file://openipmigui-not-compile-pyc-pyo.patch \
32 file://openipmi-helper \ 33 file://openipmi-helper \
33 file://ipmi.service \ 34 file://ipmi.service \
34 " 35 "