diff options
| author | Changqing Li <changqing.li@windriver.com> | 2022-05-30 15:14:26 +0800 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-06-07 10:03:30 -0400 |
| commit | e8519630701606ad8968c48597c2f79df11b2591 (patch) | |
| tree | 8f1de5a9cf6ac87c5c8172d052a7b1d45f01313c /recipes-containers/criu/files/lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch | |
| parent | 2e787b9d75c6fd8efb964b24c6849c3f2dbbd3b6 (diff) | |
| download | meta-virtualization-e8519630701606ad8968c48597c2f79df11b2591.tar.gz | |
criu: fix patch fuzz and remove unused patch
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers/criu/files/lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch')
| -rw-r--r-- | recipes-containers/criu/files/lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch | 28 |
1 files changed, 0 insertions, 28 deletions
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 deleted file mode 100644 index 70ccb287..00000000 --- a/recipes-containers/criu/files/lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 1 | From 6caf90592d61c8c45b32cb7ff76709f9326030e2 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Mark Asselstine <mark.asselstine@windriver.com> | ||
| 3 | Date: Fri, 8 Sep 2017 15:40:49 -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 | --- | ||
| 13 | lib/Makefile | 2 +- | ||
| 14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 15 | |||
| 16 | diff --git a/lib/Makefile b/lib/Makefile | ||
| 17 | index b1bb057..06f5c5d 100644 | ||
| 18 | --- a/lib/Makefile | ||
| 19 | +++ b/lib/Makefile | ||
| 20 | @@ -53,7 +53,7 @@ install: lib-c lib-py crit/crit lib/c/criu.pc.in | ||
| 21 | $(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 | ||
| 22 | $(Q) install -m 644 lib/c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig | ||
| 23 | $(E) " INSTALL " crit | ||
| 24 | - $(Q) $(PYTHON) scripts/crit-setup.py install --prefix=$(DESTDIR)$(PREFIX) --record $(CRIT_SETUP_FILES) | ||
| 25 | + $(Q) $(PYTHON) scripts/crit-setup.py install --prefix=$(DESTDIR)$(PREFIX) --record $(CRIT_SETUP_FILES) --install-lib=$(DESTDIR)$(INSTALL_LIB) | ||
| 26 | .PHONY: install | ||
| 27 | |||
| 28 | uninstall: | ||
