diff options
author | Paul Barker <pbarker@toganlabs.com> | 2017-10-05 13:38:17 +0000 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-10-05 10:44:04 -0400 |
commit | 9a24b3eb635ef745f5ea5b567d900c8659c02097 (patch) | |
tree | 628f6f044d0cb5242479babc73c602705d94b4cc | |
parent | 81944693a030497ebf77f7ec9856ce23dca2ea88 (diff) | |
download | meta-virtualization-9a24b3eb635ef745f5ea5b567d900c8659c02097.tar.gz |
runc: Drop obsolete patch
This patch hasn't been used in a long time.
Signed-off-by: Paul Barker <pbarker@toganlabs.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r-- | recipes-containers/runc/runc/0001-nsexec-fix-build-against-musl-libc.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/recipes-containers/runc/runc/0001-nsexec-fix-build-against-musl-libc.patch b/recipes-containers/runc/runc/0001-nsexec-fix-build-against-musl-libc.patch deleted file mode 100644 index aa57636f..00000000 --- a/recipes-containers/runc/runc/0001-nsexec-fix-build-against-musl-libc.patch +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | From ac6bd953192fa6752a07be7501f69f7cffe33e8e Mon Sep 17 00:00:00 2001 | ||
2 | From: Natanael Copa <natanael.copa@docker.com> | ||
3 | Date: Tue, 19 Apr 2016 10:43:00 +0200 | ||
4 | Subject: [PATCH] nsexec: fix build against musl libc | ||
5 | |||
6 | Remove a wrongly added include which was added in commit 3c2e77ee (Add a | ||
7 | compatibility header for CentOS/RHEL 6, 2016-01-29) apparently to | ||
8 | fix this compile error on centos 6: | ||
9 | |||
10 | > In file included from | ||
11 | > Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/nsenter/nsexec.c:20: | ||
12 | > /usr/include/linux/netlink.h:35: error: expected specifier-qualifier-list before 'sa_family_t' | ||
13 | |||
14 | The glibc bits/sockaddr.h says that this header should never be included | ||
15 | directly[1]. Instead, sys/socket.h should be used. | ||
16 | |||
17 | The problem was correctly fixed later, in commit 394fb55 (Fix build | ||
18 | error on centos6, 2016-03-02) so the incorrect bits/sockaddr.h can | ||
19 | safely be removed. | ||
20 | |||
21 | This is needed to build musl libc. | ||
22 | |||
23 | Fixes #761 | ||
24 | |||
25 | [1]: https://github.molgen.mpg.de/git-mirror/glibc/blob/20003c49884422da7ffbc459cdeee768a6fee07b/bits/sockaddr.h#L20 | ||
26 | |||
27 | Signed-off-by: Natanael Copa <natanael.copa@docker.com> | ||
28 | Signed-off-by: Paul Barker <paul@paulbarker.me.uk> | ||
29 | Upstream-status: Backport | ||
30 | --- | ||
31 | libcontainer/nsenter/nsexec.c | 1 - | ||
32 | 1 file changed, 1 deletion(-) | ||
33 | |||
34 | diff --git a/libcontainer/nsenter/nsexec.c b/libcontainer/nsenter/nsexec.c | ||
35 | index 8f37d6c..40a8f89 100644 | ||
36 | --- a/libcontainer/nsenter/nsexec.c | ||
37 | +++ b/libcontainer/nsenter/nsexec.c | ||
38 | @@ -18,7 +18,6 @@ | ||
39 | #include <unistd.h> | ||
40 | #include <grp.h> | ||
41 | |||
42 | -#include <bits/sockaddr.h> | ||
43 | #include <linux/types.h> | ||
44 | |||
45 | // All arguments should be above the stack because it grows down | ||
46 | -- | ||
47 | 2.1.4 | ||
48 | |||