diff options
author | Jianchuan Wang <jianchuan.wang@windriver.com> | 2015-09-07 13:29:57 +0800 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-09-08 10:01:24 -0400 |
commit | 34a127f3c52550f6ec903e22356a5d772a32bbed (patch) | |
tree | e5c8544ebfb84fd9b74eb8c91e71d41dbe8e8cd0 /recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch | |
parent | 25228032779e492ce08eb3697cb2a68934fef383 (diff) | |
download | meta-virtualization-34a127f3c52550f6ec903e22356a5d772a32bbed.tar.gz |
criu: upgrade 1.4 -> 1.6
Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch')
-rw-r--r-- | recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch b/recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch new file mode 100644 index 00000000..28d638b3 --- /dev/null +++ b/recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From cb9933dc34af0b4d52c4584332600114ac65c402 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jianchuan Wang <jianchuan.wang@windriver.com> | ||
3 | Date: Tue, 4 Aug 2015 17:45:51 +0800 | ||
4 | Subject: [PATCH] criu: Change libraries install directory | ||
5 | |||
6 | Install the libraries into /usr/lib(/usr/lib64) | ||
7 | |||
8 | Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com> | ||
9 | --- | ||
10 | Makefile | 2 +- | ||
11 | Makefile.inc | 9 --------- | ||
12 | 2 files changed, 1 insertion(+), 10 deletions(-) | ||
13 | |||
14 | diff --git a/Makefile b/Makefile | ||
15 | index 7f5c890..6dbc436 100644 | ||
16 | --- a/Makefile | ||
17 | +++ b/Makefile | ||
18 | @@ -351,7 +351,7 @@ install-man: | ||
19 | |||
20 | install-crit: crit | ||
21 | $(E) " INSTALL crit" | ||
22 | - $(Q) python scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) | ||
23 | + $(Q) python scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --install-lib=$(LIBDIR) | ||
24 | |||
25 | .PHONY: install install-man install-crit install-criu | ||
26 | |||
27 | diff --git a/Makefile.inc b/Makefile.inc | ||
28 | index 5496f41..ba70aea 100644 | ||
29 | --- a/Makefile.inc | ||
30 | +++ b/Makefile.inc | ||
31 | @@ -17,14 +17,5 @@ MANDIR := $(PREFIX)/share/man | ||
32 | SYSTEMDUNITDIR := $(PREFIX)/lib/systemd/system/ | ||
33 | LOGROTATEDIR := $(PREFIX)/etc/logrotate.d/ | ||
34 | LIBDIR := $(PREFIX)/lib | ||
35 | -# For recent Debian/Ubuntu with multiarch support | ||
36 | -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture \ | ||
37 | - -qDEB_HOST_MULTIARCH 2>/dev/null) | ||
38 | -ifneq "$(DEB_HOST_MULTIARCH)" "" | ||
39 | -LIBDIR := $(PREFIX)/lib/$(DEB_HOST_MULTIARCH) | ||
40 | -# For most other systems | ||
41 | -else ifeq "$(shell uname -m)" "x86_64" | ||
42 | -LIBDIR := $(PREFIX)/lib64 | ||
43 | -endif | ||
44 | |||
45 | INCLUDEDIR := $(PREFIX)/include/criu | ||
46 | -- | ||
47 | 1.9.1 | ||
48 | |||