diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2024-03-14 20:01:52 +0000 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2024-03-15 17:17:20 +0000 |
commit | 769cf8be749e11e438332c726015b50936d33253 (patch) | |
tree | 60a8e9fe9a593402085344849a3e0c3f7ee3d4c2 /recipes-containers/criu | |
parent | a7bba8abf157800c253381edcc3c828c698d5057 (diff) | |
download | meta-virtualization-769cf8be749e11e438332c726015b50936d33253.tar.gz |
criu: patch cleanups
Adding Upstream-Status and reformatting some of the long logs.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers/criu')
4 files changed, 78 insertions, 68 deletions
diff --git a/recipes-containers/criu/files/0003-crit-pycriu-build-and-install-wheels.patch b/recipes-containers/criu/files/0003-crit-pycriu-build-and-install-wheels.patch index 2da96f44..0796bb24 100644 --- a/recipes-containers/criu/files/0003-crit-pycriu-build-and-install-wheels.patch +++ b/recipes-containers/criu/files/0003-crit-pycriu-build-and-install-wheels.patch | |||
@@ -7,6 +7,8 @@ Rather than using heavy handed pip (which requires network access to | |||
7 | fetch the index), mimic what we do in python_pep517.bbclass do_compile | 7 | fetch the index), mimic what we do in python_pep517.bbclass do_compile |
8 | and do_install for both crit/ and lib/pycriu | 8 | and do_install for both crit/ and lib/pycriu |
9 | 9 | ||
10 | Upstream-Status: Inappropriate [oe specific] | ||
11 | |||
10 | Signed-off-by: Tim Orling <tim.orling@konsulko.com> | 12 | Signed-off-by: Tim Orling <tim.orling@konsulko.com> |
11 | --- | 13 | --- |
12 | crit/Makefile | 8 ++++++-- | 14 | crit/Makefile | 8 ++++++-- |
diff --git a/recipes-containers/criu/files/0004-pycriu-attr-pycriu.version.__version__.patch b/recipes-containers/criu/files/0004-pycriu-attr-pycriu.version.__version__.patch index e05c8835..a1334b7b 100644 --- a/recipes-containers/criu/files/0004-pycriu-attr-pycriu.version.__version__.patch +++ b/recipes-containers/criu/files/0004-pycriu-attr-pycriu.version.__version__.patch | |||
@@ -3,6 +3,8 @@ From: Tim Orling <tim.orling@konsulko.com> | |||
3 | Date: Sat, 2 Mar 2024 13:47:46 -0800 | 3 | Date: Sat, 2 Mar 2024 13:47:46 -0800 |
4 | Subject: [PATCH] pycriu: attr pycriu.version.__version__ | 4 | Subject: [PATCH] pycriu: attr pycriu.version.__version__ |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe specific] | ||
7 | |||
6 | Signed-off-by: Tim Orling <tim.orling@konsulko.com> | 8 | Signed-off-by: Tim Orling <tim.orling@konsulko.com> |
7 | --- | 9 | --- |
8 | lib/pyproject.toml | 2 +- | 10 | lib/pyproject.toml | 2 +- |
diff --git a/recipes-containers/criu/files/0005-mount-add-definition-for-FSOPEN_CLOEXEC.patch b/recipes-containers/criu/files/0005-mount-add-definition-for-FSOPEN_CLOEXEC.patch index dc41d368..76b8a22e 100644 --- a/recipes-containers/criu/files/0005-mount-add-definition-for-FSOPEN_CLOEXEC.patch +++ b/recipes-containers/criu/files/0005-mount-add-definition-for-FSOPEN_CLOEXEC.patch | |||
@@ -1,78 +1,82 @@ | |||
1 | Upstream-Status: Backport [https://github.com/checkpoint-restore/criu/commit/517c0947] | 1 | build: integrate build fix |
2 | 2 | ||
3 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | 3 | [ |
4 | From 517c0947050e63aac72f63a3bf373d76264723b9 Mon Sep 17 00:00:00 2001 | ||
5 | From: Radostin Stoyanov <rstoyanov@fedoraproject.org> | ||
6 | Date: Wed, 24 Aug 2022 21:20:30 +0200 | ||
7 | Subject: [PATCH 2/2] mount: add definition for FSOPEN_CLOEXEC | ||
4 | 8 | ||
5 | From 517c0947050e63aac72f63a3bf373d76264723b9 Mon Sep 17 00:00:00 2001 | 9 | A recent change in glibc introduced `enum fsconfig_command` [1] and as a |
6 | From: Radostin Stoyanov <rstoyanov@fedoraproject.org> | 10 | result the compilation of criu fails with the following errors |
7 | Date: Wed, 24 Aug 2022 21:20:30 +0200 | ||
8 | Subject: [PATCH 2/2] mount: add definition for FSOPEN_CLOEXEC | ||
9 | 11 | ||
10 | A recent change in glibc introduced `enum fsconfig_command` [1] and as a | 12 | In file included from criu/pie/util.c:3: |
11 | result the compilation of criu fails with the following errors | 13 | /usr/include/sys/mount.h:240:6: error: redeclaration of 'enum fsconfig_command' |
14 | 240 | enum fsconfig_command | ||
15 | | ^~~~~~~~~~~~~~~~ | ||
16 | In file included from /usr/include/sys/mount.h:32: | ||
17 | criu/include/linux/mount.h:11:6: note: originally defined here | ||
18 | 11 | enum fsconfig_command { | ||
19 | | ^~~~~~~~~~~~~~~~ | ||
20 | /usr/include/sys/mount.h:242:3: error: redeclaration of enumerator 'FSCONFIG_SET_FLAG' | ||
21 | 242 | FSCONFIG_SET_FLAG = 0, /* Set parameter, supplying no value */ | ||
22 | | ^~~~~~~~~~~~~~~~~ | ||
23 | criu/include/linux/mount.h:12:9: note: previous definition of 'FSCONFIG_SET_FLAG' with type 'enum fsconfig_command' | ||
24 | 12 | FSCONFIG_SET_FLAG = 0, /* Set parameter, supplying no value */ | ||
25 | | ^~~~~~~~~~~~~~~~~ | ||
26 | /usr/include/sys/mount.h:244:3: error: redeclaration of enumerator 'FSCONFIG_SET_STRING' | ||
27 | 244 | FSCONFIG_SET_STRING = 1, /* Set parameter, supplying a string value */ | ||
28 | | ^~~~~~~~~~~~~~~~~~~ | ||
29 | criu/include/linux/mount.h:14:9: note: previous definition of 'FSCONFIG_SET_STRING' with type 'enum fsconfig_command' | ||
30 | 14 | FSCONFIG_SET_STRING = 1, /* Set parameter, supplying a string value */ | ||
31 | | ^~~~~~~~~~~~~~~~~~~ | ||
32 | /usr/include/sys/mount.h:246:3: error: redeclaration of enumerator 'FSCONFIG_SET_BINARY' | ||
33 | 246 | FSCONFIG_SET_BINARY = 2, /* Set parameter, supplying a binary blob value */ | ||
34 | | ^~~~~~~~~~~~~~~~~~~ | ||
35 | criu/include/linux/mount.h:16:9: note: previous definition of 'FSCONFIG_SET_BINARY' with type 'enum fsconfig_command' | ||
36 | 16 | FSCONFIG_SET_BINARY = 2, /* Set parameter, supplying a binary blob value */ | ||
37 | | ^~~~~~~~~~~~~~~~~~~ | ||
38 | /usr/include/sys/mount.h:248:3: error: redeclaration of enumerator 'FSCONFIG_SET_PATH' | ||
39 | 248 | FSCONFIG_SET_PATH = 3, /* Set parameter, supplying an object by path */ | ||
40 | | ^~~~~~~~~~~~~~~~~ | ||
41 | criu/include/linux/mount.h:18:9: note: previous definition of 'FSCONFIG_SET_PATH' with type 'enum fsconfig_command' | ||
42 | 18 | FSCONFIG_SET_PATH = 3, /* Set parameter, supplying an object by path */ | ||
43 | | ^~~~~~~~~~~~~~~~~ | ||
44 | /usr/include/sys/mount.h:250:3: error: redeclaration of enumerator 'FSCONFIG_SET_PATH_EMPTY' | ||
45 | 250 | FSCONFIG_SET_PATH_EMPTY = 4, /* Set parameter, supplying an object by (empty) path */ | ||
46 | | ^~~~~~~~~~~~~~~~~~~~~~~ | ||
47 | criu/include/linux/mount.h:20:9: note: previous definition of 'FSCONFIG_SET_PATH_EMPTY' with type 'enum fsconfig_command' | ||
48 | 20 | FSCONFIG_SET_PATH_EMPTY = 4, /* Set parameter, supplying an object by (empty) path */ | ||
49 | | ^~~~~~~~~~~~~~~~~~~~~~~ | ||
50 | /usr/include/sys/mount.h:252:3: error: redeclaration of enumerator 'FSCONFIG_SET_FD' | ||
51 | 252 | FSCONFIG_SET_FD = 5, /* Set parameter, supplying an object by fd */ | ||
52 | | ^~~~~~~~~~~~~~~ | ||
53 | criu/include/linux/mount.h:22:9: note: previous definition of 'FSCONFIG_SET_FD' with type 'enum fsconfig_command' | ||
54 | 22 | FSCONFIG_SET_FD = 5, /* Set parameter, supplying an object by fd */ | ||
55 | | ^~~~~~~~~~~~~~~ | ||
56 | /usr/include/sys/mount.h:254:3: error: redeclaration of enumerator 'FSCONFIG_CMD_CREATE' | ||
57 | 254 | FSCONFIG_CMD_CREATE = 6, /* Invoke superblock creation */ | ||
58 | | ^~~~~~~~~~~~~~~~~~~ | ||
59 | criu/include/linux/mount.h:24:9: note: previous definition of 'FSCONFIG_CMD_CREATE' with type 'enum fsconfig_command' | ||
60 | 24 | FSCONFIG_CMD_CREATE = 6, /* Invoke superblock creation */ | ||
61 | | ^~~~~~~~~~~~~~~~~~~ | ||
62 | /usr/include/sys/mount.h:256:3: error: redeclaration of enumerator 'FSCONFIG_CMD_RECONFIGURE' | ||
63 | 256 | FSCONFIG_CMD_RECONFIGURE = 7, /* Invoke superblock reconfiguration */ | ||
64 | | ^~~~~~~~~~~~~~~~~~~~~~~~ | ||
65 | criu/include/linux/mount.h:26:9: note: previous definition of 'FSCONFIG_CMD_RECONFIGURE' with type 'enum fsconfig_command' | ||
66 | 26 | FSCONFIG_CMD_RECONFIGURE = 7, /* Invoke superblock reconfiguration */ | ||
67 | |||
68 | This patch adds definition for FSOPEN_CLOEXEC to solve this problem. In particular, | ||
69 | sys/mount.h includes ifndef check for FSOPEN_CLOEXEC surrounding `enum fsconfig_command`. | ||
12 | 70 | ||
13 | In file included from criu/pie/util.c:3: | 71 | [1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=7eae6a91e9b1670330c9f15730082c91c0b1d570 |
14 | /usr/include/sys/mount.h:240:6: error: redeclaration of 'enum fsconfig_command' | ||
15 | 240 | enum fsconfig_command | ||
16 | | ^~~~~~~~~~~~~~~~ | ||
17 | In file included from /usr/include/sys/mount.h:32: | ||
18 | criu/include/linux/mount.h:11:6: note: originally defined here | ||
19 | 11 | enum fsconfig_command { | ||
20 | | ^~~~~~~~~~~~~~~~ | ||
21 | /usr/include/sys/mount.h:242:3: error: redeclaration of enumerator 'FSCONFIG_SET_FLAG' | ||
22 | 242 | FSCONFIG_SET_FLAG = 0, /* Set parameter, supplying no value */ | ||
23 | | ^~~~~~~~~~~~~~~~~ | ||
24 | criu/include/linux/mount.h:12:9: note: previous definition of 'FSCONFIG_SET_FLAG' with type 'enum fsconfig_command' | ||
25 | 12 | FSCONFIG_SET_FLAG = 0, /* Set parameter, supplying no value */ | ||
26 | | ^~~~~~~~~~~~~~~~~ | ||
27 | /usr/include/sys/mount.h:244:3: error: redeclaration of enumerator 'FSCONFIG_SET_STRING' | ||
28 | 244 | FSCONFIG_SET_STRING = 1, /* Set parameter, supplying a string value */ | ||
29 | | ^~~~~~~~~~~~~~~~~~~ | ||
30 | criu/include/linux/mount.h:14:9: note: previous definition of 'FSCONFIG_SET_STRING' with type 'enum fsconfig_command' | ||
31 | 14 | FSCONFIG_SET_STRING = 1, /* Set parameter, supplying a string value */ | ||
32 | | ^~~~~~~~~~~~~~~~~~~ | ||
33 | /usr/include/sys/mount.h:246:3: error: redeclaration of enumerator 'FSCONFIG_SET_BINARY' | ||
34 | 246 | FSCONFIG_SET_BINARY = 2, /* Set parameter, supplying a binary blob value */ | ||
35 | | ^~~~~~~~~~~~~~~~~~~ | ||
36 | criu/include/linux/mount.h:16:9: note: previous definition of 'FSCONFIG_SET_BINARY' with type 'enum fsconfig_command' | ||
37 | 16 | FSCONFIG_SET_BINARY = 2, /* Set parameter, supplying a binary blob value */ | ||
38 | | ^~~~~~~~~~~~~~~~~~~ | ||
39 | /usr/include/sys/mount.h:248:3: error: redeclaration of enumerator 'FSCONFIG_SET_PATH' | ||
40 | 248 | FSCONFIG_SET_PATH = 3, /* Set parameter, supplying an object by path */ | ||
41 | | ^~~~~~~~~~~~~~~~~ | ||
42 | criu/include/linux/mount.h:18:9: note: previous definition of 'FSCONFIG_SET_PATH' with type 'enum fsconfig_command' | ||
43 | 18 | FSCONFIG_SET_PATH = 3, /* Set parameter, supplying an object by path */ | ||
44 | | ^~~~~~~~~~~~~~~~~ | ||
45 | /usr/include/sys/mount.h:250:3: error: redeclaration of enumerator 'FSCONFIG_SET_PATH_EMPTY' | ||
46 | 250 | FSCONFIG_SET_PATH_EMPTY = 4, /* Set parameter, supplying an object by (empty) path */ | ||
47 | | ^~~~~~~~~~~~~~~~~~~~~~~ | ||
48 | criu/include/linux/mount.h:20:9: note: previous definition of 'FSCONFIG_SET_PATH_EMPTY' with type 'enum fsconfig_command' | ||
49 | 20 | FSCONFIG_SET_PATH_EMPTY = 4, /* Set parameter, supplying an object by (empty) path */ | ||
50 | | ^~~~~~~~~~~~~~~~~~~~~~~ | ||
51 | /usr/include/sys/mount.h:252:3: error: redeclaration of enumerator 'FSCONFIG_SET_FD' | ||
52 | 252 | FSCONFIG_SET_FD = 5, /* Set parameter, supplying an object by fd */ | ||
53 | | ^~~~~~~~~~~~~~~ | ||
54 | criu/include/linux/mount.h:22:9: note: previous definition of 'FSCONFIG_SET_FD' with type 'enum fsconfig_command' | ||
55 | 22 | FSCONFIG_SET_FD = 5, /* Set parameter, supplying an object by fd */ | ||
56 | | ^~~~~~~~~~~~~~~ | ||
57 | /usr/include/sys/mount.h:254:3: error: redeclaration of enumerator 'FSCONFIG_CMD_CREATE' | ||
58 | 254 | FSCONFIG_CMD_CREATE = 6, /* Invoke superblock creation */ | ||
59 | | ^~~~~~~~~~~~~~~~~~~ | ||
60 | criu/include/linux/mount.h:24:9: note: previous definition of 'FSCONFIG_CMD_CREATE' with type 'enum fsconfig_command' | ||
61 | 24 | FSCONFIG_CMD_CREATE = 6, /* Invoke superblock creation */ | ||
62 | | ^~~~~~~~~~~~~~~~~~~ | ||
63 | /usr/include/sys/mount.h:256:3: error: redeclaration of enumerator 'FSCONFIG_CMD_RECONFIGURE' | ||
64 | 256 | FSCONFIG_CMD_RECONFIGURE = 7, /* Invoke superblock reconfiguration */ | ||
65 | | ^~~~~~~~~~~~~~~~~~~~~~~~ | ||
66 | criu/include/linux/mount.h:26:9: note: previous definition of 'FSCONFIG_CMD_RECONFIGURE' with type 'enum fsconfig_command' | ||
67 | 26 | FSCONFIG_CMD_RECONFIGURE = 7, /* Invoke superblock reconfiguration */ | ||
68 | 72 | ||
69 | This patch adds definition for FSOPEN_CLOEXEC to solve this problem. In particular, | 73 | Reported-by: Younes Manton (@ymanton) |
70 | sys/mount.h includes ifndef check for FSOPEN_CLOEXEC surrounding `enum fsconfig_command`. | 74 | Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org> |
75 | ] | ||
71 | 76 | ||
72 | [1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=7eae6a91e9b1670330c9f15730082c91c0b1d570 | 77 | Upstream-Status: Backport [https://github.com/checkpoint-restore/criu/commit/517c0947] |
73 | 78 | ||
74 | Reported-by: Younes Manton (@ymanton) | 79 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
75 | Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org> | ||
76 | --- | 80 | --- |
77 | criu/include/linux/mount.h | 10 ++++++++-- | 81 | criu/include/linux/mount.h | 10 ++++++++-- |
78 | 1 file changed, 8 insertions(+), 2 deletions(-) | 82 | 1 file changed, 8 insertions(+), 2 deletions(-) |
diff --git a/recipes-containers/criu/files/0005-pycriu-skip-dependency-check-during-build.patch b/recipes-containers/criu/files/0005-pycriu-skip-dependency-check-during-build.patch index c293131d..88872911 100644 --- a/recipes-containers/criu/files/0005-pycriu-skip-dependency-check-during-build.patch +++ b/recipes-containers/criu/files/0005-pycriu-skip-dependency-check-during-build.patch | |||
@@ -5,6 +5,8 @@ Subject: [PATCH] pycriu: --skip-dependency-check during build | |||
5 | 5 | ||
6 | It complains about needing protobuf<4, python3-protobuf is 4.25 in meta-python | 6 | It complains about needing protobuf<4, python3-protobuf is 4.25 in meta-python |
7 | 7 | ||
8 | Upstream-Status: Inappropriate [oe specific] | ||
9 | |||
8 | Signed-off-by: Tim Orling <tim.orling@konsulko.com> | 10 | Signed-off-by: Tim Orling <tim.orling@konsulko.com> |
9 | --- | 11 | --- |
10 | lib/Makefile | 4 ++-- | 12 | lib/Makefile | 4 ++-- |