From e8519630701606ad8968c48597c2f79df11b2591 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Mon, 30 May 2022 15:14:26 +0800 Subject: criu: fix patch fuzz and remove unused patch Signed-off-by: Changqing Li 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/0003-lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch (limited to 'recipes-containers/criu/files/0003-lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch') diff --git a/recipes-containers/criu/files/0003-lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch b/recipes-containers/criu/files/0003-lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch new file mode 100644 index 00000000..210fbe7c --- /dev/null +++ b/recipes-containers/criu/files/0003-lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch @@ -0,0 +1,30 @@ +From 0a04c5bc80319485e17e9a86e799fe2c5bfa3d38 Mon Sep 17 00:00:00 2001 +From: Mark Asselstine +Date: Fri, 8 Sep 2017 15:40:49 -0400 +Subject: [PATCH 3/3] 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 575a7bad3..f503d430b 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -59,7 +59,7 @@ install: lib-c lib-a lib-py crit/crit lib/c/criu.pc.in + $(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)/criu/),' lib/c/criu.pc.in > lib/c/criu.pc + $(Q) install -m 644 lib/c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig + $(E) " INSTALL " crit +- $(Q) $(PYTHON) scripts/crit-setup.py install --prefix=$(DESTDIR)$(PREFIX) --record $(CRIT_SETUP_FILES) ++ $(Q) $(PYTHON) scripts/crit-setup.py install --prefix=$(DESTDIR)$(PREFIX) --record $(CRIT_SETUP_FILES) --install-lib=$(DESTDIR)$(INSTALL_LIB) + .PHONY: install + + uninstall: +-- +2.25.1 + -- cgit v1.2.3-54-g00ecf