From d3c6004e92bf21f7f2b425d062b6276ff53c8c18 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Mon, 24 Apr 2017 16:31:30 -0400 Subject: 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 Signed-off-by: Bruce Ashfield --- ...e-overwrite-install-lib-to-allow-multiarc.patch | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 recipes-containers/criu/files/lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch (limited to 'recipes-containers/criu/files') 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 @@ +From 2e0c5c66786016f6443da2c1ff15ad77f018ec9b Mon Sep 17 00:00:00 2001 +From: Mark Asselstine +Date: Mon, 24 Apr 2017 16:12:05 -0400 +Subject: [PATCH] lib/Makefile: overwrite install-lib, to allow multiarch + +I am not sure why Yocto installs python modules in arch specific +/usr/libXX directories but it does. Allow the recipe to pass this via +INSTALL_LIB. + +Signed-off-by: Mark Asselstine +--- + lib/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/Makefile b/lib/Makefile +index f1c0821..c714d12 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -56,7 +56,7 @@ install: lib-c lib-py ../crit/crit c/criu.pc.in + $(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)),' c/criu.pc.in > c/criu.pc + $(Q) install -m 644 c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig + $(E) " INSTALL " crit +- $(Q) python ../scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --record $(CRIT_SETUP_FILES) ++ $(Q) python ../scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --record $(CRIT_SETUP_FILES) --install-lib=$(INSTALL_LIB) + .PHONY: install + + uninstall: +-- +2.7.4 + -- cgit v1.2.3-54-g00ecf