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 | |
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>
-rw-r--r-- | recipes-containers/criu/criu_git.bb | 6 | ||||
-rw-r--r-- | recipes-containers/criu/files/0001-criu-Skip-documentation-install.patch (renamed from recipes-containers/criu/files/0002-criu-Skip-documentation-install.patch) | 14 | ||||
-rw-r--r-- | recipes-containers/criu/files/0002-criu-Change-libraries-install-directory.patch (renamed from recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch) | 16 | ||||
-rw-r--r-- | recipes-containers/criu/files/0003-lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch (renamed from recipes-containers/criu/files/lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch) | 12 | ||||
-rw-r--r-- | recipes-containers/criu/files/fix-building-on-newest-glibc-and-kernel.patch | 45 |
5 files changed, 27 insertions, 66 deletions
diff --git a/recipes-containers/criu/criu_git.bb b/recipes-containers/criu/criu_git.bb index 77a12abf..46401f9a 100644 --- a/recipes-containers/criu/criu_git.bb +++ b/recipes-containers/criu/criu_git.bb | |||
@@ -17,9 +17,9 @@ SRCREV = "4f8f295e57e68740699479d12c1ad251e6dd859f" | |||
17 | PV = "3.17+git${SRCPV}" | 17 | PV = "3.17+git${SRCPV}" |
18 | 18 | ||
19 | SRC_URI = "git://github.com/checkpoint-restore/criu.git;branch=master;protocol=https \ | 19 | SRC_URI = "git://github.com/checkpoint-restore/criu.git;branch=master;protocol=https \ |
20 | file://0002-criu-Skip-documentation-install.patch \ | 20 | file://0001-criu-Skip-documentation-install.patch \ |
21 | file://0001-criu-Change-libraries-install-directory.patch \ | 21 | file://0002-criu-Change-libraries-install-directory.patch \ |
22 | file://lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch \ | 22 | file://0003-lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch \ |
23 | " | 23 | " |
24 | 24 | ||
25 | COMPATIBLE_HOST = "(x86_64|arm|aarch64).*-linux" | 25 | COMPATIBLE_HOST = "(x86_64|arm|aarch64).*-linux" |
diff --git a/recipes-containers/criu/files/0002-criu-Skip-documentation-install.patch b/recipes-containers/criu/files/0001-criu-Skip-documentation-install.patch index af45db73..43e27044 100644 --- a/recipes-containers/criu/files/0002-criu-Skip-documentation-install.patch +++ b/recipes-containers/criu/files/0001-criu-Skip-documentation-install.patch | |||
@@ -1,22 +1,21 @@ | |||
1 | From 45d74ae8a314c481398ba91a3697ffbd074cd98b Mon Sep 17 00:00:00 2001 | 1 | From 485e957a4c3289d105dd6203af31c0e4e1438ac6 Mon Sep 17 00:00:00 2001 |
2 | From: Jianchuan Wang <jianchuan.wang@windriver.com> | 2 | From: Jianchuan Wang <jianchuan.wang@windriver.com> |
3 | Date: Tue, 16 Aug 2016 09:42:24 +0800 | 3 | Date: Tue, 16 Aug 2016 09:42:24 +0800 |
4 | Subject: [PATCH] criu: Skip documentation install | 4 | Subject: [PATCH 1/3] criu: Skip documentation install |
5 | 5 | ||
6 | asciidoc is needed to generate CRIU documentation, so skip it in install. | 6 | asciidoc is needed to generate CRIU documentation, so skip it in install. |
7 | 7 | ||
8 | Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com> | 8 | Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com> |
9 | |||
10 | --- | 9 | --- |
11 | Makefile.install | 2 +- | 10 | Makefile.install | 2 +- |
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
13 | 12 | ||
14 | diff --git a/Makefile.install b/Makefile.install | 13 | diff --git a/Makefile.install b/Makefile.install |
15 | index 3987bcc..1def3cf 100644 | 14 | index aafb95469..1b02b70af 100644 |
16 | --- a/Makefile.install | 15 | --- a/Makefile.install |
17 | +++ b/Makefile.install | 16 | +++ b/Makefile.install |
18 | @@ -29,7 +29,7 @@ export PREFIX BINDIR SBINDIR MANDIR RUNDIR | 17 | @@ -30,7 +30,7 @@ export PREFIX BINDIR SBINDIR MANDIR RUNDIR |
19 | export LIBDIR INCLUDEDIR LIBEXECDIR | 18 | export LIBDIR INCLUDEDIR LIBEXECDIR PLUGINDIR |
20 | 19 | ||
21 | install-man: | 20 | install-man: |
22 | - $(Q) $(MAKE) -C Documentation install | 21 | - $(Q) $(MAKE) -C Documentation install |
@@ -24,3 +23,6 @@ index 3987bcc..1def3cf 100644 | |||
24 | .PHONY: install-man | 23 | .PHONY: install-man |
25 | 24 | ||
26 | install-lib: lib | 25 | install-lib: lib |
26 | -- | ||
27 | 2.25.1 | ||
28 | |||
diff --git a/recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch b/recipes-containers/criu/files/0002-criu-Change-libraries-install-directory.patch index afb1332d..453be131 100644 --- a/recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch +++ b/recipes-containers/criu/files/0002-criu-Change-libraries-install-directory.patch | |||
@@ -1,25 +1,25 @@ | |||
1 | From f64fbca70e6049dad3c404d871f2383d97725d2d Mon Sep 17 00:00:00 2001 | 1 | From dcbf7f8ad1b07ff718eac2ce79ed522ac1cee189 Mon Sep 17 00:00:00 2001 |
2 | From: Mark Asselstine <mark.asselstine@windriver.com> | 2 | From: Mark Asselstine <mark.asselstine@windriver.com> |
3 | Date: Fri, 8 Sep 2017 15:11:31 -0400 | 3 | Date: Fri, 8 Sep 2017 15:11:31 -0400 |
4 | Subject: [PATCH] criu: Change libraries install directory | 4 | Subject: [PATCH 2/3] criu: Change libraries install directory |
5 | 5 | ||
6 | Install the libraries into /usr/lib(or /usr/lib64) | 6 | Install the libraries into /usr/lib(or /usr/lib64) |
7 | 7 | ||
8 | Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com> | 8 | Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com> |
9 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> | 9 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> |
10 | |||
11 | --- | 10 | --- |
12 | Makefile.install | 13 ------------- | 11 | Makefile.install | 13 ------------- |
13 | 1 file changed, 13 deletions(-) | 12 | 1 file changed, 13 deletions(-) |
14 | 13 | ||
15 | diff --git a/Makefile.install b/Makefile.install | 14 | diff --git a/Makefile.install b/Makefile.install |
16 | index 1def3cf..d020eef 100644 | 15 | index 1b02b70af..2839ef5fe 100644 |
17 | --- a/Makefile.install | 16 | --- a/Makefile.install |
18 | +++ b/Makefile.install | 17 | +++ b/Makefile.install |
19 | @@ -9,19 +9,6 @@ LIBEXECDIR ?= $(PREFIX)/libexec | 18 | @@ -9,19 +9,6 @@ LIBEXECDIR ?= $(PREFIX)/libexec |
20 | RUNDIR ?= /run | 19 | RUNDIR ?= /run |
20 | PLUGINDIR ?= /var/lib/criu | ||
21 | 21 | ||
22 | # | 22 | -# |
23 | -# For recent Debian/Ubuntu with multiarch support. | 23 | -# For recent Debian/Ubuntu with multiarch support. |
24 | -DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null) | 24 | -DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null) |
25 | -ifneq "$(DEB_HOST_MULTIARCH)" "" | 25 | -ifneq "$(DEB_HOST_MULTIARCH)" "" |
@@ -32,7 +32,9 @@ index 1def3cf..d020eef 100644 | |||
32 | - endif | 32 | - endif |
33 | -endif | 33 | -endif |
34 | - | 34 | - |
35 | -# | 35 | # |
36 | # LIBDIR falls back to the standard path. | 36 | # LIBDIR falls back to the standard path. |
37 | LIBDIR ?= $(PREFIX)/lib | 37 | LIBDIR ?= $(PREFIX)/lib |
38 | 38 | -- | |
39 | 2.25.1 | ||
40 | |||
diff --git a/recipes-containers/criu/files/lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch b/recipes-containers/criu/files/0003-lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch index 70ccb287..210fbe7c 100644 --- a/recipes-containers/criu/files/lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch +++ b/recipes-containers/criu/files/0003-lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch | |||
@@ -1,23 +1,22 @@ | |||
1 | From 6caf90592d61c8c45b32cb7ff76709f9326030e2 Mon Sep 17 00:00:00 2001 | 1 | From 0a04c5bc80319485e17e9a86e799fe2c5bfa3d38 Mon Sep 17 00:00:00 2001 |
2 | From: Mark Asselstine <mark.asselstine@windriver.com> | 2 | From: Mark Asselstine <mark.asselstine@windriver.com> |
3 | Date: Fri, 8 Sep 2017 15:40:49 -0400 | 3 | Date: Fri, 8 Sep 2017 15:40:49 -0400 |
4 | Subject: [PATCH] lib/Makefile: overwrite install-lib, to allow multiarch | 4 | Subject: [PATCH 3/3] lib/Makefile: overwrite install-lib, to allow multiarch |
5 | 5 | ||
6 | I am not sure why Yocto installs python modules in arch specific | 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 | 7 | /usr/libXX directories but it does. Allow the recipe to pass this via |
8 | INSTALL_LIB. | 8 | INSTALL_LIB. |
9 | 9 | ||
10 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> | 10 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> |
11 | |||
12 | --- | 11 | --- |
13 | lib/Makefile | 2 +- | 12 | lib/Makefile | 2 +- |
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 14 | ||
16 | diff --git a/lib/Makefile b/lib/Makefile | 15 | diff --git a/lib/Makefile b/lib/Makefile |
17 | index b1bb057..06f5c5d 100644 | 16 | index 575a7bad3..f503d430b 100644 |
18 | --- a/lib/Makefile | 17 | --- a/lib/Makefile |
19 | +++ b/lib/Makefile | 18 | +++ b/lib/Makefile |
20 | @@ -53,7 +53,7 @@ install: lib-c lib-py crit/crit lib/c/criu.pc.in | 19 | @@ -59,7 +59,7 @@ install: lib-c lib-a 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 | 20 | $(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 | 21 | $(Q) install -m 644 lib/c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig |
23 | $(E) " INSTALL " crit | 22 | $(E) " INSTALL " crit |
@@ -26,3 +25,6 @@ index b1bb057..06f5c5d 100644 | |||
26 | .PHONY: install | 25 | .PHONY: install |
27 | 26 | ||
28 | uninstall: | 27 | uninstall: |
28 | -- | ||
29 | 2.25.1 | ||
30 | |||
diff --git a/recipes-containers/criu/files/fix-building-on-newest-glibc-and-kernel.patch b/recipes-containers/criu/files/fix-building-on-newest-glibc-and-kernel.patch deleted file mode 100644 index 9361adc2..00000000 --- a/recipes-containers/criu/files/fix-building-on-newest-glibc-and-kernel.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From b59947007362b53e9f41f1e5a33071dedf1c59ac Mon Sep 17 00:00:00 2001 | ||
2 | From: Adrian Reber <areber@redhat.com> | ||
3 | Date: Thu, 28 Sep 2017 09:13:33 +0000 | ||
4 | Subject: [PATCH] fix building on newest glibc and kernel | ||
5 | |||
6 | On Fedora rawhide with kernel-headers-4.14.0-0.rc2.git0.1.fc28.x86_64 | ||
7 | glibc-devel-2.26.90-15.fc28.x86_64 criu does not build any more: | ||
8 | |||
9 | In file included from /usr/include/linux/aio_abi.h:31:0, | ||
10 | from criu/cr-check.c:24: | ||
11 | /usr/include/sys/mount.h:35:3: error: expected identifier before numeric constant | ||
12 | MS_RDONLY = 1, /* Mount read-only. */ | ||
13 | ^ | ||
14 | make[2]: *** [/builddir/build/BUILD/criu-3.5/scripts/nmk/scripts/build.mk:111: criu/cr-check.o] Error 1 | ||
15 | make[1]: *** [criu/Makefile:73: criu/built-in.o] Error 2 | ||
16 | make: *** [Makefile:233: criu] Error 2 | ||
17 | |||
18 | This simple re-ordering of includes fixes it for me. | ||
19 | |||
20 | Signed-off-by: Adrian Reber <areber@redhat.com> | ||
21 | Signed-off-by: Andrei Vagin <avagin@virtuozzo.com> | ||
22 | |||
23 | Upstream-Status: Backport | ||
24 | [https://github.com/checkpoint-restore/criu/commit/f41e386d4d40e3e26b0cfdc85a812b7edb337f1d#diff-cc847b1cc975358c6582595be92d48db] | ||
25 | |||
26 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
27 | |||
28 | --- | ||
29 | criu/cr-check.c | 2 +- | ||
30 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
31 | |||
32 | diff --git a/criu/cr-check.c b/criu/cr-check.c | ||
33 | index 1dd887a..93df2ab 100644 | ||
34 | --- a/criu/cr-check.c | ||
35 | +++ b/criu/cr-check.c | ||
36 | @@ -21,8 +21,8 @@ | ||
37 | #include <netinet/in.h> | ||
38 | #include <sys/prctl.h> | ||
39 | #include <sched.h> | ||
40 | -#include <linux/aio_abi.h> | ||
41 | #include <sys/mount.h> | ||
42 | +#include <linux/aio_abi.h> | ||
43 | |||
44 | #include "../soccr/soccr.h" | ||
45 | |||