diff options
author | Mark Asselstine <mark.asselstine@windriver.com> | 2017-04-24 16:31:30 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-04-24 22:51:29 -0400 |
commit | d3c6004e92bf21f7f2b425d062b6276ff53c8c18 (patch) | |
tree | 3d40f8afb203d5fe433cec3931f06ffa9feec3e5 | |
parent | 76c38f219d87da97ea3b1692aa886b2398466b51 (diff) | |
download | meta-virtualization-d3c6004e92bf21f7f2b425d062b6276ff53c8c18.tar.gz |
criu: force python to install in ${libdir}
Historically Yocto installs python modules in ${libdir} and not the
no-arch variant. The criu install was following every other distros
use of the non-arch variant, /usr/lib, which was being picked up by
the QA check. Modify the criu Makefile to enable us to overwrite this
location by using setup.py's install-lib directive.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r-- | recipes-containers/criu/criu_git.bb | 2 | ||||
-rw-r--r-- | recipes-containers/criu/files/lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch | 30 |
2 files changed, 32 insertions, 0 deletions
diff --git a/recipes-containers/criu/criu_git.bb b/recipes-containers/criu/criu_git.bb index 851779d0..21dee2b1 100644 --- a/recipes-containers/criu/criu_git.bb +++ b/recipes-containers/criu/criu_git.bb | |||
@@ -22,6 +22,7 @@ SRC_URI = "git://github.com/xemul/criu.git;protocol=git \ | |||
22 | file://0002-criu-Skip-documentation-install.patch \ | 22 | file://0002-criu-Skip-documentation-install.patch \ |
23 | file://0001-criu-Change-libraries-install-directory.patch \ | 23 | file://0001-criu-Change-libraries-install-directory.patch \ |
24 | ${@bb.utils.contains('PACKAGECONFIG', 'selinux', '', 'file://disable-selinux.patch', d)} \ | 24 | ${@bb.utils.contains('PACKAGECONFIG', 'selinux', '', 'file://disable-selinux.patch', d)} \ |
25 | file://lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch \ | ||
25 | " | 26 | " |
26 | 27 | ||
27 | COMPATIBLE_HOST = "(x86_64|arm|aarch64).*-linux" | 28 | COMPATIBLE_HOST = "(x86_64|arm|aarch64).*-linux" |
@@ -67,6 +68,7 @@ do_compile () { | |||
67 | } | 68 | } |
68 | 69 | ||
69 | do_install () { | 70 | do_install () { |
71 | export INSTALL_LIB="${libdir}/${PYTHON_DIR}/site-packages" | ||
70 | oe_runmake PREFIX=${exec_prefix} LIBDIR=${libdir} DESTDIR="${D}" install | 72 | oe_runmake PREFIX=${exec_prefix} LIBDIR=${libdir} DESTDIR="${D}" install |
71 | } | 73 | } |
72 | 74 | ||
diff --git a/recipes-containers/criu/files/lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch b/recipes-containers/criu/files/lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch new file mode 100644 index 00000000..8bda8c42 --- /dev/null +++ b/recipes-containers/criu/files/lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From 2e0c5c66786016f6443da2c1ff15ad77f018ec9b Mon Sep 17 00:00:00 2001 | ||
2 | From: Mark Asselstine <mark.asselstine@windriver.com> | ||
3 | Date: Mon, 24 Apr 2017 16:12:05 -0400 | ||
4 | Subject: [PATCH] lib/Makefile: overwrite install-lib, to allow multiarch | ||
5 | |||
6 | I am not sure why Yocto installs python modules in arch specific | ||
7 | /usr/libXX directories but it does. Allow the recipe to pass this via | ||
8 | INSTALL_LIB. | ||
9 | |||
10 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> | ||
11 | --- | ||
12 | lib/Makefile | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/lib/Makefile b/lib/Makefile | ||
16 | index f1c0821..c714d12 100644 | ||
17 | --- a/lib/Makefile | ||
18 | +++ b/lib/Makefile | ||
19 | @@ -56,7 +56,7 @@ install: lib-c lib-py ../crit/crit c/criu.pc.in | ||
20 | $(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)),' c/criu.pc.in > c/criu.pc | ||
21 | $(Q) install -m 644 c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig | ||
22 | $(E) " INSTALL " crit | ||
23 | - $(Q) python ../scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --record $(CRIT_SETUP_FILES) | ||
24 | + $(Q) python ../scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --record $(CRIT_SETUP_FILES) --install-lib=$(INSTALL_LIB) | ||
25 | .PHONY: install | ||
26 | |||
27 | uninstall: | ||
28 | -- | ||
29 | 2.7.4 | ||
30 | |||